Jelajahi Sumber

* int64/qword type release
+ lo/hi for int64/qword

florian 26 tahun lalu
induk
melakukan
c615fcdbbb

+ 49 - 3
compiler/cg386inl.pas

@@ -943,6 +943,47 @@ implementation
                    exprasmlist^.concat(new(pai386,op_const_reg(A_SHR,S_L,16,p^.location.register)));
                  p^.location.register:=reg32toreg16(p^.location.register);
               end;
+            in_lo_qword,
+            in_hi_qword:
+              begin
+                 secondpass(p^.left);
+                 p^.location.loc:=LOC_REGISTER;
+                 case p^.left^.location.loc of
+                    LOC_CREGISTER:
+                      begin
+                         p^.location.register:=getregister32;
+                         if p^.inlinenumber=in_hi_qword then
+                           emit_reg_reg(A_MOV,S_L,p^.left^.location.registerhigh,
+                             p^.location.register)
+                         else
+                           emit_reg_reg(A_MOV,S_L,p^.left^.location.registerlow,
+                             p^.location.register)
+                      end;
+                    LOC_MEM,LOC_REFERENCE:
+                      begin
+                         del_reference(p^.left^.location.reference);
+                         p^.location.register:=getregister32;
+                         r:=newreference(p^.left^.location.reference);
+                         if p^.inlinenumber=in_hi_qword then
+                           inc(r^.offset,4);
+                         exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,
+                           r,p^.location.register)));
+                      end;
+                    LOC_REGISTER:
+                      begin
+                         if p^.inlinenumber=in_hi_qword then
+                           begin
+                              p^.location.register:=p^.left^.location.registerhigh;
+                              ungetregister32(p^.left^.location.registerlow);
+                           end
+                         else
+                           begin
+                              p^.location.register:=p^.left^.location.registerlow;
+                              ungetregister32(p^.left^.location.registerhigh);
+                           end;
+                      end;
+                 end;
+              end;
             in_length_string :
               begin
                  secondpass(p^.left);
@@ -1097,9 +1138,10 @@ implementation
                       it should be converted to 16 or 8 bit depending on op_size  PM }
                     { still not perfect :
                       if hregister is already a 16 bit reg ?? PM }
+                    { makeregXX is the solution (FK) }
                     case opsize of
-                      S_B : hregister:=reg32toreg8(hregister);
-                      S_W : hregister:=reg32toreg16(hregister);
+                      S_B : hregister:=makereg8(hregister);
+                      S_W : hregister:=makereg16(hregister);
                     end;
                     if p^.left^.left^.location.loc=LOC_CREGISTER then
                       exprasmlist^.concat(new(pai386,op_reg_reg(addsubop[p^.inlinenumber],opsize,
@@ -1251,7 +1293,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.59  1999-06-21 16:33:27  jonas
+  Revision 1.60  1999-07-01 15:49:09  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.59  1999/06/21 16:33:27  jonas
     * fixed include() with smallsets
 
   Revision 1.58  1999/06/11 11:44:56  peter

+ 6 - 10
compiler/cgai386.pas

@@ -804,7 +804,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
            begin
               if (p^.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
                 begin
-{$ifdef INT64}
                    if isint64 then
                      begin
 {$ifdef TEMPS_NOT_PUSH}
@@ -826,7 +825,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
                      end
 {$endif TEMPS_NOT_PUSH}
                      ;
-{$endif INT64}
                    pushed:=true;
 {$ifdef TEMPS_NOT_PUSH}
                    exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L,p^.location.register,href)));
@@ -870,7 +868,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
            begin
               if (p^.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
                 begin
-{$ifdef INT64}
                    if isint64(p^.resulttype) then
                      begin
                         gettempofsizereference(href,8);
@@ -881,7 +878,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
                         ungetregister32(p^.location.registerhigh);
                      end
                    else
-{$endif INT64}
                      begin
                         gettempofsizereference(href,4);
                         p^.temp_offset:=href.offset;
@@ -1061,7 +1057,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
          if (p^.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
            begin
               p^.location.register:=hregister;
-{$ifdef INT64}
               if isint64 then
                 begin
                    p^.location.registerhigh:=getregister32;
@@ -1074,7 +1069,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
                    exprasmlist^.concat(new(pai386,op_reg(A_POP,S_L,p^.location.registerhigh)));
 {$endif TEMPS_NOT_PUSH}
                 end;
-{$endif INT64}
            end
          else
            begin
@@ -1102,7 +1096,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
          if (p^.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
            begin
               p^.location.register:=hregister;
-{$ifdef INT64}
               if isint64 then
                 begin
                    p^.location.registerhigh:=getregister32;
@@ -1111,7 +1104,6 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
                    { set correctly for release ! }
                    href.offset:=p^.temp_offset;
                 end;
-{$endif INT64}
            end
          else
            begin
@@ -1674,7 +1666,7 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
          getlabel(hl);
          if not ((p^.resulttype^.deftype=pointerdef) or
                 ((p^.resulttype^.deftype=orddef) and
-                 (porddef(p^.resulttype)^.typ in [u16bit,u32bit,u8bit,uchar,
+                 (porddef(p^.resulttype)^.typ in [u64bit,u16bit,u32bit,u8bit,uchar,
                                                   bool8bit,bool16bit,bool32bit]))) then
            emitjmp(C_NO,hl)
          else
@@ -3103,7 +3095,11 @@ procedure mov_reg_to_dest(p : ptree; s : topsize; reg : tregister);
 end.
 {
   $Log$
-  Revision 1.8  1999-06-28 22:29:15  florian
+  Revision 1.9  1999-07-01 15:49:11  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.8  1999/06/28 22:29:15  florian
     * qword division fixed
     + code for qword/int64 type casting added:
       range checking isn't implemented yet

+ 2 - 2
compiler/errord.msg

@@ -847,8 +847,8 @@ type_e_cant_read_write_type=E_Kann Variablen dieses Typs weder lesen noch schrei
 type_e_typeconflict_in_set=E_Typkonflikt zwischen den Elementen des Sets
 % There is at least one set element which is of the wrong type, i.e. not of
 % the set type.
-type_w_maybe_wrong_hi_lo=W_lo/hi(longint/dword) gibt oberes/unteres Word zur�ck
-% \fpc supports an overloaded version of \var{lo/hi} for \var{longint/dword}
+type_w_maybe_wrong_hi_lo=W_lo/hi(dword/qword) gibt oberes/unteres Word/DWord zur�ck
+% \fpc supports an overloaded version of \var{lo/hi} for \var{longint/dword/int64/qword}
 % which returns the lower/upper word of the argument. TP always uses
 % a 16 bit \var{lo/hi} which returns always bits 0..7 for \var{lo} and the
 % bits 8..15 for \var{hi}. If you want the TP behavior you have

+ 7 - 1
compiler/innr.inc

@@ -71,9 +71,15 @@ const
    in_const_exp        = 114;
    in_const_ln         = 115;
    in_const_sin        = 116;
+   in_lo_qword         = 117;
+   in_hi_qword         = 118;
 {
   $Log$
-  Revision 1.11  1999-04-17 13:12:19  peter
+  Revision 1.12  1999-07-01 15:49:14  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.11  1999/04/17 13:12:19  peter
     * addr() internal
 
   Revision 1.10  1998/10/05 12:32:45  peter

+ 66 - 66
compiler/msgtxt.inc

@@ -233,26 +233,26 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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(longint/dword) retu','rns the upper/lower word'#000+
+  'W_lo/hi(dword/qword) return','s the upper/lower word/dword'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type 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_Identifier not found ','$1'#000+
+  'E_Identifier not fo','und $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#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_Error in type definit','ion'#000+
   'E_Type identifier not defined'#000+
   'E_Forward type not resolved $1'#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 al'+
+  'E_Instances of classes or obje','cts with an abstract method are not al'+
   'lowed'#000+
   'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
@@ -260,80 +260,80 @@ const msgtxt : array[0..000097,1..240] of char=(
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration o','f set elements'#000+
+  'E_illegal type declarati','on of set elements'#000+
   'E_Forward class definition not resolved $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 s','eem to be initialized'#000+
+  'W_Local variable $1 does n','ot seem to be initialized'#000+
   'W_Variable $1 does not seem to be initialized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
-  'E_Illegal expression'#000+
-  'E','_Invalid integer expression'#000+
+  'E_Illegal expressi','on'#000+
+  'E_Invalid integer expression'#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_Conver','sion between ordinals and pointers is not portable across pl'+
+  'D_Co','nversion between ordinals and pointers is not portable across pl'+
   'atforms'#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_Poss','ible illegal call of constructor or destructor (doesn'#039't ma'+
+  'W_','Possible illegal call of constructor or destructor (doesn'#039't ma'+
   'tch 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(), allo','cation failure'#000+
+  'F_Internal Error 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 loc','al routine'#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_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
-  'se (set)length instead'#000+
-  'E','_Include and exclude not implemented in this case'#000+
+  'se (set)length inste','ad'#000+
+  'E_Include and exclude not implemented in this case'#000+
   'W_Probably illegal constant passed to internal math function'#000+
   'E_Constructors or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
   'E_Cannot call message handler method directly'#000+
-  'D_Starting $','1 styled assembler parsing'#000+
+  'D_Starti','ng $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_Cannot use local variable or parameters her','e'#000+
+  'E_Cannot use local variable or parameters',' 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 not allowed as referen','ces'#000+
+  'E_Local symbols not allowed as ref','erences'#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 allowed',#000+
+  'E_Null label references are not all','owed'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
@@ -341,33 +341,33 @@ const msgtxt : array[0..000097,1..240] of char=(
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
-  'W_Fwait can cau','se 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 octal $1'#000+
   'E_Error converting binary $1'#000+
-  'E_Erro','r 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 as','m'+
+  'W_Functions with void return value can'#039't return any value i','n 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_Assemler syntax error in ','operand'#000+
+  'E_Assemler syntax error',' in operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid String expression'#000+
   '32bit constant created for address'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
-  'E_Too man','y 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+
@@ -376,54 +376,54 @@ const msgtxt : array[0..000097,1..240] of char=(
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
   'W_Modulo not supported'#000+
-  'E_Invalid floating point',' constant $1'#000+
+  'E_Invalid floating p','oint 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+
   'E_Strings not allowed as constants'#000+
-  'No type ','of variable specified'#000+
+  'No t','ype 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+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
-  'F_Dir','ect not 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: 16 Bit references not supported'#000+
-  'E_A','sm: Invalid effective address'#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+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
-  'W_Assembl','er $1 not found, switching to external assembling'#000+
+  'W_Ass','embler $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+
-  'W_Linker $1 not found, switching to external ','linking'#000+
+  'W_Linker $1 not found, switching to exter','nal 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+
   'I_Linking $1'#000+
-  'W_binder not found, switching to exter','nal binding'#000+
+  'W_binder not found, switching to e','xternal binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic 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 open exe','cutable $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+
@@ -432,7 +432,7 @@ const msgtxt : array[0..000097,1..240] of char=(
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
-  'U_PPU Flags: ','$1'#000+
+  'U_PPU Fla','gs: $1'#000+
   'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
@@ -442,7 +442,7 @@ const msgtxt : array[0..000097,1..240] of char=(
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
-  'F_Can'#039't Wr','ite PPU-File'#000+
+  'F_Can'#039,'t Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
@@ -450,45 +450,45 @@ const msgtxt : array[0..000097,1..240] of char=(
   '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 avail','able'#000+
+  'F_Can'#039't compile unit $1, no sources a','vailable'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
   'U_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, sta','tic 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 than asm'#000+
   'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
-  'U_Secon','d load for unit $1'#000+
+  'U_S','econd 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 only for OS/2'#000+
   'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
-  'E_Ill','egal parameter: $1'#000+
+  'E','_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   '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 I','F(N)DEFs'#000+
+  'F_too ma','ny 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 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+
+  'E_You are using the obsolete swi','tch $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-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Compiler Date  : $FPC','DATE'#000+
+  'Compiler Date  : ','$FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
@@ -496,19 +496,19 @@ const msgtxt : array[0..000097,1..240] of char=(
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean s','witch option to enable it, - to disable '+
+  '**0*_put + after a boole','an switch option to enable it, - to disable '+
   'it'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '**2ar_list register allocation/release info in assembler file'#000+
-  '**2at_list temp allocation/','release info in assembler file'#000+
+  '**2at_list temp allocat','ion/release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
   '3*2CD_create dynamic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
-  '**2Ci_IO-che','cking'#000+
+  '**2Ci_IO','-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
@@ -517,21 +517,21 @@ const msgtxt : array[0..000097,1..240] of char=(
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_genera','te a DEF file'#000+
+  '*O1D_ge','nerate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
   '**2FD<x>_sets the directory where to search for compiler utilities'#000+
-  '**2Fe<x>_redirect error ','output to <x>'#000+
+  '**2Fe<x>_redirect er','ror 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+
   '*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>_ad','ds <x> to unit path'#000+
+  '**2Fu<x','>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g<x>_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
@@ -539,7 +539,7 @@ const msgtxt : array[0..000097,1..240] of char=(
   '*g2gh_use heap trace unit'#000+
   '*g2gc_generate checks for pointers'#000+
   '**1i_information'#000+
-  '**2iD_return compiler ','date'#000+
+  '**2iD_return compi','ler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
@@ -548,74 +548,74 @@ const msgtxt : array[0..000097,1..240] of char=(
   '**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+
+  '**1n_do','n'#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<x>_syntax options:'#000+
-  '**2S2_switch some Delphi 2 ext','ensions on'#000+
+  '**2S2_switch some Delphi 2',' extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#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+
+  '**2Si_support C++ styled INLIN','E'#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+
-  '**1s_don'#039't call assembler and lin','ker (only with -a)'#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 combination of the following letters:'#000+
-  '**2*_e : Show errors (default)       d : S','how debug info'#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*_i : Show general info           p : ','Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declaration','s if an error    x : Executable info (Win32 only'+
+  '**2*_    declara','tions 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+
-  '**2XS_link with st','atic libraries (defines FPC_LINK_STATIC)'#000+
+  '**2XS_link wit','h static libraries (defines FPC_LINK_STATIC)'#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*2Anasmelf_elf32 (L','inux) file using Nasm'#000+
+  '3*2Anasmelf_elf3','2 (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*2Acoff_coff (Go32v2) using internal writer'#000+
   '3*2Apecoff_pecoff (Win32) using internal writer'#000+
-  '3*1R<x>_assem','bler reading style:'#000+
+  '3*1R<x>_a','ssembler 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*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_generate faster code (default)'#000+
-  '3*2','Or_keep certain variables in registers (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*2O3_level 3 optimizatio','ns (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*2TGO32V1_version',' 1 of DJ Delorie DOS extender'#000+
+  '3*2TGO32V1_ver','sion 1 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+
@@ -623,14 +623,14 @@ const msgtxt : array[0..000097,1..240] of char=(
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Syntax ','(old GAS)'#000+
+  '6*2Amit_MIT Syn','tax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (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 MC680','20+'#000+
   '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
@@ -640,5 +640,5 @@ const msgtxt : array[0..000097,1..240] of char=(
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows t','his help without waiting'#000
+  '**1h_sho','ws this help without waiting'#000
 );

+ 6 - 2
compiler/options.pas

@@ -1011,7 +1011,7 @@ begin
   def_symbol('INTERNALADDR');
   def_symbol('NEWWRITEARRAY');
   def_symbol('INTERNDOUBLE');
-
+  def_symbol('INT64');
 { some stuff for TP compatibility }
 {$ifdef i386}
   def_symbol('CPU86');
@@ -1167,7 +1167,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  1999-06-11 13:28:40  peter
+  Revision 1.2  1999-07-01 15:49:19  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.1  1999/06/11 13:28:40  peter
     * reinserted
 
   Revision 1.111  1999/06/10 23:52:31  pierre

+ 5 - 9
compiler/psystem.pas

@@ -88,10 +88,8 @@ begin
   p^.insert(new(ptypesym,init('word',u16bitdef)));
   p^.insert(new(ptypesym,init('ulong',u32bitdef)));
   p^.insert(new(ptypesym,init('longint',s32bitdef)));
-{$ifdef INT64}
   p^.insert(new(ptypesym,init('qword',cu64bitdef)));
   p^.insert(new(ptypesym,init('int64',cs64bitintdef)));
-{$endif INT64}
   p^.insert(new(ptypesym,init('char',cchardef)));
   p^.insert(new(ptypesym,init('shortstring',cshortstringdef)));
   p^.insert(new(ptypesym,init('longstring',clongstringdef)));
@@ -149,10 +147,8 @@ begin
   p^.insert(new(ptypesym,init('CARDINAL',u32bitdef)));
   p^.insert(new(ptypesym,init('FIXED',new(pfloatdef,init(f32bit)))));
   p^.insert(new(ptypesym,init('FIXED16',new(pfloatdef,init(f16bit)))));
-{$ifdef INT64}
   p^.insert(new(ptypesym,init('QWORD',cu64bitdef)));
   p^.insert(new(ptypesym,init('INT64',cs64bitintdef)));
-{$endif INT64}
   p^.insert(new(ptypesym,init('TYPEDFILE',new(pfiledef,init(ft_typed,voiddef)))));
 end;
 
@@ -166,10 +162,8 @@ begin
   u16bitdef:=porddef(globaldef('word'));
   u32bitdef:=porddef(globaldef('ulong'));
   s32bitdef:=porddef(globaldef('longint'));
-{$ifdef INT64}
   cu64bitdef:=porddef(globaldef('qword'));
   cs64bitintdef:=porddef(globaldef('int64'));
-{$endif INT64}
   cformaldef:=pformaldef(globaldef('formal'));
   voiddef:=porddef(globaldef('void'));
   cchardef:=porddef(globaldef('char'));
@@ -207,10 +201,8 @@ begin
   u16bitdef:=new(porddef,init(u16bit,0,65535));
   u32bitdef:=new(porddef,init(u32bit,0,$ffffffff));
   s32bitdef:=new(porddef,init(s32bit,$80000000,$7fffffff));
-{$ifdef INT64}
   cu64bitdef:=new(porddef,init(u64bit,0,0));
   cs64bitintdef:=new(porddef,init(s64bitint,0,0));
-{$endif INT64}
   booldef:=new(porddef,init(bool8bit,0,1));
   cchardef:=new(porddef,init(uchar,0,255));
   cshortstringdef:=new(pstringdef,shortinit(255));
@@ -248,7 +240,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.23  1999-05-12 00:19:53  peter
+  Revision 1.24  1999-07-01 15:49:20  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.23  1999/05/12 00:19:53  peter
     * removed R_DEFAULT_SEG
     * uniform float names
 

+ 17 - 2
compiler/tcinl.pas

@@ -316,16 +316,25 @@ implementation
          else
           begin
             case p^.inlinenumber of
-
+             in_lo_qword,
+             in_hi_qword,
              in_lo_long,
              in_hi_long,
              in_lo_word,
              in_hi_word:
+
                begin
                   if p^.registers32<1 then
                     p^.registers32:=1;
                   if p^.inlinenumber in [in_lo_word,in_hi_word] then
                     p^.resulttype:=u8bitdef
+                  else if p^.inlinenumber in [in_lo_qword,in_hi_qword] then
+                    begin
+                       p^.resulttype:=u32bitdef;
+                       if (m_tp in aktmodeswitches) or
+                          (m_delphi in aktmodeswitches) then
+                         CGMessage(type_w_maybe_wrong_hi_lo);
+                    end
                   else
                     begin
                        p^.resulttype:=u16bitdef;
@@ -345,6 +354,8 @@ implementation
                           in_hi_word : hp:=genordinalconstnode(p^.left^.value shr 8,p^.left^.resulttype);
                           in_lo_long : hp:=genordinalconstnode(p^.left^.value and $ffff,p^.left^.resulttype);
                           in_hi_long : hp:=genordinalconstnode(p^.left^.value shr 16,p^.left^.resulttype);
+                          in_lo_qword : hp:=genordinalconstnode(p^.left^.value and $ffffffff,p^.left^.resulttype);
+                          in_hi_qword : hp:=genordinalconstnode(p^.left^.value shr 32,p^.left^.resulttype);
                          end;
                          disposetree(p);
                          firstpass(hp);
@@ -1107,7 +1118,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.37  1999-06-25 10:02:56  florian
+  Revision 1.38  1999-07-01 15:49:22  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.37  1999/06/25 10:02:56  florian
     * bug 459 fixed
 
   Revision 1.36  1999/06/15 18:58:36  peter

+ 13 - 0
compiler/todo.txt

@@ -50,11 +50,24 @@ compiler version and your short cut.
   - andn optimization
   - muladdn optimization
   - comparisations
+  - KNI
+  - 3DNow
 * Delphi 4 support
   - overloaded directive
   - default parameters
   - dynamic arrays
   - 64 bit int
+* QWord
+  - constants
+  - case
+  - for
+  - inc/dec
+  - read/write
+  - val/str
+  - range checking
+  - type cast QWord -> real
+  - lo/hi testing
+  - overflow checking test
 * Misc
         - array of const as subroutine parameter ................ 0.99.9 (PFV)
         - open array with call by value ......................... 0.99.6 (FK)

+ 7 - 2
compiler/types.pas

@@ -314,7 +314,8 @@ implementation
     function is_integer(def : pdef) : boolean;
       begin
         is_integer:=(def^.deftype=orddef) and
-                    (porddef(def)^.typ in [uauto,u8bit,u16bit,u32bit,s8bit,s16bit,s32bit]);
+                    (porddef(def)^.typ in [uauto,u8bit,u16bit,u32bit,s8bit,
+                                           s16bit,s32bit,u64bit,s64bitint]);
       end;
 
 
@@ -947,7 +948,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.73  1999-06-28 22:29:22  florian
+  Revision 1.74  1999-07-01 15:49:24  florian
+    * int64/qword type release
+    + lo/hi for int64/qword
+
+  Revision 1.73  1999/06/28 22:29:22  florian
     * qword division fixed
     + code for qword/int64 type casting added:
       range checking isn't implemented yet