Pārlūkot izejas kodu

* changed all size parameters in the temp manager from longint to asizeint

git-svn-id: branches/hlcgllvm@28488 -
Jonas Maebe 11 gadi atpakaļ
vecāks
revīzija
dd733bd5b5
4 mainītis faili ar 32 papildinājumiem un 32 dzēšanām
  1. 2 2
      compiler/i8086/tgcpu.pas
  2. 6 6
      compiler/jvm/tgcpu.pas
  3. 6 6
      compiler/llvm/tgllvm.pas
  4. 18 18
      compiler/tgobj.pas

+ 2 - 2
compiler/i8086/tgcpu.pas

@@ -37,7 +37,7 @@ unit tgcpu;
 
       ttgi8086 = class(ttgobj)
       protected
-        procedure alloctemp(list: TAsmList; size,alignment : longint; temptype : ttemptype; def:tdef; fini: boolean; out ref: treference);override;
+        procedure alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);override;
       end;
 
 implementation
@@ -47,7 +47,7 @@ uses
 
 { ttgi8086 }
 
-procedure ttgi8086.alloctemp(list: TAsmList; size, alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);
+procedure ttgi8086.alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);
   begin
     inherited;
     ref.segment:=NR_SS;

+ 6 - 6
compiler/jvm/tgcpu.pas

@@ -42,10 +42,10 @@ unit tgcpu;
         protected
          procedure getimplicitobjtemp(list: TAsmList; def: tdef; temptype: ttemptype; out ref: treference);
          function getifspecialtemp(list: TAsmList; def: tdef; forcesize: asizeint; temptype: ttemptype; out ref: treference): boolean;
-         procedure alloctemp(list: TAsmList; size, alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference); override;
+         procedure alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference); override;
         public
-         procedure setfirsttemp(l : longint); override;
-         procedure getlocal(list: TAsmList; size: longint; alignment: shortint; def: tdef; var ref: treference); override;
+         procedure setfirsttemp(l : asizeint); override;
+         procedure getlocal(list: TAsmList; size: asizeint; alignment: shortint; def: tdef; var ref: treference); override;
          procedure gethltemp(list: TAsmList; def: tdef; forcesize: asizeint; temptype: ttemptype; out ref: treference); override;
          procedure gethltempmanaged(list: TAsmList; def: tdef; temptype: ttemptype; out ref: treference); override;
        end;
@@ -215,7 +215,7 @@ unit tgcpu;
       end;
 
 
-    procedure ttgjvm.alloctemp(list: TAsmList; size, alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);
+    procedure ttgjvm.alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);
       begin
         { the JVM only supports 1 slot (= 4 bytes in FPC) and 2 slot (= 8 bytes in
           FPC) temps on the stack. double and int64 are 2 slots, the rest is one slot.
@@ -231,14 +231,14 @@ unit tgcpu;
       end;
 
 
-    procedure ttgjvm.setfirsttemp(l: longint);
+    procedure ttgjvm.setfirsttemp(l: asizeint);
       begin
         firsttemp:=l;
         lasttemp:=l;
       end;
 
 
-    procedure ttgjvm.getlocal(list: TAsmList; size: longint; alignment: shortint; def: tdef; var ref: treference);
+    procedure ttgjvm.getlocal(list: TAsmList; size: asizeint; alignment: shortint; def: tdef; var ref: treference);
       begin
         if not getifspecialtemp(list,def,size,tt_persistent,ref) then
           inherited;

+ 6 - 6
compiler/llvm/tgllvm.pas

@@ -55,15 +55,15 @@ unit tgllvm;
 
       ttgllvm = class(ttgobj)
        protected
-        procedure alloctemp(list: TAsmList; size, alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference); override;
+        procedure alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference); override;
        public
         alloclist: tasmlist;
 
         constructor create; override;
         destructor destroy; override;
-        procedure setfirsttemp(l : longint); override;
+        procedure setfirsttemp(l: asizeint); override;
         function istemp(const ref: treference): boolean; override;
-        procedure getlocal(list: TAsmList; size: longint; alignment: shortint; def: tdef; var ref: treference); override;
+        procedure getlocal(list: TAsmList; size: asizeint; alignment: shortint; def: tdef; var ref: treference); override;
         procedure gethltemp(list: TAsmList; def: tdef; forcesize: asizeint; temptype: ttemptype; out ref: treference); override;
         procedure ungetiftemp(list: TAsmList; const ref: treference); override;
       end;
@@ -82,7 +82,7 @@ implementation
 
     { ttgllvm }
 
-    procedure ttgllvm.alloctemp(list: TAsmList; size, alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);
+    procedure ttgllvm.alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference);
       var
         tl: ptemprecord;
         oldfileinfo: tfileposinfo;
@@ -136,14 +136,14 @@ implementation
       end;
 
 
-    procedure ttgllvm.setfirsttemp(l: longint);
+    procedure ttgllvm.setfirsttemp(l: asizeint);
       begin
         firsttemp:=l;
         lasttemp:=l;
       end;
 
 
-    procedure ttgllvm.getlocal(list: TAsmList; size: longint; alignment: shortint; def: tdef; var ref: treference);
+    procedure ttgllvm.getlocal(list: TAsmList; size: asizeint; alignment: shortint; def: tdef; var ref: treference);
       begin
         gethltemp(list,def,size,tt_persistent,ref);
       end;

+ 18 - 18
compiler/tgobj.pas

@@ -44,8 +44,8 @@ unit tgobj;
          temptype   : ttemptype;
          { finalize this temp if it's a managed type }
          fini       : boolean;
-         pos        : longint;
-         size       : longint;
+         pos        : asizeint;
+         size       : asizeint;
          def        : tdef;
          next       : ptemprecord;
          nextfree   : ptemprecord; { for faster freeblock checking }
@@ -61,9 +61,9 @@ unit tgobj;
        protected
           { contains all free temps using nextfree links }
           tempfreelist  : ptemprecord;
-          procedure alloctemp(list: TAsmList; size,alignment : longint; temptype : ttemptype; def:tdef; fini: boolean; out ref: treference); virtual;
-          procedure freetemp(list: TAsmList; pos:longint;temptypes:ttemptypeset);virtual;
-          procedure gettempinternal(list: TAsmList; size, alignment : longint;temptype:ttemptype;def: tdef; fini: boolean; out ref : treference);
+          procedure alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref: treference); virtual;
+          procedure freetemp(list: TAsmList; pos: asizeint; temptypes: ttemptypeset);virtual;
+          procedure gettempinternal(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref : treference);
        public
           { contains all temps }
           templist      : ptemprecord;
@@ -85,7 +85,7 @@ unit tgobj;
 
              @param(l start offset where temps will start in stack)
           }
-          procedure setfirsttemp(l : longint); virtual;
+          procedure setfirsttemp(l: asizeint); virtual;
           procedure setalignmentmismatch(l : longint); virtual;
 
           { version of gettemp that is compatible with hlcg-based targets;
@@ -96,11 +96,11 @@ unit tgobj;
             don't have an inherent size (e.g., array of const) }
           procedure gethltemp(list: TAsmList; def: tdef; forcesize: asizeint; temptype: ttemptype; out ref: treference); virtual;
           procedure gethltempmanaged(list: TAsmList; def: tdef; temptype: ttemptype; out ref: treference); virtual;
-          procedure gettemp(list: TAsmList; size, alignment : longint;temptype:ttemptype;out ref : treference);
+          procedure gettemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; out ref : treference);
           procedure gettempmanaged(list: TAsmList; def:tdef;temptype:ttemptype;out ref : treference);
           procedure ungettemp(list: TAsmList; const ref : treference);
 
-          function sizeoftemp(list: TAsmList; const ref: treference): longint;
+          function sizeoftemp(list: TAsmList; const ref: treference): asizeint;
           function changetemptype(list: TAsmList; const ref:treference;temptype:ttemptype):boolean;
           function gettypeoftemp(const ref:treference): ttemptype;
 
@@ -117,8 +117,8 @@ unit tgobj;
           procedure ungetiftemp(list: TAsmList; const ref : treference); virtual;
 
           { Allocate space for a local }
-          procedure getlocal(list: TAsmList; size : longint;def:tdef;var ref : treference);
-          procedure getlocal(list: TAsmList; size : longint; alignment : shortint; def:tdef;var ref : treference); virtual;
+          procedure getlocal(list: TAsmList; size: asizeint; def: tdef; var ref : treference);
+          procedure getlocal(list: TAsmList; size: asizeint; alignment: shortint; def: tdef; var ref : treference); virtual;
           procedure UnGetLocal(list: TAsmList; const ref : treference);
        end;
        ttgobjclass = class of ttgobj;
@@ -217,7 +217,7 @@ implementation
       end;
 
 
-    procedure ttgobj.setfirsttemp(l : longint);
+    procedure ttgobj.setfirsttemp(l: asizeint);
       begin
          { this is a negative value normally }
          if l*direction>=0 then
@@ -238,7 +238,7 @@ implementation
       end;
 
 
-    procedure ttgobj.alloctemp(list: TAsmList; size,alignment : longint; temptype : ttemptype;def : tdef; fini: boolean; out ref: treference);
+    procedure ttgobj.alloctemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def :tdef; fini: boolean; out ref: treference);
       var
          tl,htl,
          bestslot,bestprev,
@@ -439,7 +439,7 @@ implementation
       end;
 
 
-    procedure ttgobj.FreeTemp(list: TAsmList; pos:longint;temptypes:ttemptypeset);
+    procedure ttgobj.FreeTemp(list: TAsmList; pos: asizeint; temptypes: ttemptypeset);
       var
          hp,hnext,hprev,hprevfree : ptemprecord;
       begin
@@ -540,13 +540,13 @@ implementation
 
 
 
-    procedure ttgobj.gettemp(list: TAsmList; size, alignment : longint;temptype:ttemptype;out ref : treference);
+    procedure ttgobj.gettemp(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; out ref : treference);
       begin
         gettempinternal(list,size,alignment,temptype,nil,false,ref);
       end;
 
 
-    procedure ttgobj.gettempinternal(list: TAsmList; size, alignment : longint;temptype:ttemptype;def: tdef; fini: boolean; out ref : treference);
+    procedure ttgobj.gettempinternal(list: TAsmList; size: asizeint; alignment: longint; temptype: ttemptype; def: tdef; fini: boolean; out ref : treference);
       var
         varalign : shortint;
       begin
@@ -581,7 +581,7 @@ implementation
       end;
 
 
-    function ttgobj.sizeoftemp(list: TAsmList; const ref: treference): longint;
+    function ttgobj.sizeoftemp(list: TAsmList; const ref: treference): asizeint;
       var
          hp : ptemprecord;
       begin
@@ -678,13 +678,13 @@ implementation
       end;
 
 
-    procedure ttgobj.getlocal(list: TAsmList; size : longint;def:tdef;var ref : treference);
+    procedure ttgobj.getlocal(list: TAsmList; size: asizeint; def: tdef; var ref : treference);
       begin
         getlocal(list, size, def.alignment, def, ref);
       end;
 
 
-    procedure ttgobj.getlocal(list: TAsmList; size : longint; alignment : shortint; def:tdef;var ref : treference);
+    procedure ttgobj.getlocal(list: TAsmList; size: asizeint; alignment: shortint; def: tdef; var ref : treference);
       begin
         alignment:=used_align(alignment,current_settings.alignment.localalignmin,current_settings.alignment.localalignmax);
         alloctemp(list,size,alignment,tt_persistent,def,false,ref);