* fix for bug #848 (that still genrated wrong code)

  + better testing for variables used in assembler
    (gives an error if variable is not directly reachable !)

compiler/errore.msg

@@ -1291,6 +1291,10 @@ asmr_e_relocatable_symbol_not_allowed=E_Relocatable symbol is not allowed
 % You can't use a relocatable symbol (variable/typed constant) here.
 asmr_e_invalid_reference_syntax=E_Invalid reference syntax
 % There is an error in the reference.
+asmr_e_local_para_unreachable=E_You can not reach $1 from that code
+% You can not read directly the value of local or para
+% of a higher level in assembler code (except for
+% local assembler code without parameter nor locals).
 asmr_e_local_label_not_allowed_as_ref=E_Local symbols/labels aren't allowed as references
 % You can't use local symbols/labels as references
 asmr_e_wrong_base_index=E_Invalid base and index register usage
@@ -1784,4 +1788,4 @@ ol_end=**1h_shows this help without waiting
 #
 
 # The End...
-#
+#

compiler/msgidx.inc

@@ -348,6 +348,7 @@ type tmsgconst=(
   asmr_e_invalid_constant_expression,
   asmr_e_relocatable_symbol_not_allowed,
   asmr_e_invalid_reference_syntax,
+  asmr_e_local_para_unreachable,
   asmr_e_local_label_not_allowed_as_ref,
   asmr_e_wrong_base_index,
   asmr_e_wrong_scale_factor,

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000108] of string[240]=(
+const msgtxt : array[0..000109] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000108,1..240] of char=(
+const msgtxt : array[0..000109,1..240] of char=(
 {$endif Delphi}
   'T_Compiler: $1'#000+
   'D_Compiler OS: $1'#000+
@@ -370,115 +370,116 @@ const msgtxt : array[0..000108,1..240] of char=(
   'E_Invalid constant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
   'E_Invalid ref','erence syntax'#000+
+  'E_You can not reach $1 from that code'#000+
   'E_Local symbols/labels aren'#039't allowed as references'#000+
   'E_Invalid base and index register usage'#000+
   'E_Wrong scale factor specified'#000+
   'E_Multiple index register usage'#000+
   'E_Invalid operand type'#000+
-  'E_Invalid string as opcode operand: $1'#000+
-  'W_@CODE a','nd @DATA not supported'#000+
+  '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_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
-  'F_Invalid Operator in asm evaluator'#000+
-  'E_escape s','equence ignored: $1'#000+
+  'F_Invali','d Operator in asm evaluator'#000+
+  'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'W_Calling an overload function in assembler'#000+
   'E_Unsupported symbol type for operand'#000+
-  'E_Constant value out of bounds'#000+
+  'E_Constant value out of ','bounds'#000+
   'E_Error converting decimal $1'#000+
-  'E','_Error converting octal $1'#000+
+  'E_Error converting octal $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+
   'E_Cannot use SELF outside a method'#000+
-  'E_Cannot use OLDEBP outside a nested procedure'#000+
-  'W','_Procedures can'#039't return any value in asm code'#000+
+  'E_Cannot u','se OLDEBP outside a nested procedure'#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+
-  'E_Assembler syntax error'#000+
-  'E_Invalid combination of opcode ','and operands'#000+
+  'E_Assembler syntax ','error'#000+
+  'E_Invalid combination of opcode and operands'#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+
   'E_Invalid or missing opcode'#000+
-  'E_Invalid combination of prefix and opcode: $1'#000+
-  'E_Invalid combinat','ion of override and opcode: $1'#000+
+  'E_Invalid combination of pr','efix 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_Unknown label identifier $1'#000+
-  'E_Invalid floating point register name'#000+
+  'E_Invalid floating point reg','ister name'#000+
   'E_NOR not supported'#000+
-  'W_Modul','o not supported'#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_Cannot index a local var or parameter with a register'#000+
-  'E_Invalid segment override expression'#000+
+  'E_Invalid segment override expression',#000+
   'W_Identifier $1 supposed external'#000+
-  'E_S','trings not 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_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 co','nstant created for address'#000+
+  'E_Dollar token is',' used without an identifier'#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 fields of objects/classes directly'#000+
-  'F_Too many assembler files'#000+
-  'F_Selected assembler output not suppo','rted'#000+
+  'F_Too many assembler files',#000+
+  'F_Selected assembler output 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+
   '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 B','it references not supported'#000+
+  'E_Asm: $1 invalid combinat','ion of opcode and operands'#000+
+  'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
   'E_Asm: Immediate or reference expected'#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_Assem','bling (pipe) $1'#000+
+  'W_Sou','rce operating system redefined'#000+
+  'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember 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 assembler, error $1 switching to external assembl'+
-  'ing'#000+
-  'I_As','sembling $1'#000+
+  'W_Can'#039't call the assembler, error $1',' switching to external assem'+
+  'bling'#000+
+  'I_Assembling $1'#000+
   'I_Assembling smartlink $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 external linking'#000+
-  'I_Linking $1'#000+
-  'W_Util $1 not found, switch','ing to external linking'#000+
+  'I_','Linking $1'#000+
+  'W_Util $1 not found, switching to external linking'#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 exter','nal mode'#000+
   'I_Compiling resource $1'#000+
-  'F_Can',#039't post process executable $1'#000+
+  'F_Can'#039't post process 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 commited: $1 bytes'#000+
-  'T_Unitsearch: $1',#000+
+  'X_Stack spa','ce commited: $1 bytes'#000+
+  'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
@@ -487,8 +488,8 @@ const msgtxt : array[0..000108,1..240] of char=(
   '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 t','arget'#000+
+  'U_PPU is compiled for an other proc','essor'#000+
+  'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
@@ -497,204 +498,204 @@ const msgtxt : array[0..000108,1..240] of char=(
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
-  'F_Too much units'#000+
-  'F_Circular unit reference between',' $1 and $2'#000+
+  'F_Too much u','nits'#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 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+
-  'F_There were $1 errors compiling module,',' stopping'#000+
+  'F_','There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $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 unit, 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 ppufile'#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 time $2'#000+
-  '$1 [options] <inputfile> [options]'#000+
-  'W_Only one sour','ce file supported'#000+
+  '$1 [options]',' <inputfile> [options]'#000+
+  'W_Only one source file supported'#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 parameter: $1'#000+
-  'H_-? writes help pages'#000+
-  'F_Too many config fil','es nested'#000+
+  'H_-? w','rites help pages'#000+
+  'F_Too many config files nested'#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)DEFs'#000+
-  'F_too many ENDIFs'#000+
-  'F_open conditional at the end of the',' file'#000+
+  'F_too many ENDIF','s'#000+
+  'F_open conditional at the end of the file'#000+
   'W_Debug information generation 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, please use $2'#000+
-  'N_Switching assembler to default source writi','ng assembler'#000+
+  'N_Switc','hing assembler to default source writing assembler'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
-  'Compiler Target: $FPCTARGET'#000+
+  'Compiler Target: $','FPCTARGET'#000+
   #000+
-  'This program comes under th','e GNU General Public Licence'#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+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean switch option to enable it, - to disable it'+
-  #000+
-  '**1a_the compiler doesn'#039't dele','te the generated assembler file'#000+
+  '**0*_put + after a boolean switch option to enable it, - to dis','able '+
+  'it'#000+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines 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','_generate browser info'#000+
+  '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
   '**2CD_create also dynamic library (not supported)'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
-  '**2Cn_omit linking stage'#000+
-  '**2Co_check overflow ','of integer operations'#000+
+  '**2Cn_om','it 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+
   '**2CX_create also smartlinked library'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
-  '*O2Dd<x>_set description to <x>'#000+
-  '*O2Dw_PM applicatio','n'#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>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
-  '**2FE<x>_set exe/unit output path to <x>'#000+
-  '**2Fi<x>_a','dds <x> to include path'#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+
   '**2Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
-  '**2FU<x>_set unit output path to <x>, overrid','es -FE'#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 unit (for memory leak debugging)'#000+
   '*g2gl_use line info unit to show more info for backtraces'#000+
-  '*g2gc_generate checks for pointers'#000+
+  '*g2gc_generate che','cks for pointers'#000+
   '**1i_information'#000+
-  '**2i','D_return compiler date'#000+
+  '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to the linker'#000+
-  '**1l_writ','e logo'#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 produced to <x>'#000+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+
-  '*L1P_use pipes instead of creating temporary assembler files'#000+
-  '**1S<x>_syntax',' options:'#000+
+  '*L1P_use pipes instead of creating te','mporary assembler files'#000+
+  '**1S<x>_syntax options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#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+
-  '**2Sg_allow L','ABEL and GOTO'#000+
+  '**2Se<x>_compiler 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+
   '**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+
-  '*','*2St_allow static keyword in objects'#000+
+  '**2Ss_constructor name mu','st 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_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Us_compile a system unit'#000+
-  '**1v<x>_Be verbose. <x> is a combinatio','n of the following letters:'#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 : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/used files'#000+
-  '**2*_h : Show hints                 ',' m : Show defined macros'#000+
+  '**2*_n : Show notes                  t : Show tried/used file','s'#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 pr','ocedure          r : Rhide/GCC compatibility mod'+
-  'e'#000+
+  '**2*_a : Show everything             0 : Show nothin','g (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+
-  '**2Xs_strip all symbols from executable'#000+
-  '**2XD_try',' to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
+  '**2Xs_strip',' all symbols from executable'#000+
+  '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#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*_Processor specific opti','ons:'#000+
   '3*1A<x>_output format:'#000+
-  '3*2Aas_ass','emble using GNU AS'#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*2Anasmelf_elf32 (Linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
-  '3*2Amasm_obj file using Masm (Microsoft)'#000+
-  '3*2Atasm_obj',' file using Tasm (Borland)'#000+
+  '3*2Amasm_obj fi','le using Masm (Microsoft)'#000+
+  '3*2Atasm_obj file using Tasm (Borland)'#000+
   '3*2Acoff_coff (Go32v2) 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*2Rintel_read Intel style assembler'#000+
-  '3*2Rdirect_copy ','assembler text directly to assembler file'#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*2Or_keep certain variables in registers'#000+
-  '3*2Ou_enable uncertain optimizations (see docs)'#000+
-  '3*2O1_level 1 optimi','zations (quick optimizations)'#000+
+  '3*2Ou_enable uncertain optimiz','ations (see docs)'#000+
+  '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#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*3Op2_set target processor to Pentium/Penti','umMMX (tm)'#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 system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
-  '3*2TLINUX_Linux'#000+
+  '3*2TLINU','X_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
-  '3*2TWin32_Win','dows 32 Bit'#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*2WD_Use DEFFILE to export functions of DLL or EXE'#000+
-  '3*2WG_Specify graphic type application'#000+
-  '3*2WN_Do not generat','e relocation code (necessary for debugging)'#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 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*2Amot_Standard Motorola assembler'#000+
-  '6*1O_optimizati','ons:'#000+
+  '6*2Amot_Stand','ard 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 (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*2RMOT_read motorola style ','assembler'#000+
+  '6*1R<x>_assembler readi','ng 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+
@@ -702,5 +703,5 @@ const msgtxt : array[0..000108,1..240] of char=(
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows this help without waitin','g'#000
 );

compiler/psub.pas

@@ -1866,6 +1866,9 @@ begin
 
    parse_proc_dec;
 
+   procinfo^.sym:=aktprocsym;
+   procinfo^.def:=aktprocsym^.definition;
+
 { set the default function options }
    if parse_only then
     begin
@@ -1989,7 +1992,12 @@ end.
 
 {
   $Log$
-  Revision 1.51  2000-02-27 14:44:39  peter
+  Revision 1.52  2000-03-15 23:10:00  pierre
+    * fix for bug 848 (that still genrated wrong code)
+    + better testing for variables used in assembler
+      (gives an error if variable is not directly reachable !)
+
+  Revision 1.51  2000/02/27 14:44:39  peter
     * if calling convention doesn't match don't print note about
       different manglednames
 

compiler/ra386att.pas

@@ -1255,7 +1255,7 @@ var
         BuildReference;
       AS_ID: { only a variable is allowed ... }
         Begin
-          if not SetupVar(actasmpattern) then
+          if not SetupVar(actasmpattern,false) then
             Message(asmr_e_invalid_reference_syntax);
           Consume(AS_ID);
           case actasmtoken of
@@ -1359,7 +1359,7 @@ Begin
            else
             begin
               InitRef;
-              if SetupVar(actasmpattern) then
+              if SetupVar(actasmpattern,false) then
                begin
                  expr:=actasmpattern;
                  Consume(AS_ID);
@@ -1985,7 +1985,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.71  2000-02-09 13:23:01  peter
+  Revision 1.72  2000-03-15 23:10:01  pierre
+    * fix for bug 848 (that still genrated wrong code)
+    + better testing for variables used in assembler
+      (gives an error if variable is not directly reachable !)
+
+  Revision 1.71  2000/02/09 13:23:01  peter
     * log truncated
 
   Revision 1.70  2000/01/28 09:41:39  peter
@@ -2050,4 +2055,3 @@ end.
       constant expressions
 
 }
-

compiler/ra386int.pas

@@ -1024,7 +1024,7 @@ Begin
                Message(asmr_e_only_add_relocatable_symbol);
              oldbase:=opr.ref.base;
              opr.ref.base:=R_NO;
-             if not SetupVar(actasmpattern) then
+             if not SetupVar(actasmpattern,GotOffset) then
                Message1(sym_e_unknown_id,actasmpattern);
              if GotOffset then
               if hasvar and (opr.ref.base=procinfo^.framepointer) then
@@ -1353,7 +1353,7 @@ Begin
             { is it a normal variable ? }
              Begin
                InitRef;
-               if SetupVar(actasmpattern) then
+               if SetupVar(actasmpattern,false) then
                 begin
                   expr:=actasmpattern;
                   Consume(AS_ID);
@@ -1802,7 +1802,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.60  2000-03-02 11:48:31  pierre
+  Revision 1.61  2000-03-15 23:10:01  pierre
+    * fix for bug 848 (that still genrated wrong code)
+    + better testing for variables used in assembler
+      (gives an error if variable is not directly reachable !)
+
+  Revision 1.60  2000/03/02 11:48:31  pierre
    * fix for bug 848
 
   Revision 1.59  2000/02/13 22:46:28  florian

compiler/rautils.pas

@@ -97,7 +97,7 @@ type
     Function  SetupResult:boolean;
     Function  SetupSelf:boolean;
     Function  SetupOldEBP:boolean;
-    Function  SetupVar(const hs:string): Boolean;
+    Function  SetupVar(const hs:string;GetOffset : boolean): Boolean;
     Function  SetupDirectVar(const hs:string): Boolean;
     Procedure InitRef;
   end;
@@ -722,7 +722,7 @@ Begin
 end;
 
 
-Function TOperand.SetupVar(const hs:string): Boolean;
+Function TOperand.SetupVar(const hs:string;GetOffset : boolean): Boolean;
 { search and sets up the correct fields in the Instr record }
 { for the NON-constant identifier passed to the routine.    }
 { if not found returns FALSE.                               }
@@ -761,7 +761,27 @@ Begin
             opr.ref.symbol:=newasmsymbol(pvarsym(sym)^.mangledname);
           parasymtable :
             begin
-              opr.ref.base:=procinfo^.framepointer;
+              { if we only want the offset we don't have to care
+                the base will be zeroed after ! }
+              if (lexlevel=pvarsym(sym)^.owner^.symtablelevel) or
+              { this below is wrong because there are two parast
+                for global functions one of interface the second of
+                implementation
+              if (pvarsym(sym)^.owner=procinfo^.def^.parast) or }
+                GetOffset then
+                opr.ref.base:=procinfo^.framepointer
+              else
+                begin
+                  if (procinfo^.framepointer=R_ESP) and
+                     assigned(procinfo^.parent) and
+                     (lexlevel=pvarsym(sym)^.owner^.symtablelevel+1) and
+                     { same problem as above !!
+                     (procinfo^.parent^.sym^.definition^.parast=pvarsym(sym)^.owner) and }
+                     (lexlevel>normal_function_level) then
+                    opr.ref.base:=procinfo^.parent^.framepointer
+                  else
+                    message1(asmr_e_local_para_unreachable,hs);
+                end;
               opr.ref.offset:=pvarsym(sym)^.address;
               opr.ref.offsetfixup:=aktprocsym^.definition^.parast^.address_fixup;
               opr.ref.options:=ref_parafixup;
@@ -772,7 +792,23 @@ Begin
                 opr.ref.symbol:=newasmsymbol(pvarsym(sym)^.mangledname)
               else
                 begin
-                  opr.ref.base:=procinfo^.framepointer;
+                  { if we only want the offset we don't have to care
+                    the base will be zeroed after ! }
+                  if (lexlevel=pvarsym(sym)^.owner^.symtablelevel) or
+                  {if (pvarsym(sym)^.owner=procinfo^.def^.localst) or}
+                    GetOffset then
+                    opr.ref.base:=procinfo^.framepointer
+                  else
+                    begin
+                      if (procinfo^.framepointer=R_ESP) and
+                         assigned(procinfo^.parent) and
+                         (lexlevel=pvarsym(sym)^.owner^.symtablelevel+1) and
+                         {(procinfo^.parent^.sym^.definition^.localst=pvarsym(sym)^.owner) and}
+                         (lexlevel>normal_function_level) then
+                        opr.ref.base:=procinfo^.parent^.framepointer
+                      else
+                        message1(asmr_e_local_para_unreachable,hs);
+                    end;
                   opr.ref.offset:=-(pvarsym(sym)^.address);
                   opr.ref.options:=ref_localfixup;
                   opr.ref.offsetfixup:=aktprocsym^.definition^.localst^.address_fixup;
@@ -1443,7 +1479,12 @@ end;
 end.
 {
   $Log$
-  Revision 1.35  2000-02-09 13:23:03  peter
+  Revision 1.36  2000-03-15 23:10:01  pierre
+    * fix for bug 848 (that still genrated wrong code)
+    + better testing for variables used in assembler
+      (gives an error if variable is not directly reachable !)
+
+  Revision 1.35  2000/02/09 13:23:03  peter
     * log truncated
 
   Revision 1.34  2000/01/07 01:14:37  peter
@@ -1496,4 +1537,4 @@ end.
   Revision 1.20  1999/07/29 20:54:06  peter
     * write .size also
 
-}
+}