* problems with readln fixed: esi wasn't restored correctly when

    reading ordinal fields of objects futher the register allocation
    didn't take care of the extra register when reading ordinal values
  * enumerations can now be used in constant indexes of properties

compiler/cg386flw.pas

@@ -282,7 +282,7 @@ implementation
 
          { align loop target }
          if not(cs_littlesize in aktglobalswitches) then
-           exprasmlist^.concat(new(pai_align,init(4)));
+           exprasmlist^.concat(new(pai_align,init_op(4,$90)));
 
          emitlab(l3);
 
@@ -818,7 +818,13 @@ do_jmp:
 end.
 {
   $Log$
-  Revision 1.53  1999-10-05 22:01:52  pierre
+  Revision 1.54  1999-10-21 16:41:37  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.53  1999/10/05 22:01:52  pierre
    * bug exit('test') + fail for classes
 
   Revision 1.52  1999/09/27 23:44:46  peter

compiler/cg386inl.pas

@@ -82,7 +82,9 @@ implementation
         oldregisterdef : boolean;
       begin
         { Get the accumulator first so it can't be used in the dest }
-        hregister:=getexplicitregister32(accumulator);
+        if (dest^.resulttype^.deftype=orddef) and
+          not(is_64bitint(dest^.resulttype)) then
+          hregister:=getexplicitregister32(accumulator);
         { process dest }
         SecondPass(dest);
         if Codegenerror then
@@ -93,7 +95,7 @@ implementation
             floatstore(PFloatDef(dest^.resulttype)^.typ,dest^.location.reference);
           orddef:
             begin
-              if porddef(dest^.resulttype)^.typ in [u64bit,s64bit] then
+              if is_64bitint(dest^.resulttype) then
                 begin
                    emit_movq_reg_loc(R_EDX,R_EAX,dest^.location);
                 end
@@ -146,6 +148,7 @@ implementation
                     RegisterDef := OldRegisterDef;
                     disposetree(hp);
                   End;
+                 ungetregister(hregister);
                end;
             End;
           else
@@ -153,7 +156,6 @@ implementation
         end;
         { free used registers }
         del_locref(dest^.location);
-        ungetregister(hregister);
       end;
 
 
@@ -202,6 +204,8 @@ implementation
            dummycoll  : tdefcoll;
            iolabel    : pasmlabel;
            npara      : longint;
+           esireloaded : boolean;
+
         begin
            { here we don't use register calling conventions }
            dummycoll.register:=R_NO;
@@ -286,6 +290,7 @@ implementation
 
                 while assigned(node) do
                   begin
+                     esireloaded:=false;
                      pushusedregisters(pushed,$ff);
                      hp:=node;
                      node:=node^.right;
@@ -419,7 +424,11 @@ implementation
                                   dec(fpuvaroffset);
                                 }
                                 if doread then
-                                  StoreDirectFuncResult(hp^.left);
+                                  begin
+                                     maybe_loadesi;
+                                     esireloaded:=true;
+                                     StoreDirectFuncResult(hp^.left);
+                                  end;
                               end;
                             orddef :
                               begin
@@ -440,13 +449,18 @@ implementation
                                     emitcall(rdwrprefix[doread]+'BOOLEAN');
                                 end;
                                 if doread then
-                                  StoreDirectFuncResult(hp^.left);
+                                  begin
+                                     maybe_loadesi;
+                                     esireloaded:=true;
+                                     StoreDirectFuncResult(hp^.left);
+                                  end;
                               end;
                           end;
                        end;
                    { load ESI in methods again }
                      popusedregisters(pushed);
-                     maybe_loadesi;
+                     if not(esireloaded) then
+                       maybe_loadesi;
                   end;
              end;
          { Insert end of writing for textfiles }
@@ -1409,7 +1423,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.73  1999-09-28 20:48:23  florian
+  Revision 1.74  1999-10-21 16:41:38  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.73  1999/09/28 20:48:23  florian
     * fixed bug 610
     + added $D- for TP in symtable.pas else it can't be compiled anymore
       (too much symbols :()

compiler/cgai386.pas

@@ -2787,6 +2787,32 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
          end;
    end;
 
+  var
+     ls : longint;
+
+  procedure largest_size(p : pnamedindexobject);{$ifndef FPC}far;{$endif}
+
+    begin
+       if (psym(p)^.typ=varsym) and
+         (pvarsym(p)^.getsize>ls) then
+         ls:=pvarsym(p)^.getsize;
+    end;
+
+  procedure alignstack(alist : paasmoutput);
+
+    begin
+{$ifdef dummy}
+       if (cs_optimize in aktglobalswitches) and
+         (aktoptprocessor in [classp5,classp6]) then
+         begin
+            ls:=0;
+            aktprocsym^.definition^.localst^.foreach({$ifndef TP}@{$endif}largest_size);
+            if ls>=8 then
+              alist^.insert(new(paicpu,op_const_reg(A_AND,S_L,-8,R_ESP)));
+         end;
+{$endif dummy}
+    end;
+
   procedure genentrycode(alist : paasmoutput;const proc_names:Tstringcontainer;make_global:boolean;
                          stackframe:longint;
                          var parasize:longint;var nostackframe:boolean;
@@ -2899,6 +2925,7 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
           end
       else
           begin
+              alignstack(alist);
               if (aktprocsym^.definition^.proctypeoption in [potype_unitinit,potype_proginit,potype_unitfinalize]) then
                 parasize:=0
               else
@@ -3419,7 +3446,13 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
 end.
 {
   $Log$
-  Revision 1.54  1999-10-21 14:29:32  peter
+  Revision 1.55  1999-10-21 16:41:38  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.54  1999/10/21 14:29:32  peter
     * redesigned linker object
     + library support for linux (only procedures can be exported)
 

compiler/errore.msg

@@ -797,6 +797,7 @@ parser_e_proc_directive_expected=E_Procedure directive expected
 %   p : procedure;stdcall=nil;
 %   p : procedure stdcall=nil;
 % \end{verbatim}
+parser_e_invalid_property_index_value=E_The value for a property index must be of an ordinal type
 % \end{description}
 #
 # Type Checking

compiler/msgidx.inc

@@ -212,6 +212,7 @@ type tmsgconst=(
   parser_e_ill_property_storage_sym,
   parser_e_only_publishable_classes_can__be_published,
   parser_e_proc_directive_expected,
+  parser_e_invalid_property_index_value,
   type_e_mismatch,
   type_e_incompatible_types,
   type_e_not_equal_types,

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000102] of string[240]=(
+const msgtxt : array[0..000103] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000102,1..240] of char=(
+const msgtxt : array[0..000103,1..240] of char=(
 {$endif Delphi}
   'T_Compiler: $1'#000+
   'D_Compiler OS: $1'#000+
@@ -226,449 +226,450 @@ const msgtxt : array[0..000102,1..240] of char=(
   'E_This symbol isn'#039't allowed as storage symbol'#000+
   'E_Only clas','s which are compiled in $M+ mode can be published'#000+
   'E_Procedure directive expected'#000+
+  'E_The value for a property index must be of an ordinal type'#000+
   'E_Type mismatch'#000+
   'E_Incompatible types: got "$1" expected "$2"'#000+
   'E_Type mismatch between $1 and $2'#000+
-  'E_Type identifier expected'#000+
+  'E_Ty','pe identifier expected'#000+
   'E_Variable identifier expected'#000+
-  'E_Inte','ger expression expected, but got "$1"'#000+
+  'E_Integer expression expected, but got "$1"'#000+
   'E_Boolean expression expected, but got "$1"'#000+
   'E_Ordinal expression expected'#000+
   'E_pointer type expected, but got "$1"'#000+
-  'E_class type expected, but got "$1"'#000+
+  'E_class type expected, but got',' "$1"'#000+
   'E_Variable or type indentifier expected'#000+
-  'E_Can'#039't evalua','te constant expression'#000+
+  'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'eger type'#000+
-  'H_use DIV instead to get an integer result'#000+
-  'E_string types doesn'#039't ','match, because of $V+ mode'#000+
+  'H_use ','DIV instead to get an integer result'#000+
+  'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
   'E_Type conflict between set elements'#000+
-  'W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
-  'E_Integer or real exp','ression expected'#000+
+  'W_lo/hi(dword/qwo','rd) returns the upper/lower word/dword'#000+
+  'E_Integer or real expression expected'#000+
   'E_Wrong type $1 in array constructor'#000+
   'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
   'E_Method (variable) and Procedure (variable) are not compatible'#000+
-  'E_Illegal constant passed to internal math function'#000+
-  'E_Can'#039't get th','e address of constants'#000+
+  'E_Ille','gal constant passed to internal math function'#000+
+  'E_Can'#039't get the address of constants'#000+
   'E_Argument must be l-value'#000+
   'E_Can'#039't assign local procedure/function to procedure variable'#000+
   'E_Can'#039't assign values to an address'#000+
   'E_Identifier not found $1'#000+
-  'F_Internal Error in SymTableStack()'#000+
+  'F_Inte','rnal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
-  'H_Id','entifier already defined in $1 at line $2'#000+
+  'H_Identifier already defined in $1 at line $2'#000+
   'E_Unknown identifier $1'#000+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
-  'E_Type identifier not defined'#000+
+  'E_Type id','entifier not defined'#000+
   'E_Forward type not resolved $1'#000+
-  'E_Only s','tatic variables can be used in static methods or outside met'+
-  'hods'#000+
+  'E_Only static variables can be used in static methods or outside metho'+
+  'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with an abstract method are not allo'+
-  'wed'#000+
+  'E_Instances of classes or objects with an a','bstract method are not al'+
+  'lowed'#000+
   'W_Label not defined $1'#000+
-  'E_Ille','gal label declaration'#000+
+  'E_Illegal label declaration'#000+
   'E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set elements'#000+
+  'E_illegal type declaration of set ele','ments'#000+
   'E_Forward class definition not resolved $1'#000+
-  'H_Parameter',' not used $1'#000+
+  'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variable $1 does not seem to be initialized'#000+
+  'W_Local variable $1 does not seem to be',' initialized'#000+
   'W_Variable $1 does not seem to be initialized'#000+
-  'E','_identifier idents no member $1'#000+
+  'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_Data segment too large (max. 2GB)'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
-  'E_Expression too complicated - FPU stack overflow'#000+
+  'E_Expression too complicated - FPU stack over','flow'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer expression'#000+
-  'E_Ill','egal qualifier'#000+
+  'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
   'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
-  'E_Illegal type conversion'#000+
-  'D_Conversion between ordinals and pointer','s is not portable across pl'+
-  'atforms'#000+
+  'E_Illeg','al type conversion'#000+
+  'D_Conversion between ordinals and pointers is not portable across plat'+
+  'forms'#000+
   'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
   'E_illegal call by reference parameters'#000+
-  'E_EXPORT declared functions can'#039't be called'#000+
-  'W_Possible illegal call of constructor ','or destructor (doesn'#039't ma'+
-  'tch to this context)'#000+
+  'E_EXPORT declared funct','ions can'#039't be called'#000+
+  'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
+  'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
   'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
-  'F_Internal Error in getfloatreg(), allocation failure'#000+
-  'F_Unknown float ty','pe'#000+
+  'F_Internal E','rror in getfloatreg(), allocation failure'#000+
+  'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
   'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
-  'E_Stack limit excedeed in local routine'#000+
-  'D_Stack frame is omitt','ed'#000+
+  'E_','Stack limit excedeed in local routine'#000+
+  'D_Stack frame is omitted'#000+
   'E_Object or class methods can'#039't be inline.'#000+
   'E_Procvar calls can'#039't be inline.'#000+
   'E_No code for inline procedure stored'#000+
   'E_Direct call of interrupt procedure $1 is not possible'#000+
-  'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
-  's','e (set)length instead'#000+
+  'E_Eleme','nt zero of an ansi/wide- or longstring can'#039't be accessed,'+
+  ' use (set)length instead'#000+
   'E_Include and exclude not implemented in this case'#000+
   'E_Constructors or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
-  'E_Cannot call message handler method directly'#000+
+  'E_Cannot call message handler method',' directly'#000+
   'D_Starting $1 styled assembler parsing'#000+
-  'D_Finished ','$1 styled assembler parsing'#000+
+  'D_Finished $1 styled assembler parsing'#000+
   'E_Non-label pattern contains @'#000+
   'W_Override operator not supported'#000+
   'E_Error building record offset'#000+
   'E_OFFSET used without identifier'#000+
-  'E_TYPE used without identifier'#000+
+  'E_TYPE used without ide','ntifier'#000+
   'E_Cannot use local variable or parameters here'#000+
-  'E_nee','d to use OFFSET here'#000+
+  'E_need to use OFFSET here'#000+
   'E_Cannot use multiple relocatable symbols'#000+
   'E_Relocatable symbol can only be added'#000+
   'E_Invalid constant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
-  'E_Invalid reference syntax'#000+
-  'E_Local symbols/labels aren'#039't allowed as refe','rences'#000+
+  'E_Invalid re','ference syntax'#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 and @DATA not supported'#000+
-  'E_Null label references are not allo','wed'#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 sequence ignored: $1'#000+
+  'E_escape ','sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
-  'W_Fwait can ','cause emulation problems with emu387'#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_Error converting decimal $1'#000+
+  'E_Error converting decimal $1'#000,
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
-  'E_E','rror converting hexadecimal $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_Functions with void return value can'#039't return any value in',' asm'+
-  ' code'#000+
+  'E_Cannot use OLDEBP outside a nested procedure'#000,
+  'W_Functions with void return value can'#039't return any value in asm c'+
+  'ode'#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_Assemler syntax error ','in operand'#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 combination of prefix and opcode',': $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
-  'E_Too ','many operands on line'#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_NOR not supported'#000+
+  'E_NO','R not supported'#000+
   'W_Modulo not supported'#000+
-  'E_Invalid floating po','int constant $1'#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+
-  'W_Identifier $1 supposed external'#000+
+  'W_Identifier $','1 supposed external'#000+
   'E_Strings not allowed as constants'#000+
-  'No ty','pe of variable specified'#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+
+  'E_Dollar token is used without a','n identifier'#000+
   'W_32bit constant created for address'#000+
-  'N_.align i','s target specific, use .balign or .p2align'#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 supported'#000+
+  'F_Selected ass','embler output not supported'#000+
   'F_Comp not supported'#000+
-  'F_Direct no','t support for binary writers'#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: $1 invalid combination of opcode a','nd operands'#000+
   'E_Asm: 16 Bit references not supported'#000+
-  'E_Asm: In','valid effective address'#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+
   'W_Source operating system redefined'#000+
-  'I_Assembling (pipe) $1'#000+
+  'I_Assembli','ng (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
-  'W_Assembler $1 ','not found, switching to external assembling'#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_Assembling $1'#000+
+  'I_Assem','bling $1'#000+
   'I_Assembling smartlink $1'#000+
-  'W_Object $1 not found, Li','nking may fail !'#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_$1 not found: $2, switching to external linking'#000+
-  'T_Using $1: $2'#000+
-  'E_Creation of Executables',' not supported'#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+
   '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 o','f Code: $1 bytes'#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+
-  'T_PPU Loading $1'#000+
+  'T_','PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
-  'U_','PPU Time: $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 target'#000+
+  'U_PPU is compiled for an other targ','et'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
-  'F_read','ing PPU-File'#000+
+  'F_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 name: $1'#000+
   'F_Too much units'#000+
-  'F_Circular unit reference between $1 and $2'#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 u','nit $1'#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 change','d for $2'#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, obj is older t','han asm'#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 source file supported'#000+
+  'W_Only one source file s','upported'#000+
   'W_DEF file can be created only for OS/2'#000+
-  'E_nested resp','onse files are not supported'#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+
-  'N_Reading further options from $1'#000+
+  'N_Readin','g further options from $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Sha','red libs not supported on DOS platform, reverting to static'#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+
+  'W_Debug information generation is not',' supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
-  'E_Y','ou are using the obsolete switch $1'#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 writing assembler'#000+
-  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-1999 by Fl','orian Klaempfl'#000+
+  'Free Pascal Compiler version $','FPCVER [$FPCDATE] for $FPCTARGET'#000+
+  'Copyright (c) 1993-1999 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #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+
+  'For more infor','mation read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
-  '     ','            [email protected]'#000+
+  '                 [email protected]'#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+
+  '**1a_the compiler doesn'#039't delete the generated assembler file',#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '**2ar_list regi','ster 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+
+  '**1B_build al','l modules'#000+
   '**1C<x>_code generation options:'#000+
-  '3*2CD_create dynami','c library'#000+
+  '3*2CD_create dynamic library'#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+
   '**2Cr_range checking'#000+
-  '**2Cs<n>_set stack size to <n>'#000+
+  '**2Cs<n>_','set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
-  '**2CD_create also d','ynamic library (* doesn'#039't work yet *)'#000+
+  '**2CD_create also dynamic library (* doesn'#039't work yet *)'#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 application'#000+
+  '*O2Dw_PM appli','cation'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
-  '**1F<x>','_set file names and paths:'#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>_adds <x> to include path'#000+
-  '**2Fl<x>_adds <x> to library path',#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>, overrides -FE'#000+
+  '**2FU<x>_set unit output path to <x>, ov','errides -FE'#000+
   '*g1g<x>_generate debugger information:'#000+
-  '*g2gg_use g','sym'#000+
+  '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit'#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+
+  '**2iSO_return compiler OS',#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
-  '**2i','TP_return target processor'#000+
+  '**2iTP_return target processor'#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 produced to <x>'#000+
-  '**1pg_generate profile code for gpr','of (defines FPC_PROFILE)'#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+
   '**2S2_switch some Delphi 2 extensions on'#000+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
+  '**2Sc_supports operators li','ke C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2','Se<x>_compiler stops after the <x> errors (default is 1)'#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 comp','atible'#000+
+  '**2','So_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+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
-  '**1u<x>_undefines the symbol <x>'#000+
+  '**1u<x>_undefines t','he symbol <x>'#000+
   '**1U_unit options:'#000+
-  '**2Un_don'#039't check the unit na','me'#000+
+  '**2Un_don'#039't check the unit name'#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+
-  '**2*_w : Show 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 : 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*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everyt','hing             0 : Show nothing (except errors'+
-  ')'#000+
+  '**2*_l : Show lin','enumbers            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*_    declarations if an error    x : Executable info (','Win32 only'+
+  ')'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
-  '*L2Xc_lin','k 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) (defines FPC_LINK_STATIC)'#000+
-  '**2XX_try to link smart            (defines FPC_LINK_SMA','RT)'#000+
+  '**2XS_try to link static (default) (defines FPC_LINK_ST','ATIC)'#000+
+  '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
   '**0*_Processor 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 Nasm'#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 (Win32) using internal writer'#000+
+  '3*2Apecoff_pecoff (Win32) using inte','rnal writer'#000+
   '3*1R<x>_assembler reading style:'#000+
-  '3*2Ratt_read AT&T',' style assembler'#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*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_generate faster code (default)'#000+
-  '3*2Or_keep certain variables in register','s (still BUGGY!!!)'#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*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_level 3 optimizations (same as -O2u)'#000+
-  '3*2Op<x>_target process','or:'#000+
+  '3*2O','3_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/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operating system:'#000+
+  '3*1T<x>_Target operating s','ystem:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO3','2V2_version 2 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
-  '6*2Agas_GNU Motorola assembler'#000+
+  '6*2Agas_GNU Motorola asse','mbler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
-  '6*2Amot_Standard Motorola a','ssembler'#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 (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set target processor to a MC68020+'#000+
+  '6*2O2_set target',' processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
-  '6*2R','MOT_read motorola style assembler'#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*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
-  '**1?_shows this help'#000+
+  '**1?_sho','ws this help'#000+
   '**1h_shows this help without waiting'#000
 );

compiler/new/cgobj.pas

@@ -1,3 +1,5 @@
+stack alignment !!!!!!
+
 {
     $Id$
     Copyright (c) 1993-99 by Florian Klaempfl
@@ -1108,7 +1110,13 @@ unit cgobj;
 end.
 {
   $Log$
-  Revision 1.28  1999-10-12 21:20:46  florian
+  Revision 1.29  1999-10-21 16:41:41  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.28  1999/10/12 21:20:46  florian
     * new codegenerator compiles again
 
   Revision 1.27  1999/09/29 11:46:20  florian

compiler/pdecl.pas

@@ -1134,20 +1134,24 @@ unit pdecl;
                      if (idtoken=_INDEX) then
                        begin
                           consume(_INDEX);
+                          pt:=comp_expr(true);
+                          do_firstpass(pt);
+                          if not(is_ordinal(pt^.resulttype)) or
+                             is_64bitint(pt^.resulttype) then
+                            Message(parser_e_invalid_property_index_value);
+                          p^.index:=pt^.value;
 {$ifdef INCLUDEOK}
                           include(p^.propoptions,ppo_indexed);
 {$else}
                           p^.propoptions:=p^.propoptions+[ppo_indexed];
 {$endif}
-                          if token=_INTCONST then
-                            val(pattern,p^.index,code);
-                          consume(_INTCONST);
                           { concat a longint to the para template }
                           new(hp2);
                           hp2^.paratyp:=vs_value;
-                          hp2^.data:=s32bitdef;
+                          hp2^.data:=pt^.resulttype;
                           hp2^.next:=propertyparas;
                           propertyparas:=hp2;
+                          disposetree(pt);
                        end;
                   end
                 else
@@ -2617,7 +2621,13 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.164  1999-10-14 14:57:52  florian
+  Revision 1.165  1999-10-21 16:41:41  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.164  1999/10/14 14:57:52  florian
     - removed the hcodegen use in the new cg, use cgbase instead
 
   Revision 1.163  1999/10/06 17:39:14  peter

compiler/symsym.inc

@@ -1212,11 +1212,20 @@
                     l:=2
                    else
 {$endif}
-                   if (l>=4) and (modulo<>0) then
-                    inc(l,4-modulo)
+{
+                   if (cs_optimize in aktglobalswitches) and
+                      (aktoptprocessor in [classp5,classp6]) and
+                      (l>=8) and ((owner^.datasize and 7)<>0) then
+                     inc(owner^.datasize,8-(owner^.datasize and 7))
                    else
-                    if (l>=2) and ((modulo and 1)<>0) then
-                     inc(l,2-(modulo and 1));
+}
+                     begin
+                        if (l>=4) and (modulo<>0) then
+                          inc(l,4-modulo)
+                        else
+                          if (l>=2) and ((modulo and 1)<>0) then
+                            inc(l,2-(modulo and 1));
+                     end;
                    inc(owner^.datasize,l);
                    address:=owner^.datasize;
                  end;
@@ -1359,12 +1368,12 @@
                  end
                else
                  begin
-                   modulo:=owner^.datasize and 3 ;
-                   if (l>=4) and (modulo<>0) then
-                     inc(owner^.datasize,4-modulo)
-                   else
-                     if (l>=2) and ((modulo and 1)<>0) then
-                       inc(owner^.datasize);
+                     modulo:=owner^.datasize and 3;
+                     if (l>=4) and (modulo<>0) then
+                       inc(owner^.datasize,4-modulo)
+                     else
+                       if (l>=2) and ((modulo and 1)<>0) then
+                         inc(owner^.datasize);
                    address:=owner^.datasize;
                    inc(owner^.datasize,l);
                  end;
@@ -2131,7 +2140,13 @@
 
 {
   $Log$
-  Revision 1.121  1999-10-01 08:02:48  peter
+  Revision 1.122  1999-10-21 16:41:41  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.121  1999/10/01 08:02:48  peter
     * forward type declaration rewritten
 
   Revision 1.120  1999/09/27 23:44:58  peter

compiler/tcinl.pas

@@ -55,6 +55,7 @@ implementation
          frac_para,length_para : ptree;
 {$endif ndef NOCOLONCHECK}
          store_count_ref,
+         extra_register,
          isreal,
          dowrite,
          store_valid,
@@ -625,6 +626,8 @@ implementation
                   { needs a call }
                   procinfo^.flags:=procinfo^.flags or pi_do_call;
                   p^.resulttype:=voiddef;
+                  { true, if readln needs an extra register }
+                  extra_register:=false;
                   { we must know if it is a typed file or not }
                   { but we must first do the firstpass for it }
                   file_is_typed:=false;
@@ -725,6 +728,9 @@ implementation
                                             else
                                               CGMessage(type_e_cant_read_write_type);
                                           end;
+                                          if not(dowrite) and
+                                            not(is_64bitint(hp^.left^.resulttype)) then
+                                            extra_register:=true;
                                         end;
                                       arraydef :
                                         begin
@@ -784,6 +790,8 @@ implementation
                        firstcallparan(p^.left,nil);
                        { calc registers }
                        left_right_max(p);
+                       if extra_register then
+                         inc(p^.registers32);
                     end;
                end;
 
@@ -1254,7 +1262,13 @@ implementation
 end.
 {
   $Log$
-  Revision 1.53  1999-09-28 20:48:27  florian
+  Revision 1.54  1999-10-21 16:41:41  florian
+    * problems with readln fixed: esi wasn't restored correctly when
+      reading ordinal fields of objects futher the register allocation
+      didn't take care of the extra register when reading ordinal values
+    * enumerations can now be used in constant indexes of properties
+
+  Revision 1.53  1999/09/28 20:48:27  florian
     * fixed bug 610
     + added $D- for TP in symtable.pas else it can't be compiled anymore
       (too much symbols :()