* renamed xNNbittype to xNNinttype

  * renamed registers32 to registersint
  * replace some s32bit,u32bit with torddef([su]inttype).def.typ

compiler/arm/narmcnv.pas

@@ -93,9 +93,9 @@ implementation
           { other integers are supposed to be 32 bit }
           begin
             if is_signed(left.resulttype.def) then
-              inserttypeconv(left,s32bittype)
+              inserttypeconv(left,s32inttype)
             else
-              inserttypeconv(left,u32bittype);
+              inserttypeconv(left,u32inttype);
             firstpass(left);
           end;
         result := nil;
@@ -227,7 +227,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.8  2004-01-22 20:13:18  florian
+  Revision 1.9  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.8  2004/01/22 20:13:18  florian
     * fixed several issues with flags
 
   Revision 1.7  2003/11/30 19:35:29  florian

compiler/arm/narminl.pas

@@ -82,7 +82,7 @@ implementation
     function tarminlinenode.first_abs_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         first_abs_real := nil;
       end;
@@ -91,7 +91,7 @@ implementation
     function tarminlinenode.first_sqr_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         first_sqr_real:=nil;
       end;
@@ -100,7 +100,7 @@ implementation
     function tarminlinenode.first_sqrt_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         first_sqrt_real := nil;
       end;
@@ -109,7 +109,7 @@ implementation
     function tarminlinenode.first_arctan_real: tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         result:=nil;
       end;
@@ -118,7 +118,7 @@ implementation
     function tarminlinenode.first_ln_real: tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         result:=nil;
       end;
@@ -127,7 +127,7 @@ implementation
     function tarminlinenode.first_cos_real: tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         result:=nil;
       end;
@@ -136,7 +136,7 @@ implementation
     function tarminlinenode.first_sin_real: tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         result:=nil;
       end;
@@ -196,7 +196,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2004-01-27 15:04:06  florian
+  Revision 1.5  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.4  2004/01/27 15:04:06  florian
     * fixed code generation for math inl. nodes
     * more code generator improvements
 

compiler/cgobj.pas

@@ -1754,6 +1754,7 @@ implementation
         { operations can at most cause overflows (JM)                        }
         { Note that these checks are mostly processor independent, they only }
         { have to be changed once we introduce 64bit subrange types          }
+{$warning range check still s32bit}
         if (fromdef = todef) and
            (fromdef.deftype=orddef) and
            (((sizeof(aword) = 4) and
@@ -2139,7 +2140,12 @@ finalization
 end.
 {
   $Log$
-  Revision 1.153  2004-01-31 17:45:17  peter
+  Revision 1.154  2004-02-03 22:32:53  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.153  2004/01/31 17:45:17  peter
     * Change several $ifdef i386 to x86
     * Change several OS_32 to OS_INT/OS_ADDR
 

compiler/defutil.pas

@@ -249,6 +249,7 @@ implementation
          range_to_basetype:=s16bit
         else
          range_to_basetype:=s32bit;
+{$warning add support for range_to_basetype 64bit}
       end;
 
 
@@ -418,10 +419,10 @@ implementation
     { true, if p points to an open array def }
     function is_open_array(p : tdef) : boolean;
       begin
-         { check for s32bittype is needed, because for u32bit the high
+         { check for s32inttype is needed, because for u32bit the high
            range is also -1 ! (PFV) }
          is_open_array:=(p.deftype=arraydef) and
-                        (tarraydef(p).rangetype.def=s32bittype.def) and
+                        (tarraydef(p).rangetype.def=s32inttype.def) and
                         (tarraydef(p).lowrange=0) and
                         (tarraydef(p).highrange=-1) and
                         not(tarraydef(p).IsConstructor) and
@@ -844,7 +845,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.8  2003-12-25 01:07:09  florian
+  Revision 1.9  2004-02-03 22:32:53  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.8  2003/12/25 01:07:09  florian
     + $fputype directive support
     + single data type operations with sse unit
     * fixed more x86-64 stuff

compiler/htypechk.pas

@@ -497,12 +497,12 @@ implementation
               if p.expectloc = LOC_INVALID then
                 internalerror(200110101);
 
-              if (abs(p.left.registers32-p.right.registers32)<r32) or
+              if (abs(p.left.registersint-p.right.registersint)<r32) or
                  ((p.expectloc = LOC_FPUREGISTER) and
                   (p.right.registersfpu <= p.left.registersfpu) and
                   ((p.right.registersfpu <> 0) or (p.left.registersfpu <> 0)) and
-                  (p.left.registers32   < p.right.registers32)) then
-                inc(p.registers32,r32);
+                  (p.left.registersint   < p.right.registersint)) then
+                inc(p.registersint,r32);
               if (abs(p.left.registersfpu-p.right.registersfpu)<fpu) then
                inc(p.registersfpu,fpu);
 {$ifdef SUPPORT_MMX}
@@ -515,17 +515,17 @@ implementation
               { and return a mem location, but the current node    }
               { doesn't use an integer register we get probably    }
               { trouble when restoring a node                      }
-              if (p.left.registers32=p.right.registers32) and
-                 (p.registers32=p.left.registers32) and
-                 (p.registers32>0) and
+              if (p.left.registersint=p.right.registersint) and
+                 (p.registersint=p.left.registersint) and
+                 (p.registersint>0) and
                 (p.left.expectloc in [LOC_REFERENCE,LOC_CREFERENCE]) and
                 (p.right.expectloc in [LOC_REFERENCE,LOC_CREFERENCE]) then
-                inc(p.registers32);
+                inc(p.registersint);
             end
            else
             begin
-              if (p.left.registers32<r32) then
-               inc(p.registers32,r32);
+              if (p.left.registersint<r32) then
+               inc(p.registersint,r32);
               if (p.left.registersfpu<fpu) then
                inc(p.registersfpu,fpu);
 {$ifdef SUPPORT_MMX}
@@ -941,7 +941,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.75  2003-11-12 15:48:27  peter
+  Revision 1.76  2004-02-03 22:32:53  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.75  2003/11/12 15:48:27  peter
     * fix set_varstate in for loops
     * fix set_varstate from case statements
 

compiler/i386/n386inl.pas

@@ -88,7 +88,7 @@ implementation
      function ti386inlinenode.first_arctan_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,2);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -99,7 +99,7 @@ implementation
      function ti386inlinenode.first_abs_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -110,7 +110,7 @@ implementation
      function ti386inlinenode.first_sqr_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -121,7 +121,7 @@ implementation
      function ti386inlinenode.first_sqrt_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -132,7 +132,7 @@ implementation
      function ti386inlinenode.first_ln_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,2);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -143,7 +143,7 @@ implementation
      function ti386inlinenode.first_cos_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -154,7 +154,7 @@ implementation
      function ti386inlinenode.first_sin_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -353,7 +353,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.71  2004-02-02 20:41:59  florian
+  Revision 1.72  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.71  2004/02/02 20:41:59  florian
     + added prefetch(const mem) support
 
   Revision 1.70  2003/10/10 17:48:14  peter

compiler/i386/n386set.pas

@@ -77,8 +77,8 @@ implementation
          { a smallset needs maybe an misc. register }
          if (left.nodetype<>ordconstn) and
             not(right.location.loc in [LOC_CREGISTER,LOC_REGISTER]) and
-            (right.registers32<1) then
-           inc(registers32);
+            (right.registersint<1) then
+           inc(registersint);
       end;
 
 
@@ -674,7 +674,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.70  2003-11-07 15:58:32  florian
+  Revision 1.71  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.70  2003/11/07 15:58:32  florian
     * Florian's culmutative nr. 1; contains:
       - invalid calling conventions for a certain cpu are rejected
       - arm softfloat calling conventions

compiler/m68k/n68kcnv.pas

@@ -86,7 +86,7 @@ implementation
           { other integers are supposed to be 32 bit }
           begin
             if is_signed(left.resulttype.def) then
-              inserttypeconv(left,s32bittype)
+              inserttypeconv(left,s32inttype)
             else
               { the fpu always considers 32-bit values as signed
                 therefore we need to call the helper in case of
@@ -297,7 +297,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.10  2003-04-23 21:10:54  peter
+  Revision 1.11  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.10  2003/04/23 21:10:54  peter
     * fix compile for ppc,sparc,m68k
 
   Revision 1.9  2003/04/23 13:40:33  peter

compiler/m68k/ncpuadd.pas

@@ -279,7 +279,7 @@ implementation
                falselabel:=ofl;
              end;
 
-            maybe_save(exprasmlist,right.registers32,left.location,pushedregs);
+            maybe_save(exprasmlist,right.registersint,left.location,pushedregs);
             isjump:=(right.location.loc=LOC_JUMP);
             if isjump then
               begin
@@ -432,7 +432,12 @@ end.
 
 {
   $Log$
-  Revision 1.2  2003-02-19 22:00:16  daniel
+  Revision 1.3  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.2  2003/02/19 22:00:16  daniel
     * Code generator converted to new register notation
     - Horribily outdated todo.txt removed
 

compiler/nadd.pas

@@ -165,16 +165,16 @@ implementation
             if (left.resulttype.def.deftype=enumdef) and
                (right.resulttype.def.deftype=orddef) then
              begin
-               { insert explicit typecast to s32bit }
-               left:=ctypeconvnode.create_explicit(left,inttype);
+               { insert explicit typecast to default signed int }
+               left:=ctypeconvnode.create_explicit(left,sinttype);
                resulttypepass(left);
              end
             else
              if (left.resulttype.def.deftype=orddef) and
                 (right.resulttype.def.deftype=enumdef) then
               begin
-                { insert explicit typecast to s32bit }
-                right:=ctypeconvnode.create_explicit(right,inttype);
+                { insert explicit typecast to default signed int }
+                right:=ctypeconvnode.create_explicit(right,sinttype);
                 resulttypepass(right);
               end;
           end;
@@ -284,8 +284,8 @@ implementation
                   { make left const type the biggest (u32bit is bigger than
                     s32bit for or,and,xor) }
                   if (rd.size>ld.size) or
-                     ((torddef(rd).typ=u32bit) and
-                      (torddef(ld).typ=s32bit) and
+                     ((torddef(rd).typ=torddef(uinttype.def).typ) and
+                      (torddef(ld).typ=torddef(sinttype.def).typ) and
                       (nodetype in [orn,andn,xorn])) then
                     inserttypeconv(left,right.resulttype);
                 end;
@@ -610,8 +610,8 @@ implementation
                 end
               else
                 begin
-                  left.resulttype := cs64bittype;
-                  right.resulttype := cs64bittype;
+                  left.resulttype := s64inttype;
+                  right.resulttype := s64inttype;
                 end
             else if (left.resulttype.def.deftype <> floatdef) and
                (right.resulttype.def.deftype <> floatdef) then
@@ -744,17 +744,17 @@ implementation
              else if ((torddef(rd).typ=s64bit) or (torddef(ld).typ=s64bit)) then
                begin
                   if (torddef(ld).typ<>s64bit) then
-                   inserttypeconv(left,cs64bittype);
+                   inserttypeconv(left,s64inttype);
                   if (torddef(rd).typ<>s64bit) then
-                   inserttypeconv(right,cs64bittype);
+                   inserttypeconv(right,s64inttype);
                end
              { is there a unsigned 64 bit type ? }
              else if ((torddef(rd).typ=u64bit) or (torddef(ld).typ=u64bit)) then
                begin
                   if (torddef(ld).typ<>u64bit) then
-                   inserttypeconv(left,cu64bittype);
+                   inserttypeconv(left,u64inttype);
                   if (torddef(rd).typ<>u64bit) then
-                   inserttypeconv(right,cu64bittype);
+                   inserttypeconv(right,u64inttype);
                end
              { is there a cardinal? }
              else if ((torddef(rd).typ=u32bit) or (torddef(ld).typ=u32bit)) then
@@ -763,8 +763,8 @@ implementation
                    about the sign }
                  if nodetype in [andn,orn,xorn] then
                    begin
-                     inserttypeconv_explicit(left,u32bittype);
-                     inserttypeconv_explicit(right,u32bittype);
+                     inserttypeconv_explicit(left,u32inttype);
+                     inserttypeconv_explicit(right,u32inttype);
                    end
                  else
                    begin
@@ -776,8 +776,8 @@ implementation
                        begin
                          { perform the operation in 64bit }
                          CGMessage(type_w_mixed_signed_unsigned);
-                         inserttypeconv(left,cs64bittype);
-                         inserttypeconv(right,cs64bittype);
+                         inserttypeconv(left,s64inttype);
+                         inserttypeconv(right,s64inttype);
                        end
                      else
                        begin
@@ -785,7 +785,7 @@ implementation
                             not(is_constintnode(left) and
                                 (tordconstnode(left).value >= 0)) then
                            CGMessage(type_w_mixed_signed_unsigned2);
-                         inserttypeconv(left,u32bittype);
+                         inserttypeconv(left,u32inttype);
 
                          if is_signed(rd) and
                             { then ld = u32bit }
@@ -795,8 +795,8 @@ implementation
                            begin
                              { perform the operation in 64bit }
                              CGMessage(type_w_mixed_signed_unsigned);
-                             inserttypeconv(left,cs64bittype);
-                             inserttypeconv(right,cs64bittype);
+                             inserttypeconv(left,s64inttype);
+                             inserttypeconv(right,s64inttype);
                            end
                          else
                            begin
@@ -804,7 +804,7 @@ implementation
                                 not(is_constintnode(right) and
                                     (tordconstnode(right).value >= 0)) then
                                CGMessage(type_w_mixed_signed_unsigned2);
-                             inserttypeconv(right,u32bittype);
+                             inserttypeconv(right,u32inttype);
                            end;
                        end;
                    end;
@@ -813,7 +813,7 @@ implementation
              else
                begin
                  { if the left or right value is smaller than the normal
-                   type s32bittype and is unsigned, and the other value
+                   type s32inttype and is unsigned, and the other value
                    is a constant < 0, the result will always be false/true
                    for equal / unequal nodes.
                  }
@@ -845,8 +845,8 @@ implementation
                          CGMessage(type_w_signed_unsigned_always_false);
                     end;
 
-                 inserttypeconv(right,inttype);
-                 inserttypeconv(left,inttype);
+                 inserttypeconv(right,sinttype);
+                 inserttypeconv(left,sinttype);
                end;
            end
 
@@ -955,7 +955,7 @@ implementation
                      end
                     else
                      CGMessage(type_e_mismatch);
-                    resulttype:=inttype;
+                    resulttype:=sinttype;
                     exit;
                  end;
                addn:
@@ -971,7 +971,7 @@ implementation
                      end
                     else
                      CGMessage(type_e_mismatch);
-                    resulttype:=inttype;
+                    resulttype:=sinttype;
                     exit;
                  end;
                else
@@ -1112,7 +1112,7 @@ implementation
                 resulttype.setdef(tpointerdef.create(tarraydef(rd).elementtype));
                 inserttypeconv(right,resulttype);
               end;
-            inserttypeconv(left,inttype);
+            inserttypeconv(left,sinttype);
             if nodetype=addn then
               begin
                 if not(cs_extsyntax in aktmoduleswitches) or
@@ -1121,7 +1121,7 @@ implementation
                 if (rd.deftype=pointerdef) and
                    (tpointerdef(rd).pointertype.def.size>1) then
                   left:=caddnode.create(muln,left,
-                      cordconstnode.create(tpointerdef(rd).pointertype.def.size,inttype,true));
+                      cordconstnode.create(tpointerdef(rd).pointertype.def.size,sinttype,true));
               end
             else
               CGMessage(type_e_mismatch);
@@ -1134,7 +1134,7 @@ implementation
                  resulttype.setdef(tpointerdef.create(tarraydef(ld).elementtype));
                  inserttypeconv(left,resulttype);
               end;
-            inserttypeconv(right,inttype);
+            inserttypeconv(right,sinttype);
             if nodetype in [addn,subn] then
               begin
                 if not(cs_extsyntax in aktmoduleswitches) or
@@ -1143,7 +1143,7 @@ implementation
                 if (ld.deftype=pointerdef) and
                    (tpointerdef(ld).pointertype.def.size>1) then
                   right:=caddnode.create(muln,right,
-                    cordconstnode.create(tpointerdef(ld).pointertype.def.size,inttype,true));
+                    cordconstnode.create(tpointerdef(ld).pointertype.def.size,sinttype,true));
               end
             else
               CGMessage(type_e_mismatch);
@@ -1173,8 +1173,8 @@ implementation
          { generic conversion, this is for error recovery }
          else
           begin
-            inserttypeconv(left,inttype);
-            inserttypeconv(right,inttype);
+            inserttypeconv(left,sinttype);
+            inserttypeconv(right,sinttype);
           end;
 
          { set resulttype if not already done }
@@ -1261,7 +1261,7 @@ implementation
                     { compare the length with 0 }
                     result := caddnode.create(nodetype,
                       cinlinenode.create(in_length_x,false,left),
-                      cordconstnode.create(0,s32bittype,false))
+                      cordconstnode.create(0,s32inttype,false))
                   else
                     begin
                       { compare the pointer with nil (for ansistrings etc), }
@@ -1283,7 +1283,7 @@ implementation
                 ccallparanode.create(right,ccallparanode.create(left,nil)));
               { and compare its result with 0 according to the original operator }
               result := caddnode.create(nodetype,result,
-                cordconstnode.create(0,s32bittype,false));
+                cordconstnode.create(0,s32inttype,false));
               left := nil;
               right := nil;
             end;
@@ -1342,7 +1342,7 @@ implementation
                   { type cast the value to pass as argument to a byte, }
                   { since that's what the helper expects               }
                   tsetelementnode(right).left :=
-                    ctypeconvnode.create_explicit(tsetelementnode(right).left,u8bittype);
+                    ctypeconvnode.create_explicit(tsetelementnode(right).left,u8inttype);
                   { set the resulttype to the actual one (otherwise it's }
                   { "fpc_normal_set")                                    }
                   result := ccallnode.createinternres('fpc_set_create_element',
@@ -1359,7 +1359,7 @@ implementation
                      { the helper expects                               }
                      tsetelementnode(right).left :=
                        ctypeconvnode.create_explicit(tsetelementnode(right).left,
-                       u8bittype);
+                       u8inttype);
 
                      { convert the original set (explicitely) to an   }
                      { fpc_normal_set so we can pass it to the helper }
@@ -1370,7 +1370,7 @@ implementation
                        begin
                          tsetelementnode(right).right :=
                            ctypeconvnode.create_explicit(tsetelementnode(right).right,
-                           u8bittype);
+                           u8inttype);
 
                          { create the call }
                          result := ccallnode.createinternres('fpc_set_set_range',
@@ -1468,8 +1468,8 @@ implementation
           parameters to s64bit, so they are not converted }
         if is_currency(resulttype.def) then
           begin
-            left.resulttype:=cs64bittype;
-            right.resulttype:=cs64bittype;
+            left.resulttype:=s64inttype;
+            right.resulttype:=s64inttype;
           end;
 
         { otherwise, create the parameters for the helper }
@@ -1579,7 +1579,7 @@ implementation
              { a reference                               }
              if ((left.expectloc<>LOC_FPUREGISTER) or
                  (right.expectloc<>LOC_FPUREGISTER)) and
-                (left.registers32=right.registers32) then
+                (left.registersint=right.registersint) then
                calcregisters(self,1,1,0)
              else
                calcregisters(self,0,1,0);
@@ -1647,7 +1647,7 @@ implementation
                  calcregisters(self,1,0,0);
                  { for unsigned mul we need an extra register }
                  if nodetype=muln then
-                  inc(registers32);
+                  inc(registersint);
                end
              { generic s32bit conversion }
              else
@@ -1905,7 +1905,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.108  2004-02-02 20:41:59  florian
+  Revision 1.109  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.108  2004/02/02 20:41:59  florian
     + added prefetch(const mem) support
 
   Revision 1.107  2004/01/20 12:59:36  florian

compiler/nbas.pas

@@ -331,7 +331,7 @@ implementation
          if codegenerror then
            exit;
          expectloc:=left.expectloc;
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -475,17 +475,17 @@ implementation
                    firstpass(hp.left);
 
                    hp.expectloc:=hp.left.expectloc;
-                   hp.registers32:=hp.left.registers32;
+                   hp.registersint:=hp.left.registersint;
                    hp.registersfpu:=hp.left.registersfpu;
 {$ifdef SUPPORT_MMX}
                    hp.registersmmx:=hp.left.registersmmx;
 {$endif SUPPORT_MMX}
                 end
               else
-                hp.registers32:=0;
+                hp.registersint:=0;
 
-              if hp.registers32>registers32 then
-                registers32:=hp.registers32;
+              if hp.registersint>registersint then
+                registersint:=hp.registersint;
               if hp.registersfpu>registersfpu then
                 registersfpu:=hp.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -1002,7 +1002,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.78  2004-02-03 19:48:06  jonas
+  Revision 1.79  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.78  2004/02/03 19:48:06  jonas
     * fixed and re-enabled temps in registers
 
   Revision 1.77  2004/02/03 17:56:14  jonas

compiler/ncal.pas

@@ -268,7 +268,7 @@ type
                  else
                    begin
                      hightree:=caddnode.create(subn,geninlinenode(in_length_x,false,p.getcopy),
-                                               cordconstnode.create(1,s32bittype,false));
+                                               cordconstnode.create(1,s32inttype,false));
                      loadconst:=false;
                    end;
                end;
@@ -277,13 +277,13 @@ type
           len:=0;
         end;
         if loadconst then
-          hightree:=cordconstnode.create(len,s32bittype,true)
+          hightree:=cordconstnode.create(len,s32inttype,true)
         else
           begin
             if not assigned(hightree) then
               internalerror(200304071);
             { Need to use explicit, because it can also be a enum }
-            hightree:=ctypeconvnode.create_explicit(hightree,s32bittype);
+            hightree:=ctypeconvnode.create_explicit(hightree,s32inttype);
           end;
         result:=hightree;
       end;
@@ -767,7 +767,7 @@ type
            begin
               tcallparanode(right).det_registers;
 
-              registers32:=right.registers32;
+              registersint:=right.registersint;
               registersfpu:=right.registersfpu;
 {$ifdef SUPPORT_MMX}
               registersmmx:=right.registersmmx;
@@ -776,8 +776,8 @@ type
 
          firstpass(left);
 
-         if left.registers32>registers32 then
-           registers32:=left.registers32;
+         if left.registersint>registersint then
+           registersint:=left.registersint;
          if left.registersfpu>registersfpu then
            registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -2386,7 +2386,7 @@ type
                               That means the for pushes the para with the
                               highest offset (see para3) needs to be pushed first
                             }
-                            if (hpcurr.registers32>hp.registers32)
+                            if (hpcurr.registersint>hp.registersint)
 {$ifdef x86}
                                or (hpcurr.paraitem.paraloc[callerside].reference.offset>hp.paraitem.paraloc[callerside].reference.offset)
 {$endif x86}
@@ -2402,7 +2402,7 @@ type
                   LOC_REGISTER :
                     begin
                       if (hp.paraitem.paraloc[callerside].loc=currloc) and
-                         (hpcurr.registers32>hp.registers32) then
+                         (hpcurr.registersint>hp.registersint) then
                         break;
                     end;
                 end;
@@ -2519,7 +2519,7 @@ type
                  is_widestring(resulttype.def) then
                begin
                  expectloc:=LOC_CREFERENCE;
-                 registers32:=1;
+                 registersint:=1;
                end
              else
              { we have only to handle the result if it is used }
@@ -2532,15 +2532,15 @@ type
                        if (procdefinition.proctypeoption=potype_constructor) then
                         begin
                           expectloc:=LOC_REGISTER;
-                          registers32:=1;
+                          registersint:=1;
                         end
                        else
                         begin
                           expectloc:=LOC_REGISTER;
                           if is_64bit(resulttype.def) then
-                            registers32:=2
+                            registersint:=2
                           else
-                            registers32:=1;
+                            registersint:=1;
                         end;
                      end;
                    floatdef :
@@ -2548,12 +2548,12 @@ type
                        expectloc:=LOC_FPUREGISTER;
 {$ifdef cpufpemu}
                        if (cs_fp_emulation in aktmoduleswitches) then
-                         registers32:=1
+                         registersint:=1
                        else
 {$endif cpufpemu}
 {$ifdef m68k}
                         if (tfloatdef(resulttype.def).typ=s32real) then
-                         registers32:=1
+                         registersint:=1
                        else
 {$endif m68k}
                          registersfpu:=1;
@@ -2561,7 +2561,7 @@ type
                    else
                      begin
                        expectloc:=LOC_REGISTER;
-                       registers32:=1;
+                       registersint:=1;
                      end;
                  end;
                end
@@ -2574,7 +2574,7 @@ type
 {$ifdef m68k}
          { we need one more address register for virtual calls on m68k }
          if (po_virtualmethod in procdefinition.procoptions) then
-           inc(registers32);
+           inc(registersint);
 {$endif m68k}
          { a fpu can be used in any procedure !! }
 {$ifdef i386}
@@ -2587,7 +2587,7 @@ type
                begin
                  firstpass(methodpointer);
                  registersfpu:=max(methodpointer.registersfpu,registersfpu);
-                 registers32:=max(methodpointer.registers32,registers32);
+                 registersint:=max(methodpointer.registersint,registersint);
 {$ifdef SUPPORT_MMX }
                  registersmmx:=max(methodpointer.registersmmx,registersmmx);
 {$endif SUPPORT_MMX}
@@ -2599,7 +2599,7 @@ type
          if assigned(inlinecode) then
            begin
               registersfpu:=max(inlinecode.registersfpu,registersfpu);
-              registers32:=max(inlinecode.registers32,registers32);
+              registersint:=max(inlinecode.registersint,registersint);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(inlinecode.registersmmx,registersmmx);
 {$endif SUPPORT_MMX}
@@ -2609,7 +2609,7 @@ type
          if assigned(right) then
            begin
               registersfpu:=max(right.registersfpu,registersfpu);
-              registers32:=max(right.registers32,registers32);
+              registersint:=max(right.registersint,registersint);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(right.registersmmx,registersmmx);
 {$endif SUPPORT_MMX}
@@ -2618,7 +2618,7 @@ type
          if assigned(left) then
            begin
               registersfpu:=max(left.registersfpu,registersfpu);
-              registers32:=max(left.registers32,registers32);
+              registersint:=max(left.registersint,registersint);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(left.registersmmx,registersmmx);
 {$endif SUPPORT_MMX}
@@ -2711,7 +2711,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.221  2004-01-26 16:12:27  daniel
+  Revision 1.222  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.221  2004/01/26 16:12:27  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/ncgld.pas

@@ -410,7 +410,7 @@ implementation
         if (right.expectloc<>LOC_FLAGS) and
            ((right.expectloc=LOC_JUMP) or
             (right.nodetype=calln) or
-            (right.registers32>=left.registers32)) then
+            (right.registersint>=left.registersint)) then
          begin
            secondpass(right);
            { increment source reference counter, this is
@@ -906,7 +906,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.105  2004-02-02 20:41:59  florian
+  Revision 1.106  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.105  2004/02/02 20:41:59  florian
     + added prefetch(const mem) support
 
   Revision 1.104  2003/12/25 01:07:09  florian

compiler/ncgmem.pas

@@ -752,7 +752,7 @@ implementation
                              { First pass processed this with the assumption   }
                              { that there was an add node which may require an }
                              { extra register. Fake it or die with IE10 (JM)   }
-                             t.registers32 := taddnode(right).registers32;
+                             t.registersint := taddnode(right).registersint;
                              taddnode(right).left:=nil;
                              right.free;
                              right:=t;
@@ -761,7 +761,7 @@ implementation
                           begin
                              extraoffset:=tordconstnode(taddnode(right).left).value;
                              t:=taddnode(right).right;
-                             t.registers32 :=  right.registers32;
+                             t.registersint :=  right.registersint;
                              taddnode(right).right:=nil;
                              right.free;
                              right:=t;
@@ -773,7 +773,7 @@ implementation
                           begin
                              extraoffset:=-tordconstnode(taddnode(right).right).value;
                              t:=taddnode(right).left;
-                             t.registers32 :=  right.registers32;
+                             t.registersint :=  right.registersint;
                              taddnode(right).left:=nil;
                              right.free;
                              right:=t;
@@ -784,7 +784,7 @@ implementation
                           begin
                              extraoffset:=right.left.value;
                              t:=right.right;
-                             t^.registers32 :=  right.registers32;
+                             t^.registersint :=  right.registersint;
                              putnode(right);
                              putnode(right.left);
                              right:=t;
@@ -881,7 +881,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.85  2004-01-31 17:45:17  peter
+  Revision 1.86  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.85  2004/01/31 17:45:17  peter
     * Change several $ifdef i386 to x86
     * Change several OS_32 to OS_INT/OS_ADDR
 

compiler/ncgutil.pas

@@ -154,7 +154,7 @@ implementation
                  ((p.left.registersfpu = 0) and (p.right.registersfpu = 0)) or
                  (p.location.loc<>LOC_FPUREGISTER)
                 ) and
-                (p.left.registers32<p.right.registers32)
+                (p.left.registersint<p.right.registersint)
                )
               ) then
             begin
@@ -2117,7 +2117,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.186  2004-01-31 18:40:15  daniel
+  Revision 1.187  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.186  2004/01/31 18:40:15  daniel
     * Last steps before removal of aasmtai dependency in symsym can be
       accomplished.
 

compiler/ncnv.pas

@@ -287,7 +287,7 @@ implementation
                  begin
                     if (constsethi>255) or
                        (torddef(t.def).low<0) then
-                      htype:=u8bittype
+                      htype:=u8inttype
                     else
                       htype:=t;
                  end;
@@ -386,8 +386,8 @@ implementation
                                    htype:=p3.resulttype
                                  else
                                    begin
-                                     inserttypeconv(p3,u8bittype);
-                                     inserttypeconv(p2,u8bittype);
+                                     inserttypeconv(p3,u8inttype);
+                                     inserttypeconv(p2,u8inttype);
                                    end;
 
                                 for l:=tordconstnode(p2).value to tordconstnode(p3).value do
@@ -406,7 +406,7 @@ implementation
                                 if assigned(htype.def) then
                                   inserttypeconv(p3,htype)
                                 else
-                                  inserttypeconv(p3,u8bittype);
+                                  inserttypeconv(p3,u8inttype);
                                 p4:=csetelementnode.create(p2,p3);
                               end;
                            end;
@@ -419,7 +419,7 @@ implementation
                             if not(is_integer(p2.resulttype.def)) then
                               update_constsethi(p2.resulttype)
                             else
-                              inserttypeconv(p2,u8bittype);
+                              inserttypeconv(p2,u8inttype);
 
                             do_set(tordconstnode(p2).value);
                             p2.free;
@@ -431,7 +431,7 @@ implementation
                             if assigned(htype.def) then
                               inserttypeconv(p2,htype)
                             else
-                              inserttypeconv(p2,u8bittype);
+                              inserttypeconv(p2,u8inttype);
 
                             p4:=csetelementnode.create(p2,nil);
                           end;
@@ -466,7 +466,7 @@ implementation
               p2.free;
             end;
            if (htype.def=nil) then
-            htype:=u8bittype;
+            htype:=u8inttype;
          end
         else
          begin
@@ -614,7 +614,7 @@ implementation
         result := ccallnode.createinternres(
           'fpc_'+tstringdef(left.resulttype.def).stringtypname+
           '_to_chararray',ccallparanode.create(left,ccallparanode.create(
-          cordconstnode.create(arrsize,s32bittype,true),nil)),resulttype);
+          cordconstnode.create(arrsize,s32inttype,true),nil)),resulttype);
         left := nil;
       end;
 
@@ -719,15 +719,15 @@ implementation
              begin
                { create word(byte(char) shl 8 or 1) for litte endian machines }
                { and word(byte(char) or 256) for big endian machines          }
-               left := ctypeconvnode.create_explicit(left,u8bittype);
+               left := ctypeconvnode.create_explicit(left,u8inttype);
                if (target_info.endian = endian_little) then
                  left := caddnode.create(orn,
-                   cshlshrnode.create(shln,left,cordconstnode.create(8,s32bittype,false)),
-                   cordconstnode.create(1,s32bittype,false))
+                   cshlshrnode.create(shln,left,cordconstnode.create(8,s32inttype,false)),
+                   cordconstnode.create(1,s32inttype,false))
                else
                  left := caddnode.create(orn,left,
-                   cordconstnode.create(1 shl 8,s32bittype,false));
-               left := ctypeconvnode.create_explicit(left,u16bittype);
+                   cordconstnode.create(1 shl 8,s32inttype,false));
+               left := ctypeconvnode.create_explicit(left,u16inttype);
                resulttypepass(left);
              end;
       end;
@@ -1016,7 +1016,7 @@ implementation
     function ttypeconvnode.resulttype_variant_to_enum : tnode;
 
       begin
-        result := ctypeconvnode.create_explicit(left,defaultordconsttype);
+        result := ctypeconvnode.create_explicit(left,sinttype);
         result := ctypeconvnode.create_explicit(result,resulttype);
         resulttypepass(result);
         { left is reused }
@@ -1027,7 +1027,7 @@ implementation
     function ttypeconvnode.resulttype_enum_to_variant : tnode;
 
       begin
-        result := ctypeconvnode.create_explicit(left,defaultordconsttype);
+        result := ctypeconvnode.create_explicit(left,sinttype);
         result := ctypeconvnode.create_explicit(result,cvarianttype);
         resulttypepass(result);
         { left is reused }
@@ -1483,9 +1483,9 @@ implementation
         else
            expectloc:=left.expectloc;
         if is_64bit(resulttype.def) then
-          registers32:=max(registers32,2)
+          registersint:=max(registersint,2)
         else
-          registers32:=max(registers32,1);
+          registersint:=max(registersint,1);
       end;
 
 
@@ -1493,7 +1493,7 @@ implementation
 
       begin
          first_cstring_to_pchar:=nil;
-         registers32:=1;
+         registersint:=1;
          expectloc:=LOC_REGISTER;
       end;
 
@@ -1524,8 +1524,8 @@ implementation
 
       begin
          first_array_to_pointer:=nil;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
          expectloc:=LOC_REGISTER;
       end;
 
@@ -1585,8 +1585,8 @@ implementation
 
       begin
          first_pointer_to_array:=nil;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
          expectloc:=LOC_REFERENCE;
       end;
 
@@ -1613,15 +1613,15 @@ implementation
          { convert to a 64bit int (only necessary for 32bit processors) (JM) }
          if resulttype.def.size > sizeof(aword) then
            begin
-             result := ctypeconvnode.create_explicit(left,u32bittype);
+             result := ctypeconvnode.create_explicit(left,u32inttype);
              result := ctypeconvnode.create(result,resulttype);
              left := nil;
              firstpass(result);
              exit;
            end;
          expectloc:=LOC_REGISTER;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
       end;
 
 
@@ -1638,11 +1638,11 @@ implementation
          expectloc:=LOC_REGISTER;
          { need if bool to bool !!
            not very nice !!
-         insertypeconv(left,s32bittype);
+         insertypeconv(left,s32inttype);
          left.explizit:=true;
          firstpass(left);  }
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
       end;
 
 
@@ -1650,8 +1650,8 @@ implementation
       begin
          first_bool_to_bool:=nil;
          expectloc:=LOC_REGISTER;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
       end;
 
 
@@ -1669,14 +1669,14 @@ implementation
           begin
             if (left.expectloc<>LOC_CREFERENCE) then
               CGMessage(cg_e_illegal_expression);
-            registers32:=left.registers32;
+            registersint:=left.registersint;
             expectloc:=left.expectloc
           end
          else
           begin
-            registers32:=left.registers32;
-            if registers32<1 then
-              registers32:=1;
+            registersint:=left.registersint;
+            if registersint<1 then
+              registersint:=1;
             expectloc:=LOC_REGISTER;
           end
       end;
@@ -1708,8 +1708,8 @@ implementation
       begin
          first_ansistring_to_pchar:=nil;
          expectloc:=LOC_REGISTER;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
       end;
 
 
@@ -1724,8 +1724,8 @@ implementation
       begin
          first_class_to_intf:=nil;
          expectloc:=LOC_REGISTER;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
       end;
 
     function ttypeconvnode._first_int_to_int : tnode;
@@ -1896,7 +1896,7 @@ implementation
          exit;
 
         { load the value_str from the left part }
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -2389,7 +2389,7 @@ implementation
             if codegenerror then
               exit;
            expectloc:=call.expectloc;
-           registers32:=call.registers32;
+           registersint:=call.registersint;
            registersfpu:=call.registersfpu;
 {$ifdef SUPPORT_MMX}
            registersmmx:=call.registersmmx;
@@ -2405,7 +2405,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.135  2004-01-26 16:12:27  daniel
+  Revision 1.136  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.135  2004/01/26 16:12:27  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/ncon.pas

@@ -193,11 +193,11 @@ implementation
          { maxcardinal }
          i2 := i+i+1;
          if (v<=i) and (v>=-i-1) then
-           genintconstnode:=cordconstnode.create(v,s32bittype,true)
+           genintconstnode:=cordconstnode.create(v,s32inttype,true)
          else if (v > i) and (v <= i2) then
-           genintconstnode:=cordconstnode.create(v,u32bittype,true)
+           genintconstnode:=cordconstnode.create(v,u32inttype,true)
          else
-           genintconstnode:=cordconstnode.create(v,cs64bittype,true);
+           genintconstnode:=cordconstnode.create(v,s64inttype,true);
       end;
 
 
@@ -950,7 +950,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.58  2004-01-26 16:12:27  daniel
+  Revision 1.59  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.58  2004/01/26 16:12:27  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/nflw.pas

@@ -422,7 +422,7 @@ implementation
          firstpass(left);
          if codegenerror then
            exit;
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -435,8 +435,8 @@ implementation
               if codegenerror then
                 exit;
 
-              if registers32<right.registers32 then
-                registers32:=right.registers32;
+              if registersint<right.registersint then
+                registersint:=right.registersint;
               if registersfpu<right.registersfpu then
                 registersfpu:=right.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -577,7 +577,7 @@ implementation
          expectloc:=LOC_VOID;
          old_t_times:=cg.t_times;
          firstpass(left);
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -594,8 +594,8 @@ implementation
            begin
               firstpass(right);
 
-              if registers32<right.registers32 then
-                registers32:=right.registers32;
+              if registersint<right.registersint then
+                registersint:=right.registersint;
               if registersfpu<right.registersfpu then
                 registersfpu:=right.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -609,8 +609,8 @@ implementation
            begin
               firstpass(t1);
 
-              if registers32<t1.registers32 then
-                registers32:=t1.registers32;
+              if registersint<t1.registersint then
+                registersint:=t1.registersint;
               if registersfpu<t1.registersfpu then
                 registersfpu:=t1.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -794,13 +794,13 @@ implementation
             if codegenerror then
              exit;
           end;
-         registers32:=t1.registers32;
+         registersint:=t1.registersint;
          registersfpu:=t1.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
 {$endif SUPPORT_MMX}
-         if left.registers32>registers32 then
-           registers32:=left.registers32;
+         if left.registersint>registersint then
+           registersint:=left.registersint;
          if left.registersfpu>registersfpu then
            registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -812,8 +812,8 @@ implementation
          firstpass(t2);
          if codegenerror then
           exit;
-         if t2.registers32>registers32 then
-           registers32:=t2.registers32;
+         if t2.registersint>registersint then
+           registersint:=t2.registersint;
          if t2.registersfpu>registersfpu then
            registersfpu:=t2.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -834,8 +834,8 @@ implementation
             loopvar_notid:=Tvarsym(Tloadnode(hp).symtableentry).
              register_notification([vn_onread,vn_onwrite],@loop_var_access);
       {$endif}
-         if right.registers32>registers32 then
-           registers32:=right.registers32;
+         if right.registersint>registersint then
+           registersint:=right.registersint;
          if right.registersfpu>registersfpu then
            registersfpu:=right.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -843,8 +843,8 @@ implementation
            registersmmx:=right.registersmmx;
 {$endif SUPPORT_MMX}
          { we need at least one register for comparisons PM }
-         if registers32=0 then
-           inc(registers32);
+         if registersint=0 then
+           inc(registersint);
          cg.t_times:=old_t_times;
       end;
 
@@ -897,7 +897,7 @@ implementation
               firstpass(left);
               if codegenerror then
                exit;
-              registers32:=left.registers32;
+              registersint:=left.registersint;
               registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
               registersmmx:=left.registersmmx;
@@ -1112,7 +1112,7 @@ implementation
          if assigned(left) then
           begin
             firstpass(left);
-            registers32:=left.registers32;
+            registersint:=left.registersint;
             registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
             registersmmx:=left.registersmmx;
@@ -1291,7 +1291,7 @@ implementation
          if assigned(right) then
            begin
               firstpass(right);
-              registers32:=max(registers32,right.registers32);
+              registersint:=max(registersint,right.registersint);
               registersfpu:=max(registersfpu,right.registersfpu);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(registersmmx,right.registersmmx);
@@ -1301,7 +1301,7 @@ implementation
          if assigned(t1) then
            begin
               firstpass(t1);
-              registers32:=max(registers32,t1.registers32);
+              registersint:=max(registersint,t1.registersint);
               registersfpu:=max(registersfpu,t1.registersfpu);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(registersmmx,t1.registersmmx);
@@ -1361,7 +1361,7 @@ implementation
          if assigned(t1) then
            begin
              firstpass(t1);
-             registers32:=max(registers32,t1.registers32);
+             registersint:=max(registersint,t1.registersint);
              registersfpu:=max(registersfpu,t1.registersfpu);
 {$ifdef SUPPORT_MMX}
              registersmmx:=max(registersmmx,t1.registersmmx);
@@ -1428,7 +1428,7 @@ implementation
          result:=nil;
          include(current_procinfo.flags,pi_do_call);
          expectloc:=LOC_VOID;
-         registers32:=0;
+         registersint:=0;
          registersfpu:=0;
 {$ifdef SUPPORT_MMX}
          registersmmx:=0;
@@ -1436,7 +1436,7 @@ implementation
          if assigned(left) then
            begin
               firstpass(left);
-              registers32:=left.registers32;
+              registersint:=left.registersint;
               registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
               registersmmx:=left.registersmmx;
@@ -1446,7 +1446,7 @@ implementation
          if assigned(right) then
            begin
               firstpass(right);
-              registers32:=max(registers32,right.registers32);
+              registersint:=max(registersint,right.registersint);
               registersfpu:=max(registersfpu,right.registersfpu);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(registersmmx,right.registersmmx);
@@ -1475,7 +1475,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.92  2004-01-26 16:12:27  daniel
+  Revision 1.93  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.92  2004/01/26 16:12:27  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/ninl.pas

@@ -206,26 +206,26 @@ implementation
           begin
             { insert realtype parameter }
             newparas.right := ccallparanode.create(cordconstnode.create(
-              ord(tfloatdef(source.left.resulttype.def).typ),s32bittype,true),
+              ord(tfloatdef(source.left.resulttype.def).typ),s32inttype,true),
                newparas.right);
             { if necessary, insert a fraction parameter }
             if not assigned(fracpara) then
               begin
                 tcallparanode(newparas.right).right := ccallparanode.create(
-                  cordconstnode.create(-1,s32bittype,false),
+                  cordconstnode.create(-1,s32inttype,false),
                    tcallparanode(newparas.right).right);
                 fracpara := tcallparanode(tcallparanode(newparas.right).right);
               end;
             { if necessary, insert a length para }
             if not assigned(lenpara) then
               fracpara.right := ccallparanode.create(
-                cordconstnode.create(-32767,s32bittype,false),
+                cordconstnode.create(-32767,s32inttype,false),
                    fracpara.right);
           end
         else
           { for a normal parameter, insert a only length parameter if one is missing }
           if not assigned(lenpara) then
-            newparas.right := ccallparanode.create(cordconstnode.create(-1,s32bittype,false),
+            newparas.right := ccallparanode.create(cordconstnode.create(-1,s32inttype,false),
               newparas.right);
 
         { remove the parameters from the original node so they won't get disposed, }
@@ -269,7 +269,7 @@ implementation
         {   parameter is gets lifted out of its original tcallparanode (see round }
         {   line 1306 of ncal.pas), so recreate a tcallparanode here (JM)         }
         left := ccallparanode.create(cordconstnode.create(
-          tfiledef(left.resulttype.def).typedfiletype.def.size,s32bittype,true),
+          tfiledef(left.resulttype.def).typedfiletype.def.size,s32inttype,true),
           ccallparanode.create(left,nil));
         { create the correct call }
         if inlinenumber=in_reset_typedfile then
@@ -455,7 +455,7 @@ implementation
           begin
             { add the typesize to the filepara }
             filepara.right := ccallparanode.create(cordconstnode.create(
-              tfiledef(filepara.resulttype.def).typedfiletype.def.size,s32bittype,true),nil);
+              tfiledef(filepara.resulttype.def).typedfiletype.def.size,s32inttype,true),nil);
 
             { check for "no parameters" (you need at least one extra para for typed files) }
             if not assigned(para) then
@@ -694,7 +694,7 @@ implementation
                           begin
                             if not assigned(lenpara) then
                               lenpara := ccallparanode.create(
-                                cordconstnode.create(0,s32bittype,false),nil)
+                                cordconstnode.create(0,s32inttype,false),nil)
                             else
                               { make sure we don't pass the successive }
                               { parameters too. We also already have a }
@@ -706,18 +706,18 @@ implementation
                           begin
                             if not assigned(lenpara) then
                               lenpara := ccallparanode.create(
-                                cordconstnode.create(-32767,s32bittype,false),nil);
+                                cordconstnode.create(-32767,s32inttype,false),nil);
                             { also create a default fracpara if necessary }
                             if not assigned(fracpara) then
                               fracpara := ccallparanode.create(
-                                cordconstnode.create(-1,s32bittype,false),nil);
+                                cordconstnode.create(-1,s32inttype,false),nil);
                             { add it to the lenpara }
                             lenpara.right := fracpara;
                             { and add the realtype para (this also removes the link }
                             { to any parameters coming after it)                    }
                             fracpara.right := ccallparanode.create(
                                 cordconstnode.create(ord(tfloatdef(para.left.resulttype.def).typ),
-                                s32bittype,true),nil);
+                                s32inttype,true),nil);
                           end;
                       end;
 
@@ -738,9 +738,9 @@ implementation
                         if is_real then
                           restype := pbestrealtype
                         else if is_signed(para.left.resulttype.def) then
-                          restype := @s32bittype
+                          restype := @s32inttype
                         else
-                          restype := @u32bittype;
+                          restype := @u32inttype;
 
                         { create the parameter list: the temp ... }
                         temp := ctempcreatenode.create(restype^,restype^.def.size,tt_persistent);
@@ -906,7 +906,7 @@ implementation
         if not assigned(codepara) or
            (torddef(codepara.resulttype.def).typ in [u8bit,u16bit,s8bit,s16bit]) then
           begin
-            tempcode := ctempcreatenode.create(s32bittype,4,tt_persistent);
+            tempcode := ctempcreatenode.create(s32inttype,4,tt_persistent);
             addstatement(newstatement,tempcode);
             { set the resulttype of the temp (needed to be able to get }
             { the resulttype of the tempref used in the new code para) }
@@ -929,7 +929,7 @@ implementation
           { and cardinals are fine. Since the formal code para type is      }
           { longint, insert a typecoversion to longint for cardinal para's  }
           begin
-            codepara.left := ctypeconvnode.create_explicit(codepara.left,s32bittype);
+            codepara.left := ctypeconvnode.create_explicit(codepara.left,s32inttype);
             { make it explicit, oterwise you may get a nonsense range }
             { check error if the cardinal already contained a value   }
             { > $7fffffff                                             }
@@ -948,7 +948,7 @@ implementation
                     suffix := 'sint_';
                     { we also need a destsize para in this case }
                     sizepara := ccallparanode.create(cordconstnode.create
-                      (destpara.resulttype.def.size,s32bittype,true),nil);
+                      (destpara.resulttype.def.size,s32inttype,true),nil);
                   end;
                 u8bit,u16bit,u32bit:
                    suffix := 'uint_';
@@ -1204,13 +1204,13 @@ implementation
                           if (vr>=9223372036854775808.0) or (vr<=-9223372036854775809.0) then
                             begin
                                CGMessage(parser_e_range_check_error);
-                               hp:=cordconstnode.create(1,cs64bittype,false)
+                               hp:=cordconstnode.create(1,s64inttype,false)
                             end
                           else
-                            hp:=cordconstnode.create(trunc(vr),cs64bittype,true)
+                            hp:=cordconstnode.create(trunc(vr),s64inttype,true)
                        end
                      else
-                      hp:=cordconstnode.create(trunc(vl),cs64bittype,true);
+                      hp:=cordconstnode.create(trunc(vl),s64inttype,true);
                    end;
                  in_const_round :
                    begin
@@ -1219,13 +1219,13 @@ implementation
                           if (vr>=9223372036854775807.5) or (vr<=-9223372036854775808.5) then
                             begin
                                CGMessage(parser_e_range_check_error);
-                               hp:=cordconstnode.create(1,cs64bittype,false)
+                               hp:=cordconstnode.create(1,s64inttype,false)
                             end
                           else
-                            hp:=cordconstnode.create(round(vr),cs64bittype,true)
+                            hp:=cordconstnode.create(round(vr),s64inttype,true)
                        end
                      else
-                      hp:=cordconstnode.create(round(vl),cs64bittype,true);
+                      hp:=cordconstnode.create(round(vl),s64inttype,true);
                    end;
                  in_const_frac :
                    begin
@@ -1382,13 +1382,13 @@ implementation
                   case inlinenumber of
                     in_lo_word,
                     in_hi_word :
-                      resulttype:=u8bittype;
+                      resulttype:=u8inttype;
                     in_lo_long,
                     in_hi_long :
-                      resulttype:=u16bittype;
+                      resulttype:=u16inttype;
                     in_lo_qword,
                     in_hi_qword :
-                      resulttype:=u32bittype;
+                      resulttype:=u32inttype;
                   end;
                 end;
 
@@ -1402,16 +1402,16 @@ implementation
                      if assigned(hightree) then
                       begin
                         hp:=caddnode.create(addn,hightree,
-                                         cordconstnode.create(1,s32bittype,false));
+                                         cordconstnode.create(1,s32inttype,false));
                         if (left.resulttype.def.deftype=arraydef) and
                            (tarraydef(left.resulttype.def).elesize<>1) then
                           hp:=caddnode.create(muln,hp,cordconstnode.create(tarraydef(
-                            left.resulttype.def).elesize,s32bittype,true));
+                            left.resulttype.def).elesize,s32inttype,true));
                         result:=hp;
                       end;
                    end
                   else
-                   resulttype:=s32bittype;
+                   resulttype:=s32inttype;
                 end;
 
               in_typeof_x:
@@ -1425,7 +1425,7 @@ implementation
                    if (left.nodetype=ordconstn) then
                     begin
                       hp:=cordconstnode.create(
-                         tordconstnode(left).value,s32bittype,true);
+                         tordconstnode(left).value,s32inttype,true);
                       result:=hp;
                       goto myexit;
                     end;
@@ -1438,7 +1438,7 @@ implementation
                            uchar:
                              begin
                                { change to byte() }
-                               hp:=ctypeconvnode.create_explicit(left,u8bittype);
+                               hp:=ctypeconvnode.create_explicit(left,u8inttype);
                                left:=nil;
                                result:=hp;
                              end;
@@ -1446,14 +1446,14 @@ implementation
                            uwidechar :
                              begin
                                { change to word() }
-                               hp:=ctypeconvnode.create_explicit(left,u16bittype);
+                               hp:=ctypeconvnode.create_explicit(left,u16inttype);
                                left:=nil;
                                result:=hp;
                              end;
                            bool32bit :
                              begin
                                { change to dword() }
-                               hp:=ctypeconvnode.create_explicit(left,u32bittype);
+                               hp:=ctypeconvnode.create_explicit(left,u32inttype);
                                left:=nil;
                                result:=hp;
                              end;
@@ -1470,7 +1470,7 @@ implementation
                        end;
                      enumdef :
                        begin
-                         hp:=ctypeconvnode.create_explicit(left,s32bittype);
+                         hp:=ctypeconvnode.create_explicit(left,s32inttype);
                          left:=nil;
                          result:=hp;
                        end;
@@ -1509,7 +1509,7 @@ implementation
                         if (left.nodetype=stringconstn) then
                          begin
                            hp:=cordconstnode.create(
-                             tstringconstnode(left).len,s32bittype,true);
+                             tstringconstnode(left).len,s32inttype,true);
                            result:=hp;
                            goto myexit;
                          end;
@@ -1520,7 +1520,7 @@ implementation
                         if is_char(left.resulttype.def) or
                            is_widechar(left.resulttype.def) then
                          begin
-                           hp:=cordconstnode.create(1,s32bittype,false);
+                           hp:=cordconstnode.create(1,s32inttype,false);
                            result:=hp;
                            goto myexit;
                          end
@@ -1559,7 +1559,7 @@ implementation
                            if assigned(hightree) then
                             begin
                               hp:=caddnode.create(addn,hightree,
-                                                  cordconstnode.create(1,s32bittype,false));
+                                                  cordconstnode.create(1,s32inttype,false));
                               result:=hp;
                             end;
                            goto myexit;
@@ -1569,7 +1569,7 @@ implementation
                           begin
                             hp:=cordconstnode.create(tarraydef(left.resulttype.def).highrange-
                                                       tarraydef(left.resulttype.def).lowrange+1,
-                                                     s32bittype,true);
+                                                     s32inttype,true);
                             result:=hp;
                             goto myexit;
                           end
@@ -1590,9 +1590,9 @@ implementation
                   { shortstring return an 8 bit value as the length
                     is the first byte of the string }
                   if is_shortstring(left.resulttype.def) then
-                   resulttype:=u8bittype
+                   resulttype:=u8inttype
                   else
-                   resulttype:=s32bittype;
+                   resulttype:=s32inttype;
                 end;
 
               in_typeinfo_x:
@@ -1631,7 +1631,7 @@ implementation
               in_seg_x :
                 begin
                   set_varstate(left,vs_used,false);
-                  hp:=cordconstnode.create(0,s32bittype,false);
+                  hp:=cordconstnode.create(0,s32inttype,false);
                   result:=hp;
                   goto myexit;
                 end;
@@ -1705,14 +1705,14 @@ implementation
                                  else
                                   if is_64bitint(left.resulttype.def) then
                                    if is_signed(left.resulttype.def) then
-                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,cs64bittype)
+                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,s64inttype)
                                    else
-                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,cu64bittype)
+                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,u64inttype)
                                  else
                                    if is_signed(left.resulttype.def) then
-                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,s32bittype)
+                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,s32inttype)
                                    else
-                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,u32bittype);
+                                     inserttypeconv(tcallparanode(tcallparanode(left).right).left,u32inttype);
                                end;
 
                              if assigned(tcallparanode(tcallparanode(left).right).right) then
@@ -1740,7 +1740,7 @@ implementation
                   { now we know the type of buffer }
                   srsym:=searchsymonlyin(systemunit,'SETTEXTBUF');
                   hp:=ccallparanode.create(cordconstnode.create(
-                     tcallparanode(left).left.resulttype.def.size,s32bittype,true),left);
+                     tcallparanode(left).left.resulttype.def.size,s32inttype,true),left);
                   hp:=ccallnode.create(hp,tprocsym(srsym),systemunit,nil);
                   left:=nil;
                   result:=hp;
@@ -1835,14 +1835,14 @@ implementation
                       begin
                         if inlinenumber=in_low_x then
                          begin
-                           result:=cordconstnode.create(0,u8bittype,false);
+                           result:=cordconstnode.create(0,u8inttype,false);
                          end
                         else
                          begin
                            if is_open_string(left.resulttype.def) then
                             result:=load_high_value_node(tvarsym(tloadnode(left).symtableentry))
                            else
-                            result:=cordconstnode.create(tstringdef(left.resulttype.def).len,u8bittype,true);
+                            result:=cordconstnode.create(tstringdef(left.resulttype.def).len,u8inttype,true);
                          end;
                      end;
                     else
@@ -2049,7 +2049,7 @@ implementation
               end;
               if shiftconst <> 0 then
                 result := ctypeconvnode.create_explicit(cshlshrnode.create(shrn,left,
-                    cordconstnode.create(shiftconst,u32bittype,false)),resulttype)
+                    cordconstnode.create(shiftconst,u32inttype,false)),resulttype)
               else
                 result := ctypeconvnode.create_explicit(left,resulttype);
               left := nil;
@@ -2058,15 +2058,15 @@ implementation
 
           in_sizeof_x:
             begin
-              if registers32<1 then
-                 registers32:=1;
+              if registersint<1 then
+                 registersint:=1;
               expectloc:=LOC_REGISTER;
             end;
 
           in_typeof_x:
             begin
-               if registers32<1 then
-                 registers32:=1;
+               if registersint<1 then
+                 registersint:=1;
                expectloc:=LOC_REGISTER;
             end;
 
@@ -2077,8 +2077,8 @@ implementation
                else
                 begin
                   { ansi/wide string }
-                  if registers32<1 then
-                   registers32:=1;
+                  if registersint<1 then
+                   registersint:=1;
                   expectloc:=LOC_REGISTER;
                 end;
             end;
@@ -2086,13 +2086,13 @@ implementation
           in_typeinfo_x:
             begin
                expectloc:=LOC_REGISTER;
-               registers32:=1;
+               registersint:=1;
             end;
 
           in_assigned_x:
             begin
               expectloc := LOC_JUMP;
-              registers32:=1;
+              registersint:=1;
             end;
 
           in_pred_x,
@@ -2100,13 +2100,13 @@ implementation
             begin
               if is_64bit(resulttype.def) then
                begin
-                 if (registers32<2) then
-                  registers32:=2
+                 if (registersint<2) then
+                  registersint:=2
                end
               else
                begin
-                 if (registers32<1) then
-                  registers32:=1;
+                 if (registersint<1) then
+                  registersint:=1;
                end;
               expectloc:=LOC_REGISTER;
             end;
@@ -2145,7 +2145,7 @@ implementation
                      end
                    else
                      { no, create constant 1 }
-                     hpp := cordconstnode.create(1,s32bittype,false);
+                     hpp := cordconstnode.create(1,s32inttype,false);
                    { addition/substraction depending on inc/dec }
                    if inlinenumber = in_inc_x then
                      hp := caddnode.create(addn,tcallparanode(left).left.getcopy,hpp)
@@ -2168,12 +2168,12 @@ implementation
                          { need we an additional register ? }
                          if not(is_constintnode(tcallparanode(tcallparanode(left).right).left)) and
                            (tcallparanode(tcallparanode(left).right).left.expectloc in [LOC_CREFERENCE,LOC_REFERENCE]) and
-                           (tcallparanode(tcallparanode(left).right).left.registers32<=1) then
-                           inc(registers32);
+                           (tcallparanode(tcallparanode(left).right).left.registersint<=1) then
+                           inc(registersint);
 
                          { do we need an additional register to restore the first parameter? }
-                         if tcallparanode(tcallparanode(left).right).left.registers32>=registers32 then
-                           inc(registers32);
+                         if tcallparanode(tcallparanode(left).right).left.registersint>=registersint then
+                           inc(registersint);
                       end;
                  end;
             end;
@@ -2183,7 +2183,7 @@ implementation
            begin
               expectloc:=LOC_VOID;
 
-              registers32:=left.registers32;
+              registersint:=left.registersint;
               registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
               registersmmx:=left.registersmmx;
@@ -2239,7 +2239,7 @@ implementation
          in_assert_x_y :
             begin
               expectloc:=LOC_VOID;
-              registers32:=left.registers32;
+              registersint:=left.registersint;
               registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
               registersmmx:=left.registersmmx;
@@ -2374,7 +2374,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.129  2004-02-03 16:46:51  jonas
+  Revision 1.130  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.129  2004/02/03 16:46:51  jonas
     + support to store ttempcreate/ref/deletenodes in registers
     * put temps for withnodes and some newnodes in registers
      Note: this currently only works because calling ungetregister()

compiler/nld.pas

@@ -446,7 +446,7 @@ implementation
       begin
          result:=nil;
          expectloc:=LOC_REFERENCE;
-         registers32:=0;
+         registersint:=0;
          registersfpu:=0;
 {$ifdef SUPPORT_MMX}
          registersmmx:=0;
@@ -470,9 +470,9 @@ implementation
                   expectloc:=LOC_CREFERENCE;
                 { we need a register for call by reference parameters }
                 if paramanager.push_addr_param(tvarsym(symtableentry).varspez,tvarsym(symtableentry).vartype.def,pocall_default) then
-                  registers32:=1;
+                  registersint:=1;
                 if ([vo_is_thread_var,vo_is_dll_var]*tvarsym(symtableentry).varoptions)<>[] then
-                  registers32:=1;
+                  registersint:=1;
                 { call to get address of threadvar }
                 if (vo_is_thread_var in tvarsym(symtableentry).varoptions) then
                   include(current_procinfo.flags,pi_do_call);
@@ -493,7 +493,7 @@ implementation
                      begin
                         expectloc:=LOC_CREFERENCE;
                         firstpass(left);
-                        registers32:=max(registers32,left.registers32);
+                        registersint:=max(registersint,left.registersint);
                         registersfpu:=max(registersfpu,left.registersfpu);
  {$ifdef SUPPORT_MMX}
                         registersmmx:=max(registersmmx,left.registersmmx);
@@ -837,7 +837,7 @@ implementation
            end;
 
 
-         registers32:=left.registers32+right.registers32;
+         registersint:=left.registersint+right.registersint;
          registersfpu:=max(left.registersfpu,right.registersfpu);
 {$ifdef SUPPORT_MMX}
          registersmmx:=max(left.registersmmx,right.registersmmx);
@@ -971,7 +971,7 @@ implementation
          end;
          if not assigned(htype.def) then
           htype:=voidtype;
-         resulttype.setdef(tarraydef.create(0,len-1,s32bittype));
+         resulttype.setdef(tarraydef.create(0,len-1,s32inttype));
          tarraydef(resulttype.def).setelementtype(htype);
          tarraydef(resulttype.def).IsConstructor:=true;
          tarraydef(resulttype.def).IsVariant:=varia;
@@ -1019,14 +1019,14 @@ implementation
                begin
                  case hp.left.resulttype.def.deftype of
                    enumdef :
-                     hp.left:=ctypeconvnode.create_explicit(hp.left,s32bittype);
+                     hp.left:=ctypeconvnode.create_explicit(hp.left,s32inttype);
                    arraydef :
                      hp.left:=ctypeconvnode.create(hp.left,charpointertype);
                    orddef :
                      begin
                        if is_integer(hp.left.resulttype.def) and
                           not(is_64bitint(hp.left.resulttype.def)) then
-                         hp.left:=ctypeconvnode.create(hp.left,s32bittype);
+                         hp.left:=ctypeconvnode.create(hp.left,s32inttype);
                      end;
                    floatdef :
                      hp.left:=ctypeconvnode.create(hp.left,pbestrealtype^);
@@ -1246,7 +1246,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.120  2004-01-26 16:12:28  daniel
+  Revision 1.121  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.120  2004/01/26 16:12:28  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/nmat.pas

@@ -109,9 +109,9 @@ implementation
 
          { we need 2 orddefs always }
          if (left.resulttype.def.deftype<>orddef) then
-           inserttypeconv(right,s32bittype);
+           inserttypeconv(right,sinttype);
          if (right.resulttype.def.deftype<>orddef) then
-           inserttypeconv(right,s32bittype);
+           inserttypeconv(right,sinttype);
          if codegenerror then
            exit;
 
@@ -186,6 +186,7 @@ implementation
              resulttype:=left.resulttype;
            end
          else
+{$ifndef cpu64bit}
           { when there is one 64bit value, everything is done
             in 64bit }
           if (is_64bitint(left.resulttype.def) or
@@ -194,16 +195,16 @@ implementation
              if is_signed(rd) or is_signed(ld) then
                begin
                   if (torddef(ld).typ<>s64bit) then
-                    inserttypeconv(left,cs64bittype);
+                    inserttypeconv(left,s64inttype);
                   if (torddef(rd).typ<>s64bit) then
-                    inserttypeconv(right,cs64bittype);
+                    inserttypeconv(right,s64inttype);
                end
              else
                begin
                   if (torddef(ld).typ<>u64bit) then
-                    inserttypeconv(left,cu64bittype);
+                    inserttypeconv(left,u64inttype);
                   if (torddef(rd).typ<>u64bit) then
-                    inserttypeconv(right,cu64bittype);
+                    inserttypeconv(right,u64inttype);
                end;
              resulttype:=left.resulttype;
            end
@@ -216,18 +217,19 @@ implementation
            begin
               CGMessage(type_w_mixed_signed_unsigned);
               if (torddef(ld).typ<>s64bit) then
-                inserttypeconv(left,cs64bittype);
+                inserttypeconv(left,s64inttype);
               if (torddef(rd).typ<>s64bit) then
-                inserttypeconv(right,cs64bittype);
+                inserttypeconv(right,s64inttype);
               resulttype:=left.resulttype;
            end
          else
+{$endif cpu64bit}
            begin
-              { Make everything always 32bit }
-              if not(torddef(right.resulttype.def).typ in [s32bit,u32bit]) then
-                inserttypeconv(right,s32bittype);
-              if not(torddef(left.resulttype.def).typ in [s32bit,u32bit]) then
-                inserttypeconv(left,s32bittype);
+              { Make everything always default singed int }
+              if not(torddef(right.resulttype.def).typ in [torddef(sinttype.def).typ,torddef(uinttype.def).typ]) then
+                inserttypeconv(right,sinttype);
+              if not(torddef(left.resulttype.def).typ in [torddef(sinttype.def).typ,torddef(uinttype.def).typ]) then
+                inserttypeconv(left,sinttype);
               resulttype:=right.resulttype;
            end;
 
@@ -287,8 +289,8 @@ implementation
           parameters to s64bit, so they are not converted }
         if is_currency(resulttype.def) then
           begin
-            left.resulttype:=cs64bittype;
-            right.resulttype:=cs64bittype;
+            left.resulttype:=s64inttype;
+            right.resulttype:=s64inttype;
           end;
 
         { otherwise create a call to a helper }
@@ -344,7 +346,7 @@ implementation
                     left := caddnode.create(addn,left,
                       caddnode.create(andn,
                         cshlshrnode.create(sarn,left.getcopy,
-                          cordconstnode.create(shiftval,s32bittype,false)),
+                          cordconstnode.create(shiftval,sinttype,false)),
                         cordconstnode.create(tordconstnode(right).value-1,
                           right.resulttype,false)));
                     newtype := sarn;
@@ -380,8 +382,10 @@ implementation
          result := firstoptimize;
          if assigned(result) then
            exit;
+{$ifndef cpu64bit}
          { 64bit }
-         if (left.resulttype.def.deftype=orddef) and (right.resulttype.def.deftype=orddef) and
+         if (left.resulttype.def.deftype=orddef) and
+            (right.resulttype.def.deftype=orddef) and
             (is_64bitint(left.resulttype.def) or is_64bitint(right.resulttype.def)) then
            begin
              result := first_moddiv64bitint;
@@ -391,13 +395,14 @@ implementation
              calcregisters(self,2,0,0);
            end
          else
+{$endif cpu64bit}
            begin
              result := first_moddivint;
              if assigned(result) then
                exit;
              left_right_max;
-             if left.registers32<=right.registers32 then
-              inc(registers32);
+             if left.registersint<=right.registersint then
+              inc(registersint);
            end;
          expectloc:=LOC_REGISTER;
       end;
@@ -467,14 +472,16 @@ implementation
               exit;
            end;
 
+{$ifndef cpu64bit}
          { 64 bit ints have their own shift handling }
          if not(is_64bitint(left.resulttype.def)) then
            begin
-              if torddef(left.resulttype.def).typ <> u32bit then
-               inserttypeconv(left,s32bittype);
+             if torddef(left.resulttype.def).typ<>torddef(uinttype.def).typ then
+               inserttypeconv(left,sinttype);
            end;
+{$endif cpu64bit}
 
-         inserttypeconv(right,s32bittype);
+         inserttypeconv(right,sinttype);
 
          resulttype:=left.resulttype;
       end;
@@ -490,17 +497,19 @@ implementation
          if codegenerror then
            exit;
 
+{$ifndef cpu64bit}
          { 64 bit ints have their own shift handling }
-         if not(is_64bit(left.resulttype.def)) then
-           begin
-            regs:=1
-           end
-         else
+         if is_64bit(left.resulttype.def) then
            begin
              result := first_shlshr64bitint;
              if assigned(result) then
                exit;
               regs:=2;
+           end
+         else
+{$endif cpu64bit}
+           begin
+             regs:=1
            end;
 
          if (right.nodetype<>ordconstn) then
@@ -519,6 +528,7 @@ implementation
          inherited create(unaryminusn,expr);
       end;
 
+
     function tunaryminusnode.det_resulttype : tnode;
       var
          t : tnode;
@@ -563,12 +573,14 @@ implementation
                }
              end
 {$endif SUPPORT_MMX}
+{$ifndef cpu64bit}
          else if is_64bitint(left.resulttype.def) then
            begin
            end
+{$endif cpu64bit}
          else if (left.resulttype.def.deftype=orddef) then
            begin
-              inserttypeconv(left,s32bittype);
+              inserttypeconv(left,sinttype);
               resulttype:=left.resulttype;
            end
          else
@@ -599,7 +611,7 @@ implementation
          if codegenerror then
            exit;
 
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -621,18 +633,20 @@ implementation
                  registersmmx:=1;
              end
 {$endif SUPPORT_MMX}
+{$ifndef cpu64bit}
          else if is_64bit(left.resulttype.def) then
            begin
               if (left.expectloc<>LOC_REGISTER) and
-                 (registers32<2) then
-                registers32:=2;
+                 (registersint<2) then
+                registersint:=2;
               expectloc:=LOC_REGISTER;
            end
+{$endif cpu64bit}
          else if (left.resulttype.def.deftype=orddef) then
            begin
               if (left.expectloc<>LOC_REGISTER) and
-                 (registers32<1) then
-                registers32:=1;
+                 (registersint<1) then
+                registersint:=1;
               expectloc:=LOC_REGISTER;
            end;
       end;
@@ -642,15 +656,17 @@ implementation
                                TNOTNODE
  ****************************************************************************}
 
-    const boolean_reverse:array[ltn..unequaln] of Tnodetype=
-  (gten,gtn,lten,ltn,unequaln,equaln);
+    const
+      boolean_reverse:array[ltn..unequaln] of Tnodetype=(
+        gten,gtn,lten,ltn,unequaln,equaln
+      );
 
     constructor tnotnode.create(expr : tnode);
-
       begin
          inherited create(notn,expr);
       end;
 
+
     function tnotnode.det_resulttype : tnode;
       var
          t : tnode;
@@ -739,12 +755,15 @@ implementation
              end
          else
 {$endif SUPPORT_MMX}
+{$ifndef cpu64bit}
            if is_64bitint(left.resulttype.def) then
              begin
              end
-         else if is_integer(left.resulttype.def) then
-           begin
-           end
+         else
+{$endif cpu64bit}
+           if is_integer(left.resulttype.def) then
+             begin
+             end
          else
            begin
               notdef:=nil;
@@ -772,7 +791,7 @@ implementation
            exit;
 
          expectloc:=left.expectloc;
-         registers32:=left.registers32;
+         registersint:=left.registersint;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
 {$endif SUPPORT_MMX}
@@ -781,8 +800,8 @@ implementation
              if (expectloc in [LOC_REFERENCE,LOC_CREFERENCE,LOC_CREGISTER]) then
               begin
                 expectloc:=LOC_REGISTER;
-                if (registers32<1) then
-                 registers32:=1;
+                if (registersint<1) then
+                 registersint:=1;
               end;
             { before loading it into flags we need to load it into
               a register thus 1 register is need PM }
@@ -802,22 +821,25 @@ implementation
              end
          else
 {$endif SUPPORT_MMX}
+{$ifndef cpu64bit}
            if is_64bit(left.resulttype.def) then
              begin
                 if (expectloc in [LOC_REFERENCE,LOC_CREFERENCE,LOC_CREGISTER]) then
                  begin
                    expectloc:=LOC_REGISTER;
-                   if (registers32<2) then
-                    registers32:=2;
+                   if (registersint<2) then
+                    registersint:=2;
                  end;
              end
-         else if is_integer(left.resulttype.def) then
-           begin
-              if (left.expectloc<>LOC_REGISTER) and
-                 (registers32<1) then
-                registers32:=1;
-              expectloc:=LOC_REGISTER;
-           end
+         else
+{$endif cpu64bit}
+           if is_integer(left.resulttype.def) then
+             begin
+               if (left.expectloc<>LOC_REGISTER) and
+                  (registersint<1) then
+                 registersint:=1;
+               expectloc:=LOC_REGISTER;
+             end;
       end;
 
 {$ifdef state_tracking}
@@ -841,7 +863,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.55  2004-01-23 15:12:49  florian
+  Revision 1.56  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.55  2004/01/23 15:12:49  florian
     * fixed generic shl/shr operations
     + added register allocation hook calls for arm specific operand types:
       register set and shifter op

compiler/nmem.pas

@@ -169,10 +169,10 @@ implementation
          if left.nodetype<>typen then
            begin
              firstpass(left);
-             registers32:=left.registers32;
+             registersint:=left.registersint;
            end;
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
       end;
 
 
@@ -240,7 +240,7 @@ implementation
       begin
         result:=nil;
         expectloc:=LOC_REGISTER;
-        registers32:=1;
+        registersint:=1;
       end;
 
 
@@ -467,13 +467,13 @@ implementation
          make_not_regable(left);
          if nf_procvarload in flags then
           begin
-            registers32:=left.registers32;
+            registersint:=left.registersint;
             registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
             registersmmx:=left.registersmmx;
 {$endif SUPPORT_MMX}
-            if registers32<1 then
-             registers32:=1;
+            if registersint<1 then
+             registersint:=1;
             expectloc:=left.expectloc;
             exit;
           end;
@@ -485,13 +485,13 @@ implementation
              CGMessage(cg_e_illegal_expression);
            end;
 
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
 {$endif SUPPORT_MMX}
-         if registers32<1 then
-           registers32:=1;
+         if registersint<1 then
+           registersint:=1;
          { is this right for object of methods ?? }
          expectloc:=LOC_REGISTER;
       end;
@@ -535,7 +535,7 @@ implementation
          if codegenerror then
           exit;
 
-         registers32:=max(left.registers32,1);
+         registersint:=max(left.registersint,1);
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -617,7 +617,7 @@ implementation
          if codegenerror then
           exit;
 
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -625,8 +625,8 @@ implementation
          { classes must be dereferenced implicit }
          if is_class_or_interface(left.resulttype.def) then
            begin
-              if registers32=0 then
-                registers32:=1;
+              if registersint=0 then
+                registersint:=1;
               expectloc:=LOC_REFERENCE;
            end
          else
@@ -683,7 +683,7 @@ implementation
             not(is_char(right.resulttype.def)) and
             not(is_boolean(right.resulttype.def)) then
            begin
-             inserttypeconv(right,s32bittype);
+             inserttypeconv(right,s32inttype);
            end;
 
          case left.resulttype.def.deftype of
@@ -782,48 +782,48 @@ implementation
                   end;
                end;
 {$endif}
-              registers32:=left.registers32;
+              registersint:=left.registersint;
 
               { for ansi/wide strings, we need at least one register }
               if is_ansistring(left.resulttype.def) or
                 is_widestring(left.resulttype.def) or
               { ... as well as for dynamic arrays }
                 is_dynamic_array(left.resulttype.def) then
-                registers32:=max(registers32,1);
+                registersint:=max(registersint,1);
            end
          else
            begin
               { this rules are suboptimal, but they should give }
               { good results                                }
-              registers32:=max(left.registers32,right.registers32);
+              registersint:=max(left.registersint,right.registersint);
 
               { for ansi/wide strings, we need at least one register }
               if is_ansistring(left.resulttype.def) or
                 is_widestring(left.resulttype.def) or
               { ... as well as for dynamic arrays }
                 is_dynamic_array(left.resulttype.def) then
-                registers32:=max(registers32,1);
+                registersint:=max(registersint,1);
 
               { need we an extra register when doing the restore ? }
-              if (left.registers32<=right.registers32) and
+              if (left.registersint<=right.registersint) and
               { only if the node needs less than 3 registers }
               { two for the right node and one for the       }
               { left address                             }
-                (registers32<3) then
-                inc(registers32);
+                (registersint<3) then
+                inc(registersint);
 
               { need we an extra register for the index ? }
               if (right.expectloc<>LOC_REGISTER)
               { only if the right node doesn't need a register }
-                and (right.registers32<1) then
-                inc(registers32);
+                and (right.registersint<1) then
+                inc(registersint);
 
               { not correct, but what works better ?
-              if left.registers32>0 then
-                registers32:=max(registers32,2)
+              if left.registersint>0 then
+                registersint:=max(registersint,2)
               else
                  min. one register
-                registers32:=max(registers32,1);
+                registersint:=max(registersint,1);
               }
            end;
          registersfpu:=max(left.registersfpu,right.registersfpu);
@@ -930,7 +930,7 @@ implementation
         if assigned(left) then
          begin
            firstpass(left);
-           registers32:=left.registers32;
+           registersint:=left.registersint;
            registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
            registersmmx:=left.registersmmx;
@@ -939,10 +939,10 @@ implementation
         if assigned(withrefnode) then
           begin
             firstpass(withrefnode);
-            if withrefnode.registers32 > registers32 then
-              registers32:=withrefnode.registers32;
+            if withrefnode.registersint > registersint then
+              registersint:=withrefnode.registersint;
             if withrefnode.registersfpu > registersfpu then
-              registers32:=withrefnode.registersfpu;
+              registersint:=withrefnode.registersfpu;
 {$ifdef SUPPORT_MMX}
             if withrefnode.registersmmx > registersmmx then
               registersmmx:=withrefnode.registersmmx;
@@ -970,7 +970,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.78  2004-01-31 17:45:17  peter
+  Revision 1.79  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.78  2004/01/31 17:45:17  peter
     * Change several $ifdef i386 to x86
     * Change several OS_32 to OS_INT/OS_ADDR
 

compiler/node.pas

@@ -274,7 +274,7 @@ interface
           flags : tnodeflags;
           ppuidx : longint;
           { the number of registers needed to evalute the node }
-          registers32,registersfpu,registersmm : longint;  { must be longint !!!! }
+          registersint,registersfpu,registersmm : longint;  { must be longint !!!! }
 {$ifdef SUPPORT_MMX}
           registersmmx : longint;
 {$endif SUPPORT_MMX}
@@ -576,7 +576,7 @@ implementation
          fileinfo:=aktfilepos;
          localswitches:=aktlocalswitches;
          resulttype.reset;
-         registers32:=0;
+         registersint:=0;
          registersfpu:=0;
 {$ifdef SUPPORT_MMX}
          registersmmx:=0;
@@ -608,7 +608,7 @@ implementation
         expectloc:=LOC_INVALID;
         { updated by secondpass }
         location.loc:=LOC_INVALID;
-        registers32:=0;
+        registersint:=0;
         registersfpu:=0;
 {$ifdef SUPPORT_MMX}
         registersmmx:=0;
@@ -695,7 +695,7 @@ implementation
         writeln(t,', pos = (',fileinfo.line,',',fileinfo.column,')',
                   ', loc = ',tcgloc2str[location.loc],
                   ', expectloc = ',tcgloc2str[expectloc],
-                  ', intregs = ',registers32,
+                  ', intregs = ',registersint,
                   ', fpuregs = ',registersfpu);
       end;
 
@@ -754,7 +754,7 @@ implementation
          p.location:=location;
          p.parent:=parent;
          p.flags:=flags;
-         p.registers32:=registers32;
+         p.registersint:=registersint;
          p.registersfpu:=registersfpu;
 {$ifdef SUPPORT_MMX}
          p.registersmmx:=registersmmx;
@@ -880,7 +880,7 @@ implementation
 
     procedure tunarynode.left_max;
       begin
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -1022,7 +1022,7 @@ implementation
          begin
            if assigned(right) then
             begin
-              registers32:=max(left.registers32,right.registers32);
+              registersint:=max(left.registersint,right.registersint);
               registersfpu:=max(left.registersfpu,right.registersfpu);
 {$ifdef SUPPORT_MMX}
               registersmmx:=max(left.registersmmx,right.registersmmx);
@@ -1030,7 +1030,7 @@ implementation
             end
            else
             begin
-              registers32:=left.registers32;
+              registersint:=left.registersint;
               registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
               registersmmx:=left.registersmmx;
@@ -1087,7 +1087,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.80  2004-01-26 16:12:28  daniel
+  Revision 1.81  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.80  2004/01/26 16:12:28  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/nset.pas

@@ -311,16 +311,16 @@ implementation
 
          if tsetdef(right.resulttype.def).settype<>smallset then
            begin
-             if registers32 < 3 then
-               registers32 := 3;
+             if registersint < 3 then
+               registersint := 3;
            end
          else
            begin
               { a smallset needs maybe an misc. register }
               if (left.nodetype<>ordconstn) and
                 not(right.expectloc in [LOC_CREGISTER,LOC_REGISTER]) and
-                (right.registers32<1) then
-                inc(registers32);
+                (right.registersint<1) then
+                inc(registersint);
            end;
       end;
 
@@ -583,7 +583,7 @@ implementation
          set_varstate(left,vs_used,true);
          if codegenerror then
            exit;
-         registers32:=left.registers32;
+         registersint:=left.registersint;
          registersfpu:=left.registersfpu;
 {$ifdef SUPPORT_MMX}
          registersmmx:=left.registersmmx;
@@ -606,8 +606,8 @@ implementation
               firstpass(hp.left);
 
               { searchs max registers }
-              if hp.left.registers32>registers32 then
-                registers32:=hp.left.registers32;
+              if hp.left.registersint>registersint then
+                registersint:=hp.left.registersint;
               if hp.left.registersfpu>registersfpu then
                 registersfpu:=hp.left.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -624,8 +624,8 @@ implementation
               firstpass(elseblock);
               if codegenerror then
                 exit;
-              if registers32<elseblock.registers32 then
-                registers32:=elseblock.registers32;
+              if registersint<elseblock.registersint then
+                registersint:=elseblock.registersint;
               if registersfpu<elseblock.registersfpu then
                 registersfpu:=elseblock.registersfpu;
 {$ifdef SUPPORT_MMX}
@@ -638,7 +638,7 @@ implementation
          { there is one register required for the case expression    }
          { for 64 bit ints we cheat: the high dword is stored in EDI }
          { so we don't need an extra register                        }
-         if registers32<1 then registers32:=1;
+         if registersint<1 then registersint:=1;
       end;
 
 
@@ -694,7 +694,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.51  2004-01-26 16:12:28  daniel
+  Revision 1.52  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.51  2004/01/26 16:12:28  daniel
     * reginfo now also only allocated during register allocation
     * third round of gdb cleanups: kick out most of concatstabto
 

compiler/nutils.pas

@@ -196,7 +196,7 @@ implementation
               { parameter 2 : pointer to vmt }
               { parameter 1 : self pointer }
               para:=ccallparanode.create(
-                        cordconstnode.create(current_procinfo.procdef._class.vmt_offset,s32bittype,false),
+                        cordconstnode.create(current_procinfo.procdef._class.vmt_offset,s32inttype,false),
                     ccallparanode.create(
                         ctypeconvnode.create_explicit(
                             load_vmt_pointer_node,
@@ -254,7 +254,12 @@ end.
 
 {
   $Log$
-  Revision 1.8  2003-11-10 22:02:52  peter
+  Revision 1.9  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.8  2003/11/10 22:02:52  peter
     * cross unit inlining fixed
 
   Revision 1.7  2003/10/01 20:34:49  peter

compiler/pdecsub.pas

@@ -289,14 +289,14 @@ implementation
             begin
               if assigned(currpara.parasym) then
                begin
-                 hvs:=tvarsym.create('$high'+tvarsym(currpara.parasym).name,vs_const,s32bittype);
+                 hvs:=tvarsym.create('$high'+tvarsym(currpara.parasym).name,vs_const,s32inttype);
                  include(hvs.varoptions,vo_is_high_value);
                  tvarsym(currpara.parasym).owner.insert(hvs);
                  tvarsym(currpara.parasym).highvarsym:=hvs;
                end
               else
                hvs:=nil;
-              pd.concatpara(currpara,s32bittype,hvs,nil,true);
+              pd.concatpara(currpara,s32inttype,hvs,nil,true);
             end
            else
             begin
@@ -413,7 +413,7 @@ implementation
                 consume(_ARRAY);
                 consume(_OF);
                 { define range and type of range }
-                tt.setdef(tarraydef.create(0,-1,s32bittype));
+                tt.setdef(tarraydef.create(0,-1,s32inttype));
                 { array of const ? }
                 if (token=_CONST) and (m_objpas in aktmodeswitches) then
                  begin
@@ -2149,7 +2149,12 @@ const
 end.
 {
   $Log$
-  Revision 1.157  2004-01-31 17:45:17  peter
+  Revision 1.158  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.157  2004/01/31 17:45:17  peter
     * Change several $ifdef i386 to x86
     * Change several OS_32 to OS_INT/OS_ADDR
 

compiler/pdecvar.pas

@@ -276,7 +276,7 @@ implementation
                           consume(_ARRAY);
                           consume(_OF);
                           { define range and type of range }
-                          tt.setdef(tarraydef.create(0,-1,s32bittype));
+                          tt.setdef(tarraydef.create(0,-1,s32inttype));
                           { define field type }
                           single_type(arraytype,s,false);
                           tarraydef(tt.def).setelementtype(arraytype);
@@ -1135,7 +1135,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.63  2004-01-31 17:45:17  peter
+  Revision 1.64  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.63  2004/01/31 17:45:17  peter
     * Change several $ifdef i386 to x86
     * Change several OS_32 to OS_INT/OS_ADDR
 

compiler/pexpr.pas

@@ -185,7 +185,7 @@ implementation
              sl_typeconv :
                p1:=ctypeconvnode.create_explicit(p1,plist^.tt);
              sl_vec :
-               p1:=cvecnode.create(p1,cordconstnode.create(plist^.value,s32bittype,true));
+               p1:=cvecnode.create(p1,cordconstnode.create(plist^.value,s32inttype,true));
              else
                internalerror(200110205);
            end;
@@ -446,7 +446,7 @@ implementation
                statement_syssym:=geninlinenode(in_sizeof_x,false,p1)
               else
                begin
-                 statement_syssym:=cordconstnode.create(p1.resulttype.def.size,s32bittype,true);
+                 statement_syssym:=cordconstnode.create(p1.resulttype.def.size,s32inttype,true);
                  { p1 not needed !}
                  p1.destroy;
                end;
@@ -542,7 +542,7 @@ implementation
               p1:=caddrnode.create(p1);
               do_resulttypepass(p1);
               { Ofs() returns a cardinal, not a pointer }
-              p1.resulttype:=u32bittype;
+              p1.resulttype:=u32inttype;
               consume(_RKLAMMER);
               statement_syssym:=p1;
             end;
@@ -1397,12 +1397,12 @@ implementation
                           { do a very dirty trick to bootstrap this code }
                           if (tconstsym(srsym).value.valueord>=-(int64(2147483647)+int64(1))) and
                              (tconstsym(srsym).value.valueord<=2147483647) then
-                           p1:=cordconstnode.create(tconstsym(srsym).value.valueord,s32bittype,true)
+                           p1:=cordconstnode.create(tconstsym(srsym).value.valueord,s32inttype,true)
                           else if (tconstsym(srsym).value.valueord > maxlongint) and
                                   (tconstsym(srsym).value.valueord <= int64(maxlongint)+int64(maxlongint)+1) then
-                           p1:=cordconstnode.create(tconstsym(srsym).value.valueord,u32bittype,true)
+                           p1:=cordconstnode.create(tconstsym(srsym).value.valueord,u32inttype,true)
                           else
-                           p1:=cordconstnode.create(tconstsym(srsym).value.valueord,cs64bittype,true);
+                           p1:=cordconstnode.create(tconstsym(srsym).value.valueord,s64inttype,true);
                         end;
                       conststring :
                         begin
@@ -1684,7 +1684,7 @@ implementation
                                     if (token=_COLON) then
                                      begin
                                        consume(_COLON);
-                                       p3:=caddnode.create(muln,cordconstnode.create($10,s32bittype,false),p2);
+                                       p3:=caddnode.create(muln,cordconstnode.create($10,s32inttype,false),p2);
                                        p2:=comp_expr(true);
                                        p2:=caddnode.create(addn,p2,p3);
                                        p1:=cvecnode.create(p1,p2);
@@ -2028,7 +2028,7 @@ implementation
                                 Message(cg_e_invalid_integer);
                                 consume(_INTCONST);
                                 l:=1;
-                                p1:=cordconstnode.create(l,s32bittype,true);
+                                p1:=cordconstnode.create(l,s32inttype,true);
                              end
                             else
                              begin
@@ -2039,13 +2039,13 @@ implementation
                        else
                          begin
                             consume(_INTCONST);
-                            p1:=cordconstnode.create(ic,cs64bittype,true);
+                            p1:=cordconstnode.create(ic,s64inttype,true);
                          end
                      end
                    else
                      begin
                        consume(_INTCONST);
-                       p1:=cordconstnode.create(l,defaultordconsttype,true)
+                       p1:=cordconstnode.create(l,sinttype,true)
                      end
                  end
                else
@@ -2055,9 +2055,9 @@ implementation
                    { (longint is easier to perform calculations with) (JM)      }
                    if card <= $7fffffff then
                      { no sign extension necessary, so not longint typecast (JM) }
-                     p1:=cordconstnode.create(card,s32bittype,true)
+                     p1:=cordconstnode.create(card,s32inttype,true)
                    else
-                     p1:=cordconstnode.create(card,u32bittype,true)
+                     p1:=cordconstnode.create(card,u32inttype,true)
                 end;
              end;
 
@@ -2525,7 +2525,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.145  2003-12-29 17:19:35  jonas
+  Revision 1.146  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.145  2003/12/29 17:19:35  jonas
     * integrated hack from 1.0.x so we can parse low(int64) as int64 instead
       of as double (in 1.0.x, it was necessary for low(longint))
 

compiler/pinline.pas

@@ -245,7 +245,7 @@ implementation
 
                      { create call to fpc_getmem }
                      para := ccallparanode.create(cordconstnode.create
-                         (tpointerdef(p.resulttype.def).pointertype.def.size,s32bittype,true),nil);
+                         (tpointerdef(p.resulttype.def).pointertype.def.size,s32inttype,true),nil);
                      addstatement(newstatement,cassignmentnode.create(
                          ctemprefnode.create(temp),
                          ccallnode.createintern('fpc_getmem',para)));
@@ -326,7 +326,7 @@ implementation
 
             { create call to fpc_getmem }
             para := ccallparanode.create(cordconstnode.create
-                (tpointerdef(p1.resulttype.def).pointertype.def.size,s32bittype,true),nil);
+                (tpointerdef(p1.resulttype.def).pointertype.def.size,s32inttype,true),nil);
             addstatement(newstatement,cassignmentnode.create(
                 ctemprefnode.create(temp),
                 ccallnode.createintern('fpc_getmem',para)));
@@ -426,7 +426,7 @@ implementation
            while assigned(ppn.right) do
             begin
               set_varstate(ppn.left,vs_used,true);
-              inserttypeconv(ppn.left,s32bittype);
+              inserttypeconv(ppn.left,s32inttype);
               inc(dims);
               ppn:=tcallparanode(ppn.right);
             end;
@@ -483,7 +483,7 @@ implementation
             newblock:=internalstatements(newstatement);
 
             { get temp for array of lengths }
-            temp := ctempcreatenode.create(s32bittype,dims*s32bittype.def.size,tt_persistent);
+            temp := ctempcreatenode.create(s32inttype,dims*s32inttype.def.size,tt_persistent);
             addstatement(newstatement,temp);
 
             { load array of lengths }
@@ -492,7 +492,7 @@ implementation
             while assigned(ppn.right) do
              begin
                addstatement(newstatement,cassignmentnode.create(
-                   ctemprefnode.create_offset(temp,counter*s32bittype.def.size),
+                   ctemprefnode.create_offset(temp,counter*s32inttype.def.size),
                    ppn.left));
                ppn.left:=nil;
                inc(counter);
@@ -505,7 +505,7 @@ implementation
             npara:=ccallparanode.create(caddrnode.create
                       (ctemprefnode.create(temp)),
                    ccallparanode.create(cordconstnode.create
-                      (counter,s32bittype,true),
+                      (counter,s32inttype,true),
                    ccallparanode.create(caddrnode.create
                       (crttinode.create(tstoreddef(destppn.resulttype.def),initrtti)),
                    ccallparanode.create(ctypeconvnode.create_explicit(destppn,voidpointertype),nil))));
@@ -599,9 +599,9 @@ implementation
             end;
            { create call to fpc_finalize_array }
            npara:=ccallparanode.create(cordconstnode.create
-                     (destppn.left.resulttype.def.size,s32bittype,true),
+                     (destppn.left.resulttype.def.size,s32inttype,true),
                   ccallparanode.create(ctypeconvnode.create
-                     (ppn.left,s32bittype),
+                     (ppn.left,s32inttype),
                   ccallparanode.create(caddrnode.create
                      (crttinode.create(tstoreddef(destppn.left.resulttype.def),initrtti)),
                   ccallparanode.create(caddrnode.create
@@ -691,8 +691,8 @@ implementation
             else
              begin
                { use special -1,-1 argument to copy the whole array }
-               highppn:=cordconstnode.create(-1,s32bittype,false);
-               lowppn:=cordconstnode.create(-1,s32bittype,false);
+               highppn:=cordconstnode.create(-1,s32inttype,false);
+               lowppn:=cordconstnode.create(-1,s32inttype,false);
              end;
 
             { create temp for result, we've to use a temp because a dynarray
@@ -734,7 +734,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.27  2004-02-03 16:46:51  jonas
+  Revision 1.28  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.27  2004/02/03 16:46:51  jonas
     + support to store ttempcreate/ref/deletenodes in registers
     * put temps for withnodes and some newnodes in registers
      Note: this currently only works because calling ungetregister()

compiler/powerpc/nppccnv.pas

@@ -82,7 +82,7 @@ implementation
             { hack to avoid double division by 10000, as it's       }
             { already done by resulttypepass.resulttype_int_to_real }
             if is_currency(left.resulttype.def) then
-              left.resulttype := cs64bittype;
+              left.resulttype := s64inttype;
             if is_signed(left.resulttype.def) then
               fname := 'fpc_int64_to_double'
             else
@@ -97,9 +97,9 @@ implementation
           { other integers are supposed to be 32 bit }
           begin
             if is_signed(left.resulttype.def) then
-              inserttypeconv(left,s32bittype)
+              inserttypeconv(left,s32inttype)
             else
-              inserttypeconv(left,u32bittype);
+              inserttypeconv(left,u32inttype);
             firstpass(left);
           end;
         result := nil;
@@ -370,7 +370,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.49  2003-12-31 22:30:39  jonas
+  Revision 1.50  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.49  2003/12/31 22:30:39  jonas
     * fixed currency bugs. Int64 currency handling still needs to be
       rewritten so that it doesn't include conversions to real anymore
       though

compiler/powerpc/nppcinl.pas

@@ -63,7 +63,7 @@ implementation
      function tppcinlinenode.first_abs_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -74,7 +74,7 @@ implementation
      function tppcinlinenode.first_sqr_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
 {$ifdef SUPPORT_MMX}
         registersmmx:=left.registersmmx;
@@ -150,7 +150,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.12  2004-02-02 21:22:19  jonas
+  Revision 1.13  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.12  2004/02/02 21:22:19  jonas
     + implemented second_prefetch
 
   Revision 1.11  2003/10/17 01:22:08  florian

compiler/pstatmnt.pas

@@ -188,7 +188,7 @@ implementation
             CGMessage(type_e_ordinal_expr_expected);
             { create a correct tree }
             caseexpr.free;
-            caseexpr:=cordconstnode.create(0,u32bittype,false);
+            caseexpr:=cordconstnode.create(0,u32inttype,false);
             { set error flag so no rangechecks are done }
             casedeferror:=true;
           end;
@@ -1092,7 +1092,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.128  2004-02-03 19:47:45  jonas
+  Revision 1.129  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.128  2004/02/03 19:47:45  jonas
     * don't put the temp of a withnode in a register if debugging info is on,
       because then our stabs generation internalerror's
 

compiler/psub.pas

@@ -305,7 +305,7 @@ implementation
                         that memory was allocated }
                       { parameter 1 : self pointer }
                       para:=ccallparanode.create(
-                                cordconstnode.create(current_procinfo.procdef._class.vmt_offset,s32bittype,false),
+                                cordconstnode.create(current_procinfo.procdef._class.vmt_offset,s32inttype,false),
                             ccallparanode.create(
                                 ctypeconvnode.create_explicit(
                                     load_vmt_pointer_node,
@@ -428,7 +428,7 @@ implementation
                       { parameter 2 : pointer to vmt }
                       { parameter 1 : self pointer }
                       para:=ccallparanode.create(
-                                cordconstnode.create(current_procinfo.procdef._class.vmt_offset,s32bittype,false),
+                                cordconstnode.create(current_procinfo.procdef._class.vmt_offset,s32inttype,false),
                             ccallparanode.create(
                                 ctypeconvnode.create_explicit(
                                     load_vmt_pointer_node,
@@ -1342,7 +1342,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.182  2004-01-21 19:01:03  florian
+  Revision 1.183  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.182  2004/01/21 19:01:03  florian
     * fixed handling of max. distance of pc relative symbols
 
   Revision 1.181  2003/12/21 19:42:43  florian

compiler/psystem.pas

@@ -163,21 +163,21 @@ implementation
         addtype('Char',cchartype);
         addtype('WideChar',cwidechartype);
         adddef('Text',tfiledef.createtext);
-        addtype('Longword',u32bittype);
-        addtype('QWord',cu64bittype);
-        addtype('Int64',cs64bittype);
+        addtype('Longword',u32inttype);
+        addtype('QWord',u64inttype);
+        addtype('Int64',s64inttype);
         adddef('TypedFile',tfiledef.createtyped(voidtype));
         addtype('Variant',cvarianttype);
         addtype('OleVariant',colevarianttype);
         { Internal types }
         addtype('$formal',cformaltype);
         addtype('$void',voidtype);
-        addtype('$byte',u8bittype);
-        addtype('$word',u16bittype);
-        addtype('$ulong',u32bittype);
-        addtype('$longint',s32bittype);
-        addtype('$qword',cu64bittype);
-        addtype('$int64',cs64bittype);
+        addtype('$byte',u8inttype);
+        addtype('$word',u16inttype);
+        addtype('$ulong',u32inttype);
+        addtype('$longint',s32inttype);
+        addtype('$qword',u64inttype);
+        addtype('$int64',s64inttype);
         addtype('$char',cchartype);
         addtype('$widechar',cwidechartype);
         addtype('$shortstring',cshortstringtype);
@@ -202,14 +202,14 @@ implementation
         vmttype.setdef(trecorddef.create(hrecst));
         pvmttype.setdef(tpointerdef.create(vmttype));
         hrecst.insertfield(tvarsym.create('$parent',vs_value,pvmttype),true);
-        hrecst.insertfield(tvarsym.create('$length',vs_value,s32bittype),true);
-        hrecst.insertfield(tvarsym.create('$mlength',vs_value,s32bittype),true);
-        vmtarraytype.setdef(tarraydef.create(0,1,s32bittype));
+        hrecst.insertfield(tvarsym.create('$length',vs_value,s32inttype),true);
+        hrecst.insertfield(tvarsym.create('$mlength',vs_value,s32inttype),true);
+        vmtarraytype.setdef(tarraydef.create(0,1,s32inttype));
         tarraydef(vmtarraytype.def).setelementtype(voidpointertype);
         hrecst.insertfield(tvarsym.create('$__pfn',vs_value,vmtarraytype),true);
         addtype('$__vtbl_ptr_type',vmttype);
         addtype('$pvmt',pvmttype);
-        vmtarraytype.setdef(tarraydef.create(0,1,s32bittype));
+        vmtarraytype.setdef(tarraydef.create(0,1,s32inttype));
         tarraydef(vmtarraytype.def).setelementtype(pvmttype);
         addtype('$vtblarray',vmtarraytype);
         { Add a type for methodpointers }
@@ -228,12 +228,12 @@ implementation
         Load all default definitions for consts from the system unit
       }
       begin
-        globaldef('byte',u8bittype);
-        globaldef('word',u16bittype);
-        globaldef('ulong',u32bittype);
-        globaldef('longint',s32bittype);
-        globaldef('qword',cu64bittype);
-        globaldef('int64',cs64bittype);
+        globaldef('byte',u8inttype);
+        globaldef('word',u16inttype);
+        globaldef('ulong',u32inttype);
+        globaldef('longint',s32inttype);
+        globaldef('qword',u64inttype);
+        globaldef('int64',s64inttype);
         globaldef('formal',cformaltype);
         globaldef('void',voidtype);
         globaldef('char',cchartype);
@@ -257,34 +257,14 @@ implementation
         globaldef('variant',cvarianttype);
         globaldef('olevariant',colevarianttype);
         globaldef('methodpointer',methodpointertype);
-{$ifdef i386}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
-{$endif i386}
-{$ifdef x86_64}
-        ordpointertype:=cu64bittype;
-        defaultordconsttype:=cs64bittype;
-{$endif x86_64}
-{$ifdef powerpc}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
-{$endif powerpc}
-{$ifdef sparc}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
-{$endif sparc}
-{$ifdef m68k}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
-{$endif}
-{$ifdef arm}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
-{$endif arm}
 {$ifdef cpu64bit}
-        inttype:=cs64bittype;
+        uinttype:=u64inttype;
+        sinttype:=s64inttype;
+        ptrinttype:=u64inttype;
 {$else cpu64bit}
-        inttype:=s32bittype;
+        uinttype:=u32inttype;
+        sinttype:=s32inttype;
+        ptrinttype:=u32inttype;
 {$endif cpu64bit}
       end;
 
@@ -301,12 +281,12 @@ implementation
         registerdef:=false;
         cformaltype.setdef(tformaldef.create);
         voidtype.setdef(torddef.create(uvoid,0,0));
-        u8bittype.setdef(torddef.create(u8bit,0,255));
-        u16bittype.setdef(torddef.create(u16bit,0,65535));
-        u32bittype.setdef(torddef.create(u32bit,0,high(longword)));
-        s32bittype.setdef(torddef.create(s32bit,low(longint),high(longint)));
-        cu64bittype.setdef(torddef.create(u64bit,low(qword),TConstExprInt(high(qword))));
-        cs64bittype.setdef(torddef.create(s64bit,low(int64),high(int64)));
+        u8inttype.setdef(torddef.create(u8bit,0,255));
+        u16inttype.setdef(torddef.create(u16bit,0,65535));
+        u32inttype.setdef(torddef.create(u32bit,0,high(longword)));
+        s32inttype.setdef(torddef.create(s32bit,low(longint),high(longint)));
+        u64inttype.setdef(torddef.create(u64bit,low(qword),TConstExprInt(high(qword))));
+        s64inttype.setdef(torddef.create(s64bit,low(int64),high(int64)));
         booltype.setdef(torddef.create(bool8bit,0,1));
         cchartype.setdef(torddef.create(uchar,0,255));
         cwidechartype.setdef(torddef.create(uwidechar,0,65535));
@@ -317,60 +297,47 @@ implementation
         cwidestringtype.setdef(tstringdef.createwide(-1));
         { length=0 for shortstring is open string (needed for readln(string) }
         openshortstringtype.setdef(tstringdef.createshort(0));
-        openchararraytype.setdef(tarraydef.create(0,-1,s32bittype));
+        openchararraytype.setdef(tarraydef.create(0,-1,s32inttype));
         tarraydef(openchararraytype.def).setelementtype(cchartype);
 {$ifdef x86}
-  {$ifdef i386}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
-  {$endif i386}
-  {$ifdef x86_64}
-        ordpointertype:=cu64bittype;
-        defaultordconsttype:=cs64bittype;
-  {$endif x86_64}
         s32floattype.setdef(tfloatdef.create(s32real));
         s64floattype.setdef(tfloatdef.create(s64real));
         s80floattype.setdef(tfloatdef.create(s80real));
         s64currencytype.setdef(tfloatdef.create(s64currency));
 {$endif x86}
 {$ifdef powerpc}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
         s32floattype.setdef(tfloatdef.create(s32real));
         s64floattype.setdef(tfloatdef.create(s64real));
         s80floattype.setdef(tfloatdef.create(s80real));
         s64currencytype.setdef(torddef.create(scurrency,low(int64),high(int64)));
 {$endif powerpc}
 {$ifdef sparc}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
         s32floattype.setdef(tfloatdef.create(s32real));
         s64floattype.setdef(tfloatdef.create(s64real));
         s80floattype.setdef(tfloatdef.create(s80real));
         s64currencytype.setdef(torddef.create(scurrency,low(int64),high(int64)));
 {$endif sparc}
 {$ifdef m68k}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
         s32floattype.setdef(tfloatdef.create(s32real));
         s64floattype.setdef(tfloatdef.create(s64real));
         s80floattype.setdef(tfloatdef.create(s80real));
         s64currencytype.setdef(torddef.create(scurrency,low(int64),high(int64)));
 {$endif}
 {$ifdef arm}
-        ordpointertype:=u32bittype;
-        defaultordconsttype:=s32bittype;
         s32floattype.setdef(tfloatdef.create(s32real));
         s64floattype.setdef(tfloatdef.create(s64real));
         s80floattype.setdef(tfloatdef.create(s80real));
         s64currencytype.setdef(torddef.create(scurrency,low(int64),high(int64)));
 {$endif arm}
 {$ifdef cpu64bit}
-        inttype:=cs64bittype;
+        uinttype:=u64inttype;
+        sinttype:=s64inttype;
+        ptrinttype:=u64inttype;
 {$else cpu64bit}
-        inttype:=s32bittype;
+        uinttype:=u32inttype;
+        sinttype:=s32inttype;
+        ptrinttype:=u32inttype;
 {$endif cpu64bit}
-
         { some other definitions }
         voidpointertype.setdef(tpointerdef.create(voidtype));
         charpointertype.setdef(tpointerdef.create(cchartype));
@@ -521,7 +488,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.60  2004-01-28 22:16:31  peter
+  Revision 1.61  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.60  2004/01/28 22:16:31  peter
     * more record alignment fixes
 
   Revision 1.59  2004/01/20 12:59:37  florian

compiler/ptype.pas

@@ -443,7 +443,7 @@ implementation
              end
            else
              begin
-                ap:=tarraydef.create(0,-1,s32bittype);
+                ap:=tarraydef.create(0,-1,s32inttype);
                 ap.IsDynamicArray:=true;
                 tt.setdef(ap);
              end;
@@ -498,7 +498,7 @@ implementation
                              equal_defs(p.resulttype.def,aktenumdef) then
                            v:=tordconstnode(p).value
                           else
-                           IncompatibleTypes(p.resulttype.def,s32bittype.def);
+                           IncompatibleTypes(p.resulttype.def,s32inttype.def);
                         end
                        else
                         Message(cg_e_illegal_expression);
@@ -643,7 +643,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.63  2004-01-29 16:51:29  peter
+  Revision 1.64  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.63  2004/01/29 16:51:29  peter
     * fixed alignment calculation for variant records
     * fixed alignment padding of records
 

compiler/regvars.pas

@@ -169,7 +169,7 @@ implementation
           new(regvarinfo);
           fillchar(regvarinfo^,sizeof(regvarinfo^),0);
           current_procinfo.procdef.regvarinfo := regvarinfo;
-          if (p.registers32<maxvarregs) then
+          if (p.registersint<maxvarregs) then
             begin
               parasym:=false;
               symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
@@ -177,13 +177,13 @@ implementation
               parasym:=true;
               symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
               { hold needed registers free }
-              for i:=maxvarregs downto maxvarregs-p.registers32+1-maxintscratchregs do
+              for i:=maxvarregs downto maxvarregs-p.registersint+1-maxintscratchregs do
                 begin
                   regvarinfo^.regvars[i]:=nil;
                   regvarinfo^.regvars_para[i] := false;
                 end;
               { now assign register }
-              for i:=1 to maxvarregs-p.registers32-maxintscratchregs do
+              for i:=1 to maxvarregs-p.registersint-maxintscratchregs do
                 begin
                   if assigned(regvarinfo^.regvars[i]) and
                     { currently we assume we can use volatile registers for all }
@@ -640,7 +640,12 @@ end.
 
 {
   $Log$
-  Revision 1.71  2003-10-17 14:38:32  peter
+  Revision 1.72  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.71  2003/10/17 14:38:32  peter
     * 64k registers supported
     * fixed some memory leaks
 

compiler/sparc/ncpucnv.pas

@@ -90,9 +90,9 @@ implementation
           { other integers are supposed to be 32 bit }
           begin
             if is_signed(left.resulttype.def) then
-              inserttypeconv(left,s32bittype)
+              inserttypeconv(left,s32inttype)
             else
-              inserttypeconv(left,u32bittype);
+              inserttypeconv(left,u32inttype);
             firstpass(left);
           end;
         result := nil;
@@ -219,7 +219,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.22  2004-01-12 22:11:39  peter
+  Revision 1.23  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.22  2004/01/12 22:11:39  peter
     * use localalign info for alignment for locals and temps
     * sparc fpu flags branching added
     * moved powerpc copy_valye_openarray to generic

compiler/sparc/ncpuinln.pas

@@ -74,7 +74,7 @@ implementation
     function tSparcInlineNode.first_abs_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         first_abs_real := nil;
       end;
@@ -83,7 +83,7 @@ implementation
     function tSparcInlineNode.first_sqr_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         first_sqr_real:=nil;
       end;
@@ -92,7 +92,7 @@ implementation
     function tSparcInlineNode.first_sqrt_real : tnode;
       begin
         expectloc:=LOC_FPUREGISTER;
-        registers32:=left.registers32;
+        registersint:=left.registersint;
         registersfpu:=max(left.registersfpu,1);
         first_sqrt_real := nil;
       end;
@@ -123,7 +123,12 @@ begin
 end.
 {
   $Log$
-  Revision 1.7  2003-10-24 11:32:34  mazen
+  Revision 1.8  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.7  2003/10/24 11:32:34  mazen
   *fixes related to removal of rg
 
   Revision 1.6  2003/10/01 20:34:50  peter

compiler/symdef.pas

@@ -700,12 +700,12 @@ interface
        cchartype,                 { Pointer to Char }
        cwidechartype,             { Pointer to WideChar }
        booltype,                  { pointer to boolean type }
-       u8bittype,                 { Pointer to 8-Bit unsigned }
-       u16bittype,                { Pointer to 16-Bit unsigned }
-       u32bittype,                { Pointer to 32-Bit unsigned }
-       s32bittype,                { Pointer to 32-Bit signed }
-       cu64bittype,               { pointer to 64 bit unsigned def }
-       cs64bittype,               { pointer to 64 bit signed def, }
+       u8inttype,                 { Pointer to 8-Bit unsigned }
+       u16inttype,                { Pointer to 16-Bit unsigned }
+       u32inttype,                { Pointer to 32-Bit unsigned }
+       s32inttype,                { Pointer to 32-Bit signed }
+       u64inttype,               { pointer to 64 bit unsigned def }
+       s64inttype,               { pointer to 64 bit signed def, }
        s32floattype,              { pointer for realconstn }
        s64floattype,              { pointer for realconstn }
        s80floattype,              { pointer to type of temp. floats }
@@ -725,12 +725,12 @@ interface
        { we use only one variant def for every variant class }
        cvarianttype,
        colevarianttype,
-       { unsigned ord type with the same size as a pointer }
        ordpointertype,
-       { pointer to type of ordinal constants }
-       defaultordconsttype,
-       { default integer type s32bittype on 32 bit systems, s64bittype on 64 bit systems }
-       inttype,
+       { default integer type s32inttype on 32 bit systems, s64bittype on 64 bit systems }
+       sinttype,
+       uinttype,
+       { unsigned ord type with the same size as a pointer }
+       ptrinttype,
        pvmttype      : ttype;     { type of classrefs, used for stabs }
 
        { pointer to the anchestor of all classes }
@@ -1898,9 +1898,9 @@ implementation
         u64bit    : stabstring := strpnew('-32;');
         s64bit    : stabstring := strpnew('-31;');
 {$endif not Use_integer_types_for_boolean}
-         {u32bit : stabstring := tstoreddef(s32bittype.def).numberstring+';0;-1;'); }
+         {u32bit : stabstring := tstoreddef(s32inttype.def).numberstring+';0;-1;'); }
         else
-          stabstring:=stabstr_evaluate('r$1;$2;$3;',[Tstoreddef(s32bittype.def).numberstring,tostr(longint(low)),tostr(longint(high))]);
+          stabstring:=stabstr_evaluate('r$1;$2;$3;',[Tstoreddef(s32inttype.def).numberstring,tostr(longint(low)),tostr(longint(high))]);
         end;
       end;
 {$endif GDB}
@@ -2062,13 +2062,13 @@ implementation
       case typ of
         s32real,s64real:
           { found this solution in stabsread.c from GDB v4.16 }
-          stabstring:=stabstr_evaluate('r$1;${savesize};0;',[tstoreddef(s32bittype.def).numberstring]);
+          stabstring:=stabstr_evaluate('r$1;${savesize};0;',[tstoreddef(s32inttype.def).numberstring]);
         s64currency,s64comp:
-          stabstring:=stabstr_evaluate('r$1;-${savesize};0;',[tstoreddef(s32bittype.def).numberstring]);
+          stabstring:=stabstr_evaluate('r$1;-${savesize};0;',[tstoreddef(s32inttype.def).numberstring]);
         s80real:
          { under dos at least you must give a size of twelve instead of 10 !! }
          { this is probably do to the fact that in gcc all is pushed in 4 bytes size }
-          stabstring:=stabstr_evaluate('r$1;12;0;',[tstoreddef(s32bittype.def).numberstring]);
+          stabstring:=stabstr_evaluate('r$1;12;0;',[tstoreddef(s32inttype.def).numberstring]);
         else
           internalerror(10005);
       end;
@@ -2591,7 +2591,7 @@ implementation
            this is obsolete with GDBPAS !!
            and anyhow creates problems with version 4.18!! PM
          if settype=smallset then
-           stabstring := strpnew('r'+s32bittype^.numberstring+';0;0xffffffff;')
+           stabstring := strpnew('r'+s32inttype^.numberstring+';0;0xffffffff;')
          else }
          stabstring:=stabstr_evaluate('@s$1;S$2',[tostr(savesize*8),tstoreddef(elementtype.def).numberstring]);
       end;
@@ -2734,7 +2734,7 @@ implementation
 
     constructor tarraydef.create_from_pointer(const elemt : ttype);
       begin
-         self.create(0,$7fffffff,s32bittype);
+         self.create(0,$7fffffff,s32inttype);
          IsConvertedPointer:=true;
          setelementtype(elemt);
       end;
@@ -6152,7 +6152,12 @@ implementation
 end.
 {
   $Log$
-  Revision 1.213  2004-01-28 22:16:31  peter
+  Revision 1.214  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.213  2004/01/28 22:16:31  peter
     * more record alignment fixes
 
   Revision 1.212  2004/01/28 21:05:56  florian

compiler/x86/nx86mat.pas

@@ -88,7 +88,7 @@ interface
            if (cs_mmx in aktlocalswitches) and
               is_mmx_able_array(left.resulttype.def) then
              begin
-               registers32:=left.registers32;
+               registersint:=left.registersint;
                registersfpu:=left.registersfpu;
                registersmmx:=left.registersmmx;
                if (left.location.loc<>LOC_MMXREGISTER) and
@@ -308,7 +308,12 @@ end.
 
 {
   $Log$
-  Revision 1.2  2004-01-20 12:59:37  florian
+  Revision 1.3  2004-02-03 22:32:54  peter
+    * renamed xNNbittype to xNNinttype
+    * renamed registers32 to registersint
+    * replace some s32bit,u32bit with torddef([su]inttype).def.typ
+
+  Revision 1.2  2004/01/20 12:59:37  florian
     * common addnode code for x86-64 and i386
 
   Revision 1.1  2003/12/26 13:47:41  florian