瀏覽代碼

* fixed bootstrapping with 2.0.4
* fixed ppc64 compilation (by reintroducing a bogus ptrint warning, that
code really is correct)

git-svn-id: trunk@8090 -

Jonas Maebe 18 年之前
父節點
當前提交
71193c0f2c
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      compiler/cstreams.pas
  2. 2 2
      compiler/ppcgen/aasmcpu.pas

+ 2 - 2
compiler/cstreams.pas

@@ -462,7 +462,7 @@ begin
     begin
     Result:=FSize-FPosition;
     If Result>Count then Result:=Count;
-    Move (Pointer(PtrUInt(FMemory)+FPosition)^,Buffer,Result);
+    Move (Pointer(PtrUInt(FMemory)+PtrUInt(FPosition))^,Buffer,Result);
     FPosition:=Fposition+Result;
     end;
 end;
@@ -613,7 +613,7 @@ begin
       SetCapacity (NewPos);
     FSize:=Newpos;
     end;
-  System.Move (Buffer,Pointer(Ptruint(FMemory)+FPosition)^,Count);
+  System.Move (Buffer,Pointer(Ptruint(FMemory)+PtrUInt(FPosition))^,Count);
   FPosition:=NewPos;
   Result:=Count;
 end;

+ 2 - 2
compiler/ppcgen/aasmcpu.pas

@@ -485,7 +485,7 @@ uses cutils, cclasses;
         p: tai;
         newjmp: taicpu;
         labelpositions: TFPList;
-        instrpos: ptruint;
+        instrpos: ptrint;
         l: tasmlabel;
         inserted_something: boolean;
       begin
@@ -539,7 +539,7 @@ uses cutils, cclasses;
 {$q-}
 {$define overflowon}
 {$endif}
-                           (ptruint(abs(ptruint(labelpositions[tasmlabel(taicpu(p).oper[0]^.ref^.symbol).labelnr]-instrpos)) - (low(smallint) div 4)) > ptruint((high(smallint) - low(smallint)) div 4)) then
+                           (ptruint(abs(ptrint(labelpositions[tasmlabel(taicpu(p).oper[0]^.ref^.symbol).labelnr]-instrpos)) - (low(smallint) div 4)) > ptruint((high(smallint) - low(smallint)) div 4)) then
 {$ifdef overflowon}
 {$q+}
 {$undef overflowon}