* Replace more ptrint by ptruint.

git-svn-id: trunk@5003 -

packages/base/paszlib/infblock.pas

@@ -812,7 +812,7 @@ begin
         {$IFDEF ZLIB_DEBUG}
         if (ptruint(q) >= ptruint(s.read)) then
           Tracev('inflate:       codes end '+
-              IntToStr(z.total_out + ptrint(q) - ptruint(s.read)) + ' total out')
+              IntToStr(z.total_out + ptruint(q) - ptruint(s.read)) + ' total out')
         else
           Tracev('inflate:       codes end '+
                   IntToStr(z.total_out + ptruint(s.zend) - ptruint(s.read) +

packages/base/paszlib/inffast.pas

@@ -65,10 +65,10 @@ begin
   b := s.bitb;
   k := s.bitk;
   q := s.write;
-  if ptrint(q) < ptrint(s.read) then
-    m := cardinal(ptrint(s.read)-ptrint(q)-1)
+  if ptruint(q) < ptruint(s.read) then
+    m := cardinal(ptruint(s.read)-ptruint(q)-1)
   else
-    m := cardinal(ptrint(s.zend)-ptrint(q));
+    m := cardinal(ptruint(s.zend)-ptruint(q));
 
   { initialize masks }
   ml := inflate_mask[bl];
@@ -161,7 +161,7 @@ begin
             {$ENDIF}
             { do the copy }
             dec(m, c);
-            if (cardinal(ptrint(q) - ptrint(s.window)) >= d) then     { offset before dest }
+            if (cardinal(ptruint(q) - ptruint(s.window)) >= d) then     { offset before dest }
             begin                                  {  just copy }
               r := q;
               dec(r, d);
@@ -170,7 +170,7 @@ begin
             end
             else                        { else offset after destination }
             begin
-              e := d - cardinal(ptrint(q) - ptrint(s.window)); { bytes from offset to end }
+              e := d - cardinal(ptruint(q) - ptruint(s.window)); { bytes from offset to end }
               r := s.zend;
               dec(r, e);                  { pointer to offset }
               if (c > e) then             { if source crosses, }
@@ -213,7 +213,7 @@ begin
             s.bitb := b;
             s.bitk := k;
             z.avail_in := n;
-            inc(z.total_in, ptrint(p)-ptrint(z.next_in));
+            inc(z.total_in, ptruint(p)-ptruint(z.next_in));
             z.next_in := p;
             s.write := q;
 
@@ -265,7 +265,7 @@ begin
           s.bitb := b;
           s.bitk := k;
           z.avail_in := n;
-          inc(z.total_in, ptrint(p)-ptrint(z.next_in));
+          inc(z.total_in, ptruint(p)-ptruint(z.next_in));
           z.next_in := p;
           s.write := q;
           inflate_fast := Z_STREAM_END;
@@ -285,7 +285,7 @@ begin
           s.bitb := b;
           s.bitk := k;
           z.avail_in := n;
-          inc(z.total_in, ptrint(p)-ptrint(z.next_in));
+          inc(z.total_in, ptruint(p)-ptruint(z.next_in));
           z.next_in := p;
           s.write := q;
           inflate_fast := Z_DATA_ERROR;
@@ -306,7 +306,7 @@ begin
   s.bitb := b;
   s.bitk := k;
   z.avail_in := n;
-  inc(z.total_in, ptrint(p)-ptrint(z.next_in));
+  inc(z.total_in, ptruint(p)-ptruint(z.next_in));
   z.next_in := p;
   s.write := q;
   inflate_fast := Z_OK;

packages/base/paszlib/inftrees.pas

@@ -366,7 +366,7 @@ Begin
           r.exop := byte(j);     { bits in this table }
           j := i shr (w - l);
           {r.base := cardinal( q - u[h-1] -j);}   { offset to this table }
-          r.base := (ptrint(q) - ptrint(u[h-1]) ) div sizeof(q^) - j;
+          r.base := (ptruint(q) - ptruint(u[h-1]) ) div sizeof(q^) - j;
           huft_Ptr(u[h-1])^[j] := r;  { connect to last table }
         end
         else
@@ -378,7 +378,7 @@ Begin
 
       { C-code: if (p >= v + n) - see ZUTIL.PAS for comments }
 
-      if ptrint(p)>=ptrint(@(v[n])) then  { also works under DPMI ?? }
+      if ptruint(p)>=ptruint(@(v[n])) then  { also works under DPMI ?? }
         r.exop := 128 + 64                  { out of values--invalid code }
       else
         if (p^ < s) then

packages/base/paszlib/infutil.pas

@@ -152,10 +152,10 @@ begin
   q := s.read;
 
   { compute number of bytes to copy as far as end of window }
-  if ptrint(q) <= ptrint(s.write) then
-    n := cardinal(ptrint(s.write) - ptrint(q))
+  if ptruint(q) <= ptruint(s.write) then
+    n := cardinal(ptruint(s.write) - ptruint(q))
   else
-    n := cardinal(ptrint(s.zend) - ptrint(q));
+    n := cardinal(ptruint(s.zend) - ptruint(q));
   if (n > z.avail_out) then
     n := z.avail_out;
   if (n <> 0) and (r = Z_BUF_ERROR) then
@@ -187,7 +187,7 @@ begin
       s.write := s.window;
 
     { compute bytes to copy }
-    n := cardinal(ptrint(s.write) - ptrint(q));
+    n := cardinal(ptruint(s.write) - ptruint(q));
     if (n > z.avail_out) then
       n := z.avail_out;
     if (n <> 0) and (r = Z_BUF_ERROR) then

packages/base/paszlib/zdeflate.pas

@@ -1113,7 +1113,7 @@ begin
   move(Pbyte(ss^.head)^,Pbyte(ds^.head)^,ds^.hash_size * sizeof(pos));
   move(Pbyte(ss^.pending_buf)^,Pbyte(ds^.pending_buf)^,cardinal(ds^.pending_buf_size));
 
-  ds^.pending_out := @ds^.pending_buf^[ptrint(ss^.pending_out) - ptrint(ss^.pending_buf)];
+  ds^.pending_out := @ds^.pending_buf^[ptruint(ss^.pending_out) - ptruint(ss^.pending_buf)];
   ds^.d_buf := Pwordarray(@overlay^[ds^.lit_bufsize div sizeof(word)] );
   ds^.l_buf := Pbytearray(@ds^.pending_buf^[(1+sizeof(word))*ds^.lit_bufsize]);
 
@@ -1305,8 +1305,8 @@ distances are limited to MAX_DIST instead of WSIZE. }
         { This code assumes sizeof(cardinal short) = 2. Do not use
           UNALIGNED_OK if your compiler uses a different size. }
   {$IFOPT R+} {$R-} {$DEFINE NoRangeCheck} {$ENDIF}
-        if (pushfArray(match)^[best_len-1] <> scan_end) or
-           (pushf(match)^ <> scan_start) then
+        if (match[best_len-1]<>scan_end) or
+           (match^ <> scan_start) then
           goto nextstep; {continue;}
   {$IFDEF NoRangeCheck} {$R+} {$UNDEF NoRangeCheck} {$ENDIF}
 
@@ -1325,25 +1325,25 @@ distances are limited to MAX_DIST instead of WSIZE. }
         inc(match);
 
         repeat
-          inc(scan,2); inc(match,2); if (pushf(scan)^<>pushf(match)^) then break;
-          inc(scan,2); inc(match,2); if (pushf(scan)^<>pushf(match)^) then break;
-          inc(scan,2); inc(match,2); if (pushf(scan)^<>pushf(match)^) then break;
-          inc(scan,2); inc(match,2); if (pushf(scan)^<>pushf(match)^) then break;
-        until (ptrint(scan) >= ptrint(strend));
+          inc(scan,2); inc(match,2); if scan^<>match^ then break;
+          inc(scan,2); inc(match,2); if scan^<>match^ then break;
+          inc(scan,2); inc(match,2); if scan^<>match^ then break;
+          inc(scan,2); inc(match,2); if scan^<>match^ then break;
+        until ptruint(scan)>=ptruint(strend);
         { The funny "do while" generates better code on most compilers }
 
         { Here, scan <= window+strstart+257 }
         {$IFDEF ZLIB_DEBUG}
         {$ifopt R+} {$define RangeCheck} {$endif} {$R-}
-        Assert(ptrint(scan) <=
-               ptrint(@(s.window^[cardinal(s.window_size-1)])),
+        Assert(ptruint(scan) <=
+               ptruint(@(s.window^[cardinal(s.window_size-1)])),
                'wild scan');
         {$ifdef RangeCheck} {$R+} {$undef RangeCheck} {$endif}
         {$ENDIF}
-        if (scan^ = match^) then
+        if scan^=match^ then
           inc(scan);
 
-        len := (MAX_MATCH - 1) - integer(ptrint(strend)) + integer(ptrint(scan));
+        len := (MAX_MATCH - 1) - integer(ptruint(strend)) + integer(ptruint(scan));
         scan := strend;
         dec(scan, (MAX_MATCH-1));
 
@@ -1374,23 +1374,23 @@ distances are limited to MAX_DIST instead of WSIZE. }
           the 256th check will be made at strstart+258. }
 
         repeat
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-          inc(scan); inc(match); if (scan^ <> match^) then break;
-        until (ptrint(scan) >= ptrint(strend));
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+          inc(scan); inc(match); if scan^ <> match^ then break;
+        until ptruint(scan)>=ptruint(strend);
 
         {$IFDEF ZLIB_DEBUG}
-        Assert(ptrint(scan) <=
-               ptrint(@(s.window^[cardinal(s.window_size-1)])),
+        Assert(ptruint(scan) <=
+               ptruint(@(s.window^[cardinal(s.window_size-1)])),
                'wild scan');
         {$ENDIF}
 
-        len := MAX_MATCH - integer(ptrint(strend) - ptrint(scan));
+        len := MAX_MATCH - (ptruint(strend) - ptruint(scan));
         scan := strend;
         dec(scan, MAX_MATCH);
 
@@ -1481,7 +1481,7 @@ begin
       inc(scan); inc(match); if scan^<>match^ then break;
       inc(scan); inc(match); if scan^<>match^ then break;
       inc(scan); inc(match); if scan^<>match^ then break;
-    until (ptrint(scan) >= ptrint(strend));
+    until (ptruint(scan) >= ptruint(strend));
 
     Assert(scan <= s.window+cardinal(s.window_size-1), 'wild scan');
 

packages/base/paszlib/zinflate.pas

@@ -686,7 +686,7 @@ begin
   end;
 
   { restore }
-  inc(z.total_in, ptrint(p) - ptrint(z.next_in));
+  inc(z.total_in, ptruint(p) - ptruint(z.next_in));
   z.next_in := p;
   z.avail_in := n;
   z.state^.sub.marker := m;