Browse Source

* fixed % parsing and added modulo support
* changed some evaulator errors to more generic illegal expresion

peter 25 years ago
parent
commit
535f63923c
5 changed files with 180 additions and 156 deletions
  1. 3 5
      compiler/errore.msg
  2. 4 6
      compiler/msgidx.inc
  3. 105 107
      compiler/msgtxt.inc
  4. 41 27
      compiler/ra386att.pas
  5. 27 11
      compiler/rautils.pas

+ 3 - 5
compiler/errore.msg

@@ -1330,11 +1330,8 @@ asmr_e_invalid_string_as_opcode_operand=E_Invalid string as opcode operand: $1
 asmr_w_CODE_and_DATA_not_supported=W_@CODE and @DATA not supported
 % @CODE and @DATA are unsupported and are ignored.
 asmr_e_null_label_ref_not_allowed=E_Null label references are not allowed
-asmr_e_ev_zero_divide=F_Divide by zero in asm evaluator
-asmr_e_ev_stack_overflow=F_Evaluator stack overflow
-asmr_e_ev_stack_underflow=F_Evaluator stack underflow
-asmr_e_ev_invalid_number=F_Invalid numeric format in asm evaluator
-asmr_e_ev_invalid_op=F_Invalid Operator in asm evaluator
+asmr_e_expr_zero_divide=E_Divide by zero in asm evaluator
+asmr_e_expr_illegal=E_Illegal expression
 asmr_e_escape_seq_ignored=E_escape sequence ignored: $1
 asmr_e_invalid_symbol_ref=E_Invalid symbol reference
 asmr_w_fwait_emu_prob=W_Fwait can cause emulation problems with emu387
@@ -1373,6 +1370,7 @@ asmr_w_far_ignored=W_FAR ignored
 asmr_e_dup_local_sym=E_Duplicate local symbol $1
 asmr_e_unknown_local_sym=E_Undefined local symbol $1
 asmr_e_unknown_label_identifier=E_Unknown label identifier $1
+asmr_e_invalid_register=E_Invalid register name
 asmr_e_invalid_fpu_register=E_Invalid floating point register name
 asmr_e_nor_not_supported=E_NOR not supported
 asmr_w_modulo_not_supported=W_Modulo not supported

+ 4 - 6
compiler/msgidx.inc

@@ -365,11 +365,8 @@ type tmsgconst=(
   asmr_e_invalid_string_as_opcode_operand,
   asmr_w_CODE_and_DATA_not_supported,
   asmr_e_null_label_ref_not_allowed,
-  asmr_e_ev_zero_divide,
-  asmr_e_ev_stack_overflow,
-  asmr_e_ev_stack_underflow,
-  asmr_e_ev_invalid_number,
-  asmr_e_ev_invalid_op,
+  asmr_e_expr_zero_divide,
+  asmr_e_expr_illegal,
   asmr_e_escape_seq_ignored,
   asmr_e_invalid_symbol_ref,
   asmr_w_fwait_emu_prob,
@@ -406,6 +403,7 @@ type tmsgconst=(
   asmr_e_dup_local_sym,
   asmr_e_unknown_local_sym,
   asmr_e_unknown_label_identifier,
+  asmr_e_invalid_register,
   asmr_e_invalid_fpu_register,
   asmr_e_nor_not_supported,
   asmr_w_modulo_not_supported,
@@ -697,4 +695,4 @@ type tmsgconst=(
 endmsgconst
 );
 const
-  MsgCRCValue : longint = 58101950;
+  MsgCRCValue : longint = -228971753;

+ 105 - 107
compiler/msgtxt.inc

@@ -388,336 +388,334 @@ const msgtxt : array[0..000111,1..240] of char=(
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
-  'F_Divide by zero in asm evaluator'#000+
-  'F_Evaluator stack overflow'#000+
-  'F_Evalu','ator stack underflow'#000+
-  'F_Invalid numeric format in asm evaluator'#000+
-  'F_Invalid Operator in asm evaluator'#000+
-  'E_escape sequence ignored: $1'#000+
+  'E_Divide by zero in asm evaluator'#000+
+  'E_Illegal expression'#000+
+  'E_escape sequ','ence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
-  'W_FADD without operand translated i','nto FADDP'#000+
+  'W_FADD without operand translated into FADDP'#000+
   'W_ENTER instruction is not supported by Linux kernel'#000+
   'W_Calling an overload function in assembler'#000+
-  'E_Unsupported symbol type for operand'#000+
+  'E_Uns','upported symbol type for operand'#000+
   'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
-  'E_Erro','r converting binary $1'#000+
+  'E_Error converting binary $1'#000+
   'E_Error converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is associated to an overloaded function'#000+
+  'W_$1 is associated to an overload','ed function'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Cannot use OLDEBP outside a nested procedure'#000+
-  'W_Procedures can'#039't return any valu','e in asm code'#000+
+  'W_Procedures can'#039't return any value in asm code'#000+
   'E_SEG not supported'#000+
   'E_Size suffix and destination or source size do not match'#000+
-  'W_Size suffix and destination or source size do not match'#000+
+  'W_Size suffix and de','stination or source size do not match'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
-  'E_Assemler syntax er','ror in operand'#000+
+  'E_Assemler syntax error in operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid String expression'#000+
-  '32bit constant created for address'#000+
+  '32bit constant created for addres','s'#000+
   'E_Unrecognized opcode $1'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
-  'E_Invalid combination of o','verride and opcode: $1'#000+
+  'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
-  'E_Undefined local symbol $1'#000+
+  'E_Un','defined local symbol $1'#000+
   'E_Unknown label identifier $1'#000+
+  'E_Invalid register name'#000+
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
-  'W_Modulo not su','pported'#000+
+  'W_Modulo not supported'#000+
   'E_Invalid floating point constant $1'#000+
   'E_Invalid floating point expression'#000+
-  'E_Wrong symbol type'#000+
+  'E_Wrong',' symbol type'#000+
   'E_Cannot index a local var or parameter with a register'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
-  'E_Strings n','ot allowed as constants'#000+
+  'E_Strings not allowed as constants'#000+
   'No type of variable specified'#000+
-  'E_assembler code not returned to text section'#000+
+  'E_assembler code not returned to t','ext section'#000+
   'E_Not a directive or local symbol $1'#000+
   'E_Using a defined name as a local label'#000+
   'E_Dollar token is used without an identifier'#000+
-  'W_32bit constant c','reated for address'#000+
+  'W_32bit constant created for address'#000+
   'N_.align is target specific, use .balign or .p2align'#000+
-  'E_Can'#039't access fields directly for parameters'#000+
+  'E_Can'#039't access f','ields directly for parameters'#000+
   'E_Can'#039't access fields of objects/classes directly'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
-  'F_C','omp not supported'#000+
+  'F_Comp not supported'#000+
   'F_Direct not support for binary writers'#000+
-  'E_Allocating of data is only allowed in bss section'#000+
+  'E_Allocating of data is only a','llowed in bss section'#000+
   'F_No binary writer selected'#000+
   'E_Asm: Opcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
-  'E_Asm: 16 Bit refer','ences not supported'#000+
+  'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
-  'E_Asm: Immediate or reference expected'#000+
+  'E_Asm: Immediate or reference expec','ted'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
   'E_Asm: Short jump is out of range $1'#000+
   'E_Asm: Undefined label $1'#000+
   'W_Source operating system redefined'#000+
-  'I_Assembling (p','ipe) $1'#000+
+  'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file: $1'#000+
   'E_Can'#039't create object file: $1'#000+
-  'E_Can'#039't create archive file: $1'#000+
+  'E_Can'#039't create a','rchive file: $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
   'T_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
-  'W_Can'#039't call the a','ssembler, error $1 switching to external assem'+
-  'bling'#000+
+  'W_Can'#039't call the assembler, error $1 switching to external assembl'+
+  'ing'#000+
   'I_Assembling $1'#000+
-  'I_Assembling smartlink $1'#000+
+  'I_Assembling smartli','nk $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
-  'W_Can'#039't call the linker, switching to e','xternal linking'#000+
+  'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_Util $1 not found, switching to external linking'#000+
-  'T_Using util $1'#000+
+  'T_Using ','util $1'#000+
   'E_Creation of Executables not supported'#000+
   'E_Creation of Dynamic/Shared Libraries not supported'#000+
   'I_Closing script $1'#000+
-  'W_resource compiler not found, ','switching to external mode'#000+
+  'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
   'F_Can'#039't post process executable $1'#000+
-  'F_Can'#039't open executable $1'#000+
+  'F_','Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
   'X_Size of initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
-  'X_Stack space reserved: $1',' bytes'#000+
+  'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
-  'U_PPU Name: $1'#000+
+  'U_PPU Name: $1',#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
-  'U_PPU is compiled',' for an other processor'#000+
+  'U_PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
-  'U_Writing $1'#000+
+  'U_Writing',' $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_Error reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
-  'E_Illegal unit nam','e: $1'#000+
+  'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
-  'F_Can'#039't compile unit $1, no sources available'#000+
+  'F_Can'#039't compile unit ','$1, no sources available'#000+
   'F_Can'#039't find unit $1'#000+
   'W_Unit $1 was not found but $2 exists'#000+
   'F_Unit $1 searched but $2 found'#000+
-  'W_Compiling the system unit requires',' the -Us switch'#000+
+  'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
-  'U_Load from $1 ($2) unit $3'#000+
+  'U_Load from $1 ($2) un','it $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
   'U_Recompiling $1, source found only'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
-  'U_Recompiling u','nit, shared lib is older than ppufile'#000+
-  'U_Recompiling unit, obj and asm are older than ppufile'#000+
+  'U_Recompiling unit, shared lib is older than ppufile'#000+
+  'U_Recompiling unit, obj and asm are older than ppu','file'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
-  'U_PPU Check file $1 ti','me $2'#000+
+  'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
-  'W_DEF file can be created only for OS/2'#000+
+  'W_DEF file can',' be created only for OS/2'#000+
   'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
   'N_No option inside $1 config file'#000+
-  'E_Illegal pa','rameter: $1'#000+
+  'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
-  'F_Unable to open file $1'#000+
+  'F_Unable to open file ','$1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
-  'F_too many IF(N)DEF','s'#000+
+  'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
-  'W_Debug information generation is not supported by this executable'#000+
+  'W_Debug information genera','tion is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
-  'E_You are using the obsolete switch $1, ple','ase use $2'#000+
+  'E_You are using the obsolete switch $1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
-  'W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  'W_Assembler output ','selected "$1" is not compatible with "$2"'#000+
   'W_"$1" assembler use forced'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-','2000 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Compiler Date  : $FPCDATE'#000+
+  'Compiler Date  : $FPCDATE',#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
-  'Report bugs,suggestions etc',' to:'#000+
+  'Report bugs,suggestions etc to:'#000+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean switch option to enable it, - to disable it'+
-  #000+
+  '**0*_put + after a boolean switch option to ','enable it, - to disable '+
+  'it'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '**2ar_list regist','er allocation/release info in assembler file'#000+
-  '**2at_list temp allocation/release info in assembler file'#000+
+  '**2ar_list register allocation/release info in assembler file'#000+
+  '**2at_list temp allocation/release info in ','assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
-  '**2CD_create also dyn','amic library (not supported)'#000+
+  '**2CD_create also dynamic library (not supported)'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
-  '**2Ci_IO-checking'#000+
+  '**2Ci_I','O-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
-  '**2Ct_stack checking'#000,
+  '**2Ct_stack checking'#000+
   '**2CX_create also smartlinked library'#000+
   '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_generate a DEF file'#000+
+  '*O1D_generate a DEF',' file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
-  '**2FD<x>_se','ts the directory where to search for compiler utilities'#000+
-  '**2Fe<x>_redirect error output to <x>'#000+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#000+
+  '**2Fe<x>_redirect error output t','o <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
-  '*','*2Fo<x>_adds <x> to object path'#000+
+  '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to unit path'#000+
+  '**2Fu<x>_adds <x> t','o unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
-  '*g2gh_use heap trace un','it (for memory leak debugging)'#000+
-  '*g2gl_use line info unit to show more info for backtraces'#000+
+  '*g2gh_use heap trace unit (for memory leak debugging)'#000+
+  '*g2gl_use line info unit to show more info for backtraces',#000+
   '*g2gc_generate checks for pointers'#000+
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
-  '**2iSP_return co','mpiler processor'#000+
+  '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
-  '**1I<x>_adds <x> to include path'#000+
+  '**1I<x>_adds <x>',' to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
-  '**1o<x>_change the name of the executable produc','ed to <x>'#000+
+  '**1o<x>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+
-  '*L1P_use pipes instead of creating temporary assembler files'#000+
+  '*L1P_use pipes ins','tead of creating temporary assembler files'#000+
   '**1S<x>_syntax options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
-  '**2Sc_supports operators like C (*=,+=,/= an','d -=)'#000+
+  '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2sa_include assertion code.'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#000+
+  '**2Se<x>_compile','r stops after the <x> errors (default is 1)'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
-  '**2Sm_support macros like C',' (global)'#000+
+  '**2Sm_support macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destructor must be done)'#000+
+  '**2Ss_','constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
-  '**1u<x','>_undefines the symbol <x>'#000+
+  '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
-  '**2Us_compile a system unit'#000+
+  '**2Us_comp','ile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
-  '**2*_w : S','how warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/used files'#000+
+  '**2*_w : Show warnings               u : Show unit info'#000+
+  '**2*_n : Show notes                  t : S','how tried/used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
-  '**2*','_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarations if an error    x : Exec','utable info (Win32 only'+
+  '**2*_l : Show linenumbers            c : Show conditionals'#000+
+  '**2*_a : Show everything         ','    0 : Show nothing (except errors'+
   ')'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
+  '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
-  '*L2Xc_link with the c library'#000+
+  '*L2Xc_link with the c ','library'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
-  '**2XS_try to link static (default) (define','s FPC_LINK_STATIC)'#000+
+  '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
-  '**0*_Processor specific options:'#000+
+  '**0*_Proc','essor specific options:'#000+
   '3*1A<x>_output format:'#000+
   '3*2Aas_assemble using GNU AS'#000+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
-  '3*2Anasmcoff_coff (Go32v2',') file using Nasm'#000+
+  '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Nasm'#000+
+  '3*2Anasmobj_obj file using N','asm'#000+
   '3*2Amasm_obj file using Masm (Microsoft)'#000+
   '3*2Atasm_obj file using Tasm (Borland)'#000+
   '3*2Acoff_coff (Go32v2) using internal writer'#000+
-  '3*2Apecoff_pecoff (Win3','2) using internal writer'#000+
+  '3*2Apecoff_pecoff (Win32) using internal writer'#000+
   '3*1R<x>_assembler reading style:'#000+
-  '3*2Ratt_read AT&T style assembler'#000+
+  '3*2Ratt_read AT&T style assemb','ler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
-  '3*','2OG_generate faster code (default)'#000+
+  '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers'#000+
-  '3*2Ou_enable uncertain optimizations (see docs)'#000+
+  '3*2Ou_enabl','e uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_le','vel 3 optimizations (same as -O2u)'#000+
+  '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
-  '3*3Op1_set target processor to 386/486'#000+
+  '3*3Op1_set target processo','r to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operating syste','m:'#000+
+  '3*1T<x>_Target operating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie DO','S extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '3*1W<x>_Win32 target options'#000+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#000+
-  '3*2WC','_Specify console type application'#000+
+  '3*2WC_Specify console type application'#000+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#000+
-  '3*2WG_Specify graphic type application'#000+
+  '3*','2WG_Specify graphic type application'#000+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#000+
   '3*2WR_Generate relocation code'#000+
-  '6*1A<x>_output forma','t'#000+
+  '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Syntax (old GAS)'#000+
+  '6*2Amit_MIT Syntax (old',' GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
-  '6*2OG_generate faster code (defaul','t)'#000+
+  '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
-  '6*1R<x>_assembler reading style:'#000+
+  '6*1R','<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
-  '6*2TATARI_Atari ST/STe/TT'#000,
+  '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows this ','help without waiting'#000
 );

+ 41 - 27
compiler/ra386att.pas

@@ -399,34 +399,44 @@ begin
            len:=1;
            actasmpattern[len]:='%';
            c:=current_scanner^.asmgetchar;
-           while c in ['a'..'z','A'..'Z','0'..'9'] do
-            Begin
-              inc(len);
-              actasmpattern[len]:=c;
-              c:=current_scanner^.asmgetchar;
-            end;
-           actasmpattern[0]:=chr(len);
-           uppervar(actasmpattern);
-           if (actasmpattern = '%ST') and (c='(') then
-            Begin
-              actasmpattern:=actasmpattern+c;
-              c:=current_scanner^.asmgetchar;
-              if c in ['0'..'9'] then
-               actasmpattern:=actasmpattern + c
-              else
-               Message(asmr_e_invalid_fpu_register);
-              c:=current_scanner^.asmgetchar;
-              if c <> ')' then
-               Message(asmr_e_invalid_fpu_register)
-              else
+           { to be a register there must be a letter and not a number }
+           if c in ['0'..'9'] then
+            begin
+              actasmtoken:=AS_MOD;
+              {Message(asmr_w_modulo_not_supported);}
+            end
+           else
+            begin
+              while c in ['a'..'z','A'..'Z','0'..'9'] do
                Begin
-                 actasmpattern:=actasmpattern + c;
-                 c:=current_scanner^.asmgetchar; { let us point to next character. }
+                 inc(len);
+                 actasmpattern[len]:=c;
+                 c:=current_scanner^.asmgetchar;
+               end;
+              actasmpattern[0]:=chr(len);
+              uppervar(actasmpattern);
+              if (actasmpattern = '%ST') and (c='(') then
+               Begin
+                 actasmpattern:=actasmpattern+c;
+                 c:=current_scanner^.asmgetchar;
+                 if c in ['0'..'9'] then
+                  actasmpattern:=actasmpattern + c
+                 else
+                  Message(asmr_e_invalid_fpu_register);
+                 c:=current_scanner^.asmgetchar;
+                 if c <> ')' then
+                  Message(asmr_e_invalid_fpu_register)
+                 else
+                  Begin
+                    actasmpattern:=actasmpattern + c;
+                    c:=current_scanner^.asmgetchar; { let us point to next character. }
+                  end;
                end;
+              if is_register(actasmpattern) then
+               exit;
+              Message(asmr_e_invalid_register);
+              actasmtoken:=AS_NONE;
             end;
-           if is_register(actasmpattern) then
-            exit;
-           Message(asmr_w_modulo_not_supported);
          end;
 
        '1'..'9': { integer number }
@@ -507,7 +517,7 @@ begin
                   begin
                     Message1(asmr_e_invalid_float_const,actasmpattern+c);
                     actasmtoken:=AS_NONE;
-                 end;
+                  end;
                end;
              'X': { hexadecimal }
                Begin
@@ -2048,7 +2058,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.80  2000-05-23 20:36:28  peter
+  Revision 1.81  2000-05-26 18:23:11  peter
+    * fixed % parsing and added modulo support
+    * changed some evaulator errors to more generic illegal expresion
+
+  Revision 1.80  2000/05/23 20:36:28  peter
     + typecasting support for variables, but be carefull as word,byte can't
       be used because they are reserved assembler keywords
 

+ 27 - 11
compiler/rautils.pas

@@ -229,7 +229,7 @@ begin
      RPNStack[RPNTop]:=Num;
    end
   else
-   Message(asmr_e_ev_stack_overflow);
+   Message(asmr_e_expr_illegal);
 end;
 
 
@@ -242,7 +242,7 @@ begin
      Dec(RPNTop);
    end
   else
-   Message(asmr_e_ev_stack_underflow);
+   Message(asmr_e_expr_illegal);
 end;
 
 
@@ -278,7 +278,11 @@ begin
         if Temp <> 0 then
          RPNPush(RPNPop mod Temp)
         else
-         Message(asmr_e_ev_zero_divide);
+         begin
+           Message(asmr_e_expr_zero_divide);
+           { push 1 for error recovery }
+           RPNPush(1);
+         end;
       end;
     '^' : RPNPush(RPNPop XOR RPNPop);
     '/' :
@@ -287,7 +291,11 @@ begin
         if Temp <> 0 then
          RPNPush(RPNPop div Temp)
         else
-         Message(asmr_e_ev_zero_divide);
+         begin
+           Message(asmr_e_expr_zero_divide);
+           { push 1 for error recovery }
+           RPNPush(1);
+         end;
       end;
    end
   else
@@ -303,7 +311,11 @@ begin
      if LocalError = 0 then
       RPNPush(Temp)
      else
-      Message(asmr_e_ev_invalid_number);
+      begin
+        Message(asmr_e_expr_illegal);
+        { push 1 for error recovery }
+        RPNPush(1);
+      end;
    end;
 end;
 
@@ -318,7 +330,7 @@ begin
      OpStack[OpTop].is_prefix:=prefix;
    end
   else
-   Message(asmr_e_ev_stack_overflow);
+   Message(asmr_e_expr_illegal);
 end;
 
 
@@ -331,7 +343,7 @@ begin
      Dec(OpTop);
    end
   else
-   Message(asmr_e_ev_stack_underflow);
+   Message(asmr_e_expr_illegal);
 end;
 
 
@@ -348,8 +360,8 @@ begin
       Priority:=2;
     '|','&','^','~' :
       Priority:=0;
-  else
-    Message(asmr_e_ev_invalid_op);
+    else
+      Message(asmr_e_expr_illegal);
   end;
 end;
 
@@ -430,7 +442,7 @@ begin
          end; { Case }
        end
      else
-      Message(asmr_e_ev_invalid_op);  { Handle bad input error }
+      Message(asmr_e_expr_illegal);  { Handle bad input error }
    end;
 
 { Pop off the remaining operators }
@@ -1528,7 +1540,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.45  2000-05-23 20:36:28  peter
+  Revision 1.46  2000-05-26 18:23:11  peter
+    * fixed % parsing and added modulo support
+    * changed some evaulator errors to more generic illegal expresion
+
+  Revision 1.45  2000/05/23 20:36:28  peter
     + typecasting support for variables, but be carefull as word,byte can't
       be used because they are reserved assembler keywords