Explorar el Código

* added support of shifter ops in arm inline assembler

florian hace 20 años
padre
commit
5942e4b6f6
Se han modificado 4 ficheros con 218 adiciones y 141 borrados
  1. 73 7
      compiler/arm/raarmgas.pas
  2. 3 2
      compiler/msgidx.inc
  3. 132 130
      compiler/msgtxt.inc
  4. 10 2
      compiler/rautils.pas

+ 73 - 7
compiler/arm/raarmgas.pas

@@ -38,6 +38,7 @@ Unit raarmgas;
         procedure handleopcode;override;
         procedure BuildReference(oper : tarmoperand);
         procedure BuildOperand(oper : tarmoperand);
+        function TryBuildShifterOp(oper : tarmoperand) : boolean;
         procedure BuildOpCode(instr : tarminstruction);
         procedure ReadSym(oper : tarmoperand);
         procedure ConvertCalljmp(instr : tarminstruction);
@@ -182,7 +183,6 @@ Unit raarmgas;
               Consume(AS_HASH);
               inc(oper.opr.ref.offset,BuildConstExpression(false,true));
             end;
-          Consume_RBracket;
         end;
 
 
@@ -203,7 +203,10 @@ Unit raarmgas;
                exit;
              end;
             if actasmtoken=AS_COMMA then
-              read_index;
+              begin
+                read_index;
+                Consume_RBracket;
+              end;
             if actasmtoken=AS_NOT then
               begin
                 consume(AS_NOT);
@@ -218,6 +221,55 @@ Unit raarmgas;
       end;
 
 
+    function tarmattreader.TryBuildShifterOp(oper : tarmoperand) : boolean;
+
+      procedure handlepara(sm : tshiftmode);
+        begin
+          consume(AS_ID);
+          fillchar(oper.opr,sizeof(oper.opr),0);
+          oper.opr.typ:=OPR_SHIFTEROP;
+          oper.opr.shifterop.shiftmode:=sm;
+          if sm<>SM_RRX then
+            begin
+              case actasmtoken of
+                AS_REGISTER:
+                  begin
+                    oper.opr.shifterop.rs:=actasmregister;
+                    consume(AS_REGISTER);
+                  end;
+                AS_HASH:
+                  begin
+                    consume(AS_HASH);
+                    oper.opr.shifterop.shiftimm:=BuildConstExpression(false,false);
+                  end;
+                else
+                  Message(asmr_e_illegal_shifterop_syntax);
+              end;
+            end;
+        end;
+
+      begin
+        result:=true;
+        if (actasmtoken=AS_ID) then
+          begin
+            if (actasmpattern='LSL') then
+              handlepara(SM_LSL)
+            else if (actasmpattern='LSR') then
+              handlepara(SM_LSR)
+            else if (actasmpattern='ASR') then
+              handlepara(SM_ASR)
+            else if (actasmpattern='ROR') then
+              handlepara(SM_ROR)
+            else if (actasmpattern='RRX') then
+              handlepara(SM_ROR)
+            else
+              result:=false;
+          end
+        else
+          result:=false;
+      end;
+
+
     Procedure tarmattreader.BuildOperand(oper : tarmoperand);
       var
         expr : string;
@@ -560,11 +612,22 @@ Unit raarmgas;
           case actasmtoken of
             AS_COMMA: { Operand delimiter }
               Begin
-                if operandnum>Max_Operands then
-                  Message(asmr_e_too_many_operands)
+                if ((instr.opcode=A_MOV) and (operandnum=2)) or
+                  ((operandnum=3) and not(instr.opcode in [A_UMLAL,A_UMULL,A_SMLAL,A_SMULL])) then
+                  begin
+                    Consume(AS_COMMA);
+                    if not(TryBuildShifterOp(instr.Operands[4] as tarmoperand)) then
+                      Message(asmr_e_illegal_shifterop_syntax);
+                    Inc(operandnum);
+                  end
                 else
-                  Inc(operandnum);
-                Consume(AS_COMMA);
+                  begin
+                    if operandnum>Max_Operands then
+                      Message(asmr_e_too_many_operands)
+                    else
+                      Inc(operandnum);
+                    Consume(AS_COMMA);
+                  end;
               end;
             AS_SEPARATOR,
             AS_END : { End of asm operands for this opcode  }
@@ -735,7 +798,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.11  2004-11-24 22:03:26  florian
+  Revision 1.12  2005-01-05 15:22:58  florian
+    * added support of shifter ops in arm inline assembler
+
+  Revision 1.11  2004/11/24 22:03:26  florian
     * fixed arm compilation
 
   Revision 1.10  2004/11/11 19:31:33  peter

+ 3 - 2
compiler/msgidx.inc

@@ -494,6 +494,7 @@ const
   asmr_e_invalid_reg_list_for_opcode=07096;
   asmr_e_higher_cpu_mode_required=07097;
   asmr_w_unable_to_determine_reference_size_using_dword=07098;
+  asmr_e_illegal_shifterop_syntax=07099;
   asmw_f_too_many_asm_files=08000;
   asmw_f_assembler_output_not_supported=08001;
   asmw_f_comp_not_supported=08002;
@@ -650,9 +651,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 37898;
+  MsgTxtSize = 37959;
 
   MsgIdxMax : array[1..20] of longint=(
-    18,67,213,59,57,46,99,20,35,60,
+    18,67,213,59,57,46,100,20,35,60,
     40,1,1,1,1,1,1,1,1,1
   );

+ 132 - 130
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000157] of string[240]=(
+const msgtxt : array[0..000158] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000157,1..240] of char=(
+const msgtxt : array[0..000158,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -538,64 +538,65 @@ const msgtxt : array[0..000157,1..240] of char=(
   '07097_E_Higher cpu mode required ($1)'#000+
   '07098_W_No size spe','cified and unable to determine the size of the op'+
   'erands, using DWORD as default'#000+
+  '07099_E_Syntax error while trying to parse a shifter operand'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
-  '08002_F_Comp not supported'#000+
+  '08002_F_Comp not s','upported'#000+
   '08003_F_Direct not support for binary writers'#000+
-  '08004_','E_Allocating of data is only allowed in bss section'#000+
+  '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
+  '08007_E_Asm: $1 invalid combination of opcode and operand','s'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
-  '08009_E_Asm: I','nvalid effective address'#000+
+  '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
-  '08013_E_Asm: Undefined label $1'#000+
+  '08013_E_Asm: Undefined lab','el $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
-  '08','015_E_Asm: Extended type not supported for this target'#000+
+  '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
-  '08019_E_Asm: Invalid register $1'#000+
+  '08019_E_Asm: Invalid registe','r $1'#000+
   '09000_W_Source operating system redefined'#000+
-  '09001_I_Assemb','ling (pipe) $1'#000+
+  '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assember file: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_E_Assembler $1 not found, switching to external assembling'#000+
+  '09005_E_Assembler $1 not found, switching to exter','nal assembling'#000+
   '09006_T_Using assembler: $1'#000+
-  '09007_E_Error whil','e assembling exitcode $1'#000+
+  '09007_E_Error while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
-  '09011_W_Object $1 not found, Linking may fail !'#000+
-  '09012_W_Library $1 not found,',' Linking may fail !'#000+
+  '09011_W_Object $','1 not found, Linking may fail !'#000+
+  '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_E_Util $1 not found, switching to external linking'#000+
+  '09016_E_Util $1 not found, switching to external li','nking'#000+
   '09017_T_Using util $1'#000+
-  '09018_E_Creation of Executables n','ot supported'#000+
+  '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler not found, switching to external mode'#000+
-  '09022_I_Compiling resource $1'#000+
-  '09023_T_unit $1 can'#039't be statically linked, swit','ching to smart l'+
-  'inking'#000+
+  '09022_I_Compiling',' resource $1'#000+
+  '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
+  'king'#000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
   #000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
-  '09026_E_unit $1 can'#039't be smart or static linked'#000+
-  '09027_E_unit $1 can'#039't be shared or',' static linked'#000+
+  '09026_E_unit $1 can'#039't',' be smart or static linked'#000+
+  '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
-  '09032_X_Size of uninitialized data: $1 bytes'#000+
-  '09033_X_Stack space reserved: $1',' bytes'#000+
+  '09032_X_Size of ','uninitialized data: $1 bytes'#000+
+  '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
@@ -603,105 +604,106 @@ const msgtxt : array[0..000157,1..240] of char=(
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU File too short'#000+
-  '10007_U_PPU Invalid Header (no PPU at',' the begin)'#000+
+  '100','06_U_PPU File too short'#000+
+  '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Write PPU-File'#000+
+  '1001','3_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
-  '10015','_F_unexpected end of PPU-File'#000+
+  '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 and $2'#000+
-  '10021_F_Can'#039't compile unit $1, no sources ','available'#000+
+  '10020_F_Circular unit reference',' between $1 and $2'#000+
+  '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U','_Load from $1 ($2) unit $3'#000+
+  '10','026_F_There were $1 errors compiling module, stopping'#000+
+  '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032','_U_Recompiling unit, obj and asm are older than ppufile'#000+
+  '100','31_U_Recompiling unit, shared lib is older than ppufile'#000+
+  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
-  '10036_U_Second load for unit $1'#000+
+  '10036_','U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '1','0038_H_Conditional $1 was not set at startup in last compilation of'+
-  ' $2'#000+
+  '10038_H_Conditional $1 was not set at startup in last compilation of $'+
+  '2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
-  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
-  '10041_H_File $1 is newer than Releas','e PPU file $2'#000+
+  '10040_W_Can'#039't recompile unit $1, but fou','nd modifed include files'+
+  #000+
+  '10041_H_File $1 is newer than Release PPU file $2'#000+
   '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
-  '10045_U_Interface CRC changed for unit $1'#000+
-  '10046_U_Implementation CRC change','d for unit $1'#000+
+  '10045_U_Interf','ace CRC changed for unit $1'#000+
+  '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
   '10048_U_Add dependency of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
-  '10051_U_Flag for reload: $1'#000+
+  '10051_U_Flag ','for reload: $1'#000+
   '10052_U_Forced reloading'#000+
-  '10053_U_Previous stat','e of $1: $2'#000+
+  '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
-  '10058_U_Re-resolving unit $1'#000+
-  '10059_U_Skipping re-resolving unit $1, still loading used',' units'#000+
+  '10058_U_Re-resolving unit',' $1'#000+
+  '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not supported'#000+
+  '11003_E_nested response files are not supporte','d'#000+
   '11004_F_No source file name in command line'#000+
-  '11005_N_No opti','on inside $1 config file'#000+
+  '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Reading further options from $1'#000+
+  '11010_D_Reading further opt','ions from $1'#000+
   '11011_W_Target is already set to: $1'#000+
-  '11012_W_Sha','red libs not supported on DOS platform, reverting to stat'+
-  'ic'#000+
+  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
+  #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not supported by this executab'+
-  'le'#000+
-  '11017_H_','Try recompiling with -dGDB'#000+
+  '11016_W_Debug inform','ation generation is not supported by this execut'+
+  'able'#000+
+  '11017_H_Try recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output selected "$1" is no','t compatible with "$2"'#000+
+  '11020_N_Switching assembler to default source w','riting assembler'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
-  '11029__*** press enter ***'#000+
+  '11029__*** p','ress enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
-  '11031_','H_End of reading config file $1'#000+
+  '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
-  '11034_D_Reading config file "$1"'#000+
+  '11034_D_Reading config file "$1"'#000,
   '11035_D_found source file name "$1"'#000+
-  '11037_D_Defining symbol $','1'#000+
+  '11037_D_Defining symbol $1'#000+
   '11038_D_Undefining symbol $1'#000+
   '11039_E_Unknown code page'#000+
   '11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+
   'Copyright (c) 1993-2005 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FPCVERSION'#010+
+  '11024_Fr','ee Pascal Compiler version $FPCVERSION'#010+
   #010+
-  'Compiler Date      : ','$FPCDATE'#010+
+  'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
@@ -710,213 +712,213 @@ const msgtxt : array[0..000157,1..240] of char=(
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
-  'Report bugs,suggestions etc to:'#010+
+  'Report bugs,','suggestions etc to:'#010+
   '                 [email protected]'#000+
-  '11','025_**0*_put + after a boolean switch option to enable it, - to di'+
-  'sable it'#010+
+  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
+  'ble it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
-  '**2al_list sourcecode lines in assembler file'#010+
+  '**2al_list sourcecode lines in assembler f','ile'#010+
   '**2an_list node info in assembler file'#010+
-  '*L2ap_use pipes in','stead of creating temporary assembler files'#010+
+  '*L2ap_use pipes instead of creating temporary assembler files'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
-  '**1A<x>_output format:'#010+
+  '**1A<x>_output ','format:'#010+
   '**2Adefault_use default assembler'#010+
-  '3*2Aas_assemble usi','ng GNU AS'#010+
+  '3*2Aas_assemble using GNU AS'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
-  '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
+  '3*2Anasmwdosx_Win32/WDOSX object file usi','ng Nasm'#010+
   '3*2Awasm_obj file using Wasm (Watcom)'#010+
-  '3*2Anasmobj_obj',' file using Nasm'#010+
+  '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Aelf_elf32 (Linux) using internal writer'#010+
-  '3*2Acoff_coff (Go32v2) using internal writer'#010+
+  '3*2Acoff_coff (Go32v2) using internal ','writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '4*2Aas','_assemble using GNU AS'#010+
+  '4*2Aas_assemble using GNU AS'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
-  'A*2Aas_assemble using GNU AS'#010+
+  'A*2Aas_assemble using GNU AS',#010+
   'P*2Aas_assemble using GNU AS'#010+
   'S*2Aas_assemble using GNU AS'#010+
-  '**','1b_generate browser info'#010+
+  '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2Cc<x>_set default calling convention to <x>'#010+
-  '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulat','ed floating point opcodes'#010+
+  '**2CD_create also ','dynamic library (not supported)'#010+
+  '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use to <x>'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
-  '**2Cn_omit linking stage'#010+
+  '**2Cn_omi','t linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
-  '**','2Cr_range checking'#010+
+  '**2Cr_range checking'#010+
   '**2CR_verify object method call validity'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
-  '**1d<x>_defines the symbol <x>'#010+
+  '**1d<x>_defines the symbol <x','>'#010+
   '**1D_generate a DEF file'#010+
   '**2Dd<x>_set description to <x>'#010+
-  '**','2Dv<x>_set DLL version to <x>'#010+
+  '**2Dv<x>_set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2Fc<x>_sets input codepage to <x>'#010+
-  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
-  '**2F','e<x>_redirect error output to <x>'#010+
+  '**2FD<x>_s','ets the directory where to search for compiler utilities'#010+
+  '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
-  '**2FL<x>_uses <x> as dynamic linker'#010+
+  '**2FL<x>_uses <x> as dynamic linker'#010,
   '**2Fo<x>_adds <x> to object path'#010+
-  '**2Fr<x>_load error message ','file <x>'#010+
+  '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gc_generate checks for pointers'#010+
   '*g2gd_use dbx'#010+
-  '*g2gg_use gsym'#010+
-  '*g2gh_use heap trace unit (for memory leak debug','ging)'#010+
+  '*g','2gg_use gsym'#010+
+  '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gv_generates programs tracable with valgrind'#010+
   '*g2gw_generate dwarf debugging info'#010+
   '**1i_information'#010+
-  '**2iD_return compiler date'#010+
+  '**2iD_return c','ompiler date'#010+
   '**2iV_return compiler version'#010+
-  '**2iSO_return comp','iler OS'#010+
+  '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
-  '**1M<x>_set language mode to <x>'#010+
-  '**2Mfpc_free pascal dialect (de','fault)'#010+
+  '**1','M<x>_set language mode to <x>'#010+
+  '**2Mfpc_free pascal dialect (default)'#010+
   '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
   '**2Mdelphi_tries to be Delphi compatible'#010+
   '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
   '**2Mgpc_tries to be gpc compatible'#010+
-  '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
-  '**1n','_don'#039't read the default config file'#010+
+  '**2Mmacpas','_tries to be compatible to the macintosh pascal dialects'#010+
+  '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
-  '3*2OG_generate faster code (default)'#010+
+  '3*2OG_generate faster code (defaul','t)'#010+
   '**2Or_keep certain variables in registers'#010+
-  '3*2Ou_enable unc','ertain optimizations (see docs)'#010+
+  '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
-  '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
+  '3*2O3_level 3 optimizations (-O2 repeate','dly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
-  '3*3Op1_set targe','t processor to 386/486'#010+
+  '3*3Op1_set target processor to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '6*2Og_generate smaller code'#010+
-  '6*2OG_generate faster code (default)'#010+
+  '6*2OG_generate fast','er code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
-  '6*2','O0_set target processor to a MC68000'#010+
+  '6*2O0_set target processor to a MC68000'#010+
   '6*2O2_set target processor to a MC68020+ (default)'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '**1R<x>_assembler reading style:'#010+
+  '**1R<x>_assembler reading style',':'#010+
   '**2Rdefault_use default assembler'#010+
-  '3*2Ratt_read AT&T style a','ssembler'#010+
+  '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
+  '**2Sc_supports operators like C (*=,+=,/= and -=',')'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_same as -Mdelphi'#010+
-  '**2Se<','x>_compiler stops after the <x> errors (default is 1)'#010+
+  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2SI<x>_set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcorba_CORBA compatib','le interface'#010+
+  '**3SIcom','_COM compatible interface (default)'#010+
+  '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_support macros like C (global)'#010+
   '**2So_same as -Mtp'#010+
   '**2Sp_same as -Mgpc'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
-  '**2St_allow static keyword in objects'#010+
+  '**2St_allow static keyword i','n objects'#010+
   '**1s_don'#039't call assembler and linker'#010+
-  '**2sh_Generate',' script to link on host'#010+
+  '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
   '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_Target operating system:'#010+
-  '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
+  '3*2Temx_OS/2 via EMX (includi','ng EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2',' of DJ Delorie DOS extender'#010+
+  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
-  '3*2Tos2_OS/2 / eComStation'#010+
+  '3*2Tos2_OS/2 /',' eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
-  '3*2Twatcom_Watcom compat','ible DOS extender'#010+
+  '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux-68k'#010+
-  '6*2Tmacos_Macintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintosh',' m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
-  'P*2Td','arwin_Darwin and MacOS X on PowerPC'#010+
+  'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_undefines the symbol <x>'#010+
-  '**1U_unit options:'#010+
+  '**1U_unit ','options:'#010+
   '**2Un_don'#039't check the unit name'#010+
-  '**2Ur_generate relea','se unit files'#010+
+  '**2Ur_generate release unit files'#010+
   '**2Us_compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
-  '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show note','s                  t : Show tried/used files'#010+
+  '**2*_w : Show',' warnings               u : Show unit info'#010+
+  '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
-  '**2*_l : Show linenumbers            c : Show conditionals'#010+
-  '**2*_a : ','Show everything             0 : Show nothing (except errors'+
-  ')'#010+
+  '**2*_l ',': Show linenumbers            c : Show conditionals'#010+
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
-  '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
+  '**2*_    declarations if an error    x : Executa','ble info (Win32 only'+
+  ')'#010+
   '**2*_    occurs'#010+
-  '**1V_write fpcdebug.txt',' file with lots of debugging info'#010+
+  '**1V_write fpcdebug.txt file with lots of debugging info'#010+
   '3*1W<x>_Win32-like target options'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_Specify full-screen type a','pplication (OS/2 only)'#010+
+  '3*2WD_Use DEFFILE to ex','port functions of DLL or EXE'#010+
+  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
-  'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify graphic type appl','ication (MacOS only)'#010+
+  'P*2WC_Specify console ','type application (MacOS only)'#010+
+  'P*2WG_Specify graphic type application (MacOS only)'#010+
   'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1X_executable options:'#010+
   '**2Xc_link with the c library'#010+
-  '**2Xd_don'#039't use standard library search path (needed for cross com'+
-  'pile)'#010+
-  '**2XD_try to link units dynamic  ','        (defines FPC_LINK_DYNAMIC)'#010+
+  '**2Xd_don'#039't use standard library search path',' (needed for cross c'+
+  'ompile)'#010+
+  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
-  '**2Xs_strip all symbols from executable'#010+
-  '**2XS_try to link units static (default) (','defines FPC_LINK_STATIC)'#010+
+  '**2Xs_strip all symbo','ls from executable'#010+
+  '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
   '**2Xt_link with static libraries (-static is passed to linker)'#010+
   '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**1?_shows this help'#010+
+  '**1?_shows this hel','p'#010+
   '**1h_shows this help without waiting'#000
 );

+ 10 - 2
compiler/rautils.pas

@@ -66,7 +66,7 @@ Function SearchLabel(const s: string; var hl: tasmlabel;emit:boolean): boolean;
 
 type
   TOprType=(OPR_NONE,OPR_CONSTANT,OPR_SYMBOL,OPR_LOCAL,
-            OPR_REFERENCE,OPR_REGISTER,OPR_REGLIST,OPR_COND,OPR_REGSET);
+            OPR_REFERENCE,OPR_REGISTER,OPR_REGLIST,OPR_COND,OPR_REGSET,OPR_SHIFTEROP);
 
   TOprRec = record
     case typ:TOprType of
@@ -84,6 +84,7 @@ type
 {$endif powerpc}
 {$ifdef arm}
       OPR_REGSET    : (regset : tcpuregisterset);
+      OPR_SHIFTEROP : (shifterop : tshifterop);
 {$endif arm}
   end;
 
@@ -1111,7 +1112,11 @@ end;
 {$ifdef ARM}
               OPR_REGSET:
                 ai.loadregset(i-1,regset);
+              OPR_SHIFTEROP:
+                ai.loadshifterop(i-1,shifterop);
 {$endif ARM}
+              else
+                internalerror(200501051);
             end;
           end;
      ai.SetCondition(condition);
@@ -1620,7 +1625,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.99  2004-12-22 17:09:55  peter
+  Revision 1.100  2005-01-05 15:22:39  florian
+    * added support of shifter ops in arm inline assembler
+
+  Revision 1.99  2004/12/22 17:09:55  peter
     * support sizeof()
     * fix typecasting a constant like dword(4)