+ terminated the include exclude implementation for i386

  * enums inside records fixed

compiler/cg386inl.pas

@@ -935,15 +935,23 @@ implementation
                                   newreference(p^.left^.right^.left^.location.reference),R_EDI)));
                              end;
                           if (p^.left^.left^.location.loc=LOC_REFERENCE) then
-                            exprasmlist^.concat(new(pai386,op_reg_ref(asmop,S_L,R_EDI,
+                            exprasmlist^.concat(new(pai386,op_reg_ref(asmop,S_L,hregister,
                               newreference(p^.left^.right^.left^.location.reference))))
                           else
-                            exprasmlist^.concat(new(pai386,op_reg_reg(asmop,S_L,R_EDI,
+                            exprasmlist^.concat(new(pai386,op_reg_reg(asmop,S_L,hregister,
                               p^.left^.right^.left^.location.register)));
                         end
                       else
                         begin
-                           internalerror(10083);
+                           pushsetelement(p^.left^.right^.left);
+                           { normset is allways a ref }
+                           emitpushreferenceaddr(exprasmlist,
+                             p^.left^.left^.location.reference);
+                           if p^.inlinenumber=in_include_x_y then
+                             emitcall('FPC_SET_SET_BYTE',true)
+                           else
+                             emitcall('FPC_SET_UNSET_BYTE',true);
+                           {CGMessage(cg_e_include_not_implemented);}
                         end;
                    end;
               end;
@@ -956,7 +964,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.15  1998-10-21 15:12:50  pierre
+  Revision 1.16  1998-10-22 17:11:13  pierre
+    + terminated the include exclude implementation for i386
+    * enums inside records fixed
+
+  Revision 1.15  1998/10/21 15:12:50  pierre
     * bug fix for IOCHECK inside a procedure with iocheck modifier
     * removed the GPF for unexistant overloading
       (firstcall was called with procedinition=nil !)

compiler/cg68kinl.pas

@@ -826,6 +826,7 @@ implementation
             in_include_x_y,
             in_exclude_x_y:
               begin
+                 CGMessage(cg_e_include_not_implemented);
 { !!!!!!!  }
 (*               secondpass(p^.left^.left);
                  if p^.left^.right^.left^.treetype=ordconstn then
@@ -884,6 +885,7 @@ implementation
                         end
                       else
                         begin
+                           internalerror(10083);
                         end;
                    end;
                    *)
@@ -898,7 +900,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.12  1998-10-21 15:12:53  pierre
+  Revision 1.13  1998-10-22 17:11:14  pierre
+    + terminated the include exclude implementation for i386
+    * enums inside records fixed
+
+  Revision 1.12  1998/10/21 15:12:53  pierre
     * bug fix for IOCHECK inside a procedure with iocheck modifier
     * removed the GPF for unexistant overloading
       (firstcall was called with procedinition=nil !)

compiler/msgidx.inc

@@ -255,6 +255,7 @@ type tmsgconst=(
   cg_e_unable_inline_procvar,
   cg_e_no_code_for_inline_stored,
   cg_e_can_access_element_zero,
+  cg_e_include_not_implemented,
   assem_f_ev_zero_divide,
   assem_f_ev_stack_overflow,
   assem_f_ev_stack_underflow,

compiler/msgtxt.inc

@@ -268,171 +268,172 @@ const msgtxt : array[0..00093,1..240] of char=(
   'E_No code for inline procedure stored'#000+
   'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
   'se (set)length instead'#000+
+  'E_Include or exclude not implemented in this c','ase'#000+
   'F_Divide by zero in asm evaluator'#000+
-  'F_Evaluator ','stack overflow'#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+
   'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
-  'E_escape sequence ignored: $1'#000+
-  'E_Asm syntax error - Prefix not ','found'#000+
+  'E_escape seq','uence ignored: $1'#000+
+  'E_Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
   'W_Calling an overload function in an asm'#000+
-  'E_Constant value out of bounds'#000+
+  'E_Constant value out o','f bounds'#000+
   'E_Non-label pattern contains @'#000+
-  'E_Invalid ','Operand: $1'#000+
+  'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
   'E_Error in hexadecimal constant: $1'#000+
   'E_Error in integer constant: $1'#000+
-  'E_Invalid labeled opcode'#000+
+  'E_Invalid label','ed opcode'#000+
   'F_Internal error in Findtype()'#000+
-  'E_Invalid',' size for MOVSX/MOVZX'#000+
+  'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
-  'E_Invalid combination of opcode and operands'#000+
-  'W_Opcode ','$1 not in table, operands not checked'#000+
+  'E_In','valid combination of opcode and operands'#000+
+  'W_Opcode $1 not in table, operands not checked'#000+
   'F_Internal Error in ConcatOpcode()'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
   'E_Invalid three operand opcode'#000+
   'E_Assembler syntax error'#000+
-  'E_Invalid operand type'#000+
-  'E_Segment overrides not suppo','rted'#000+
+  'E_','Invalid operand type'#000+
+  'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
   'E_Invalid constant expression'#000+
-  'E_Unknown identifier: $1'#000+
-  'E_Trying to define an index register mo','re than once'#000+
+  'E_Unknown iden','tifier: $1'#000+
+  'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
   'E_Scaling value only allowed with index'#000+
-  'E_Invalid assembler syntax. No ref with brackets)'#000+
-  'E_Expressions of the form [','sreg:reg...] are currently not supported'#000+
+  'E_Invalid assembler syntax.',' No ref with brackets)'#000+
+  'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
   'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
   'E_Trying to use a negative index register'#000+
-  'E_Asm syntax error - error in reference'#000+
-  'E_Local symbols not allowed as r','eferences'#000+
+  'E_Asm syntax error - e','rror in reference'#000+
+  'E_Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid symbol name: $1'#000+
   'E_Invalid Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null label references are not allowed'#000+
-  'W_Calling of an overloaded',' function in direct assembler'#000+
+  'E_Null label ref','erences are not allowed'#000+
+  'W_Calling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - register: $1'#000+
   'E_SEG and OFFSET not supported'#000+
-  'E_Asm syntax error - in opcode operand'#000+
-  'E_Invalid String express','ion'#000+
+  'E_Asm syntax ','error - in opcode operand'#000+
+  'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
   'F_Internal Error in BuildConstant()'#000+
   'W_A repeat prefix and a segment override on <= i386 may result in erro'+
   'rs if an interrupt occurs'#000+
-  'E_Invalid or missing opcode'#000+
-  'E_Invalid combination of prefix and opco','de: $1'#000+
+  'E_Invalid or missi','ng opcode'#000+
+  'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
   'E_Assemble node syntax error'#000+
-  'E_Undefined local symbol: $1'#000+
-  'D_Starting intel styled assembler parsi','ng...'#000+
+  'E_Undefined local ','symbol: $1'#000+
+  'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
   'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
   'E_Invalid floating point register name'#000+
-  'W_Modulo not supported'#000+
-  'E_Invalid floating point constan','t: $1'#000+
+  'W_Mod','ulo not supported'#000+
+  'E_Invalid floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
-  'W_Floating point hexadecimal representation ignored'#000+
-  'W_Floating point octal representation igno','red'#000+
+  'W_Floating point hexadecimal representation ','ignored'#000+
+  'W_Floating point octal representation ignored'#000+
   'E_Invalid real constant expression'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
-  'W_Identifier $1 supposed external'#000+
-  'E_Invalid segment override expr','ession'#000+
+  'W_Identifier $1',' supposed external'#000+
+  'E_Invalid segment override expression'#000+
   'E_Strings not allowed as constants'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
-  'E_Invalid global definition'#000+
-  'E_Line separator expecte','d'#000+
+  'E_','Invalid global definition'#000+
+  'E_Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
   'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
-  'E_local symbol: $1 not found inside asm statement'#000+
-  'E_assembler code not returned to',' text'#000+
+  'E_local symbol: $1 not found ins','ide asm statement'#000+
+  'E_assembler code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'D_Creating inline asm lookup tables'#000+
   'E_Using a defined name as a local label'#000+
-  'F_internal error in HandleExtend()'#000+
+  'F_internal error in ','HandleExtend()'#000+
   'E_Invalid character: <'#000+
-  'E_Invalid ch','aracter: >'#000+
+  'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
-  'E_68020+ mode required to assemble'#000+
-  'D_Starting Motorola styled assembler parsing..','.'#000+
+  'E_68020+ mode required to assem','ble'#000+
+  'D_Starting Motorola styled assembler parsing...'#000+
   'D_Finished Motorola styled assembler parsing...'#000+
   'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
   'E_Invalid suffix for intel assembler'#000+
-  'E_Extended not supported in this mode'#000+
-  'E_Comp not supported in ','this mode'#000+
+  'E_Extended n','ot supported in this mode'#000+
+  'E_Comp not supported in this mode'#000+
   'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
-  'W_Source operating system redefined'#000+
+  'W_Source opera','ting system redefined'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can',#039't create assember file $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+
+  'W_Can'#039't call the assembler, error $1 switchin','g to external assem'+
+  'bling'#000+
   'I_Assembling $1'#000+
-  'W_Linker ','$1 not found, switching to external linking'#000+
+  'W_Linker $1 not found, switching to external linking'#000+
   'T_Using linker: $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+
+  'W_Can'#039't call the lin','ker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_','binder not found, switching to external binding'#000+
+  'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
   'X_Size of Code: $1 bytes'#000+
-  'X_Size of initialized data: $1 bytes'#000+
-  'X_Size of uninitialized data: $1 by','tes'#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+
@@ -442,189 +443,189 @@ const msgtxt : array[0..00093,1..240] of char=(
   '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 Invali','d Version $1'#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 target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
-  'F_unexpected end of PPU-File'#000+
+  'F_unexpected end of PPU-Fi','le'#000+
   'F_Invalid PPU-File entry: $1'#000+
-  'F_PPU Dbx count pr','oblem'#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_Can'#039't compile unit $1, no sources available'#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+
+  '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 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_Recompil','ing unit, obj is older than asm'#000+
+  'U_Recompiling u','nit, 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 source file supported'#000+
-  'W_DEF file can be created onl','y for OS/2'#000+
+  'W_Only one s','ource 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+
   '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_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+
-  'W_Debug information generation is not supported by this executable'#000+
-  'H_Try re','compiling with -dGDB'#000+
+  'W_Debug information gener','ation is not supported by this executable'#000+
+  'H_Try recompiling with -dGDB'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 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 un','der the 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*_+ switch option on, - off'#000+
-  '**1a_the compiler doesn'#039't delete the generated assembl','er file'#000+
+  '**1a','_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '*t1b_use EMS'#000+
   '**1B_build all modules'#000+
   '**1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
+  '**2Ch<n>_<n> bytes heap (between 1023 and ','67107840)'#000+
   '**2Ci_IO-checking'#000+
-  '**2Cn_omit linking sta','ge'#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+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
-  '**1d<x>_defines the symbol <x>'#000+
+  '**1d<x>_defines the ','symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
-  '*O2Dd<x>_set d','escription to <x>'#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_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/u','nit output path to <x>'#000+
+  '**2Fe<','x>_redirect error output to <x>'#000+
+  '**2FE<x>_set exe/unit output path to <x>'#000+
   '*L2Fg<x>_same as -Fl'#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 u','nit 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>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '**1i_information'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to the linker'#000+
+  '**1k<x>_Pass <x','> to the linker'#000+
   '**1l_write logo'#000+
-  '**1n_don'#039't read th','e default config file'#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'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
-  '**1S_syntax options'#000+
-  '**2S2_switch some Delphi 2 extensions on'#000,+
+  '**1S_syntax',' options'#000+
+  '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Si_support C++ stlyed INLINE'#000+
-  '**2Sm_support macros like C (global)'#000+
-  '**2So_tries to ','be TP/BP 7.0 compatible'#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+
-  '**2Sv_allow variable directives (cvar,external,public,export)'#000+
-  '**1s_don'#039't call assem','bler and linker (only with -a)'#000+
+  '**2Sv_allow variable directives (','cvar,external,public,export)'#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+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile 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+
+  '**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*_i : ','Show general info           p : Show compiled procedures'#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 com','patibility mod'+
+  '**2*','_b : Show all procedure          r : Rhide/GCC compatibility mod'+
   'e'#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+
-  '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
-  '**2Xs_strip all symbols',' from executable'#000+
+  '**2XD_link with dynamic libraries ','(defines FPC_LINK_DYNAMIC)'#000+
+  '**2Xs_strip all symbols from executable'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
-  '3*2Anasmcoff_coff file using Nasm'#000+
+  '3*2Anasmcoff_coff file using N','asm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
-  '3*2A','nasmobj_obj file using Nasm'#000+
+  '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#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 (still BUGGY!!!)'#000+
-  '3*2Ou_enable uncertain optimizations (see docs)'#000+
-  '3*2O1_level 1 optimizations',' (quick optimizations)'#000+
+  '3*2Ou_enable uncertain op','timizations (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_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
-  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000,+
+  '3*3Op','2_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_Windows 32 Bit'#000,+
+  '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Ao_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_optimizations'#000+
-  '6*2Oa_turn on the optimizer'#000+
+  '6*2Oa_turn on the opti','mizer'#000+
   '6*2Og_generate smaller code'#000+
-  '6*2OG_generate f','aster code (default)'#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*1T<x>_Target operating system'#000+
+  '6*1T<x>_Target ope','rating 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+

compiler/symdef.inc

@@ -149,6 +149,25 @@
          nextglobal:=nil;
       end;
 
+    { used for enumdef because the symbols are
+      inserted in the owner symtable }
+    procedure tdef.correct_owner_symtable;
+      var
+         st : psymtable;
+      begin
+         if assigned(owner) and
+            (owner^.symtabletype in [recordsymtable,objectsymtable]) then
+           begin
+              { no other definition
+                 has been inserted !! (PM) }
+              owner^.rootdef:=next;
+              st:=owner;
+              while (st^.symtabletype in [recordsymtable,objectsymtable]) do
+                st:=st^.next;
+              st^.registerdef(@self);
+           end;
+      end;
+      
 
     procedure tdef.write;
       begin
@@ -606,9 +625,9 @@
          basedef:=nil;
          rangenr:=0;
          first:=nil;
+         correct_owner_symtable;
       end;
 
-
     constructor tenumdef.init_subrange(_basedef:penumdef;_min,_max:longint);
       begin
          tdef.init;
@@ -620,6 +639,7 @@
          has_jumps:=false;
          rangenr:=0;
          first:=nil;
+         correct_owner_symtable;
       end;
 
 
@@ -3179,7 +3199,11 @@
 
 {
   $Log$
-  Revision 1.63  1998-10-20 09:32:56  peter
+  Revision 1.64  1998-10-22 17:11:21  pierre
+    + terminated the include exclude implementation for i386
+    * enums inside records fixed
+
+  Revision 1.63  1998/10/20 09:32:56  peter
     * removed some unused vars
 
   Revision 1.62  1998/10/20 08:06:58  pierre

compiler/symdefh.inc

@@ -56,6 +56,9 @@
           constructor init;
           constructor load;
           destructor  done;virtual;
+          { registers enumdef inside objects or
+            record directly in the owner symtable !! }
+          procedure correct_owner_symtable;
           procedure write;virtual;
           procedure writename;
           function  size:longint;virtual;
@@ -480,7 +483,11 @@
 
 {
   $Log$
-  Revision 1.5  1998-10-16 13:12:55  pierre
+  Revision 1.6  1998-10-22 17:11:23  pierre
+    + terminated the include exclude implementation for i386
+    * enums inside records fixed
+
+  Revision 1.5  1998/10/16 13:12:55  pierre
     * added vmt_offsets in destructors code also !!!
     * vmt_offset code for m68k