* changed formatting to conform to the rest of the compiler/rtl

* fixed SysMaxAvail so it also looks at the free fixed size blocks

rtl/inc/heap.inc

@@ -502,6 +502,7 @@ end;
 function SysMaxavail: ptrint;
 var
   pmc : pmemchunk_var;
+  i: longint;
 begin
   pmc := freelist_var;
   sysmaxavail := 0;
@@ -511,6 +512,15 @@ begin
         sysmaxavail := pmc^.size;
       pmc := pmc^.next_var;
     end;
+  if sysmaxavail = 0 then
+    begin
+      for i := maxblockindex downto 1 do
+        if assigned(freelists_fixed[i]) then
+          begin
+            sysmaxavail := i shl blockshr;
+            exit;
+          end;
+    end;
 end;
 
 
@@ -619,7 +629,9 @@ begin
       dec(internal_heapsize, poc^.size);
       dec(internal_memavail, poc^.size);
       SysOSFree(poc, poc^.size);
-  end else begin
+    end
+  else
+    begin
 {$endif}
       poc^.prev := nil;
       poc^.next := freeoslist;
@@ -711,7 +723,9 @@ begin
   if (mc_right^.size and lastblockflag) <> 0 then
     begin
       mc_left^.size := mc_left^.size or lastblockflag;
-  end else begin
+    end
+  else
+    begin
       // there is a block to the right of the right-block, adjust it's prevsize
       mc_tmp := pmemchunk_var(pointer(mc_right)+size_right);
       mc_tmp^.prevsize := mc_left^.size and sizemask;
@@ -796,16 +810,16 @@ begin
           result := SysOSAlloc(GrowHeapSizeSmall);
           if result<>nil then
             size := GrowHeapSizeSmall;
-    end else
+        end
     { first try 256K (default) }
-    if size<=GrowHeapSize1 then
+    else if size<=GrowHeapSize1 then
       begin
         result := SysOSAlloc(GrowHeapSize1);
         if result<>nil then
           size := GrowHeapSize1;
-    end else
+      end
     { second try 1024K (default) }
-    if size<=GrowHeapSize2 then
+    else if size<=GrowHeapSize2 then
       begin
         result := SysOSAlloc(GrowHeapSize2);
         if result<>nil then
@@ -850,14 +864,18 @@ begin
           begin
             pmc := pmemchunk_fixed(pointer(pmc)+chunksize);
             pmc^.prev_fixed := pointer(pmc)-chunksize;
-      end else begin
+          end
+        else
+          begin
             break;
           end;
       until false;
       append_to_list_fixed(blockindex, pmc);
       pmc^.prev_fixed := pointer(pmc)-chunksize;
       freelists_fixed[blockindex] := pmemchunk_fixed(result);
-  end else begin
+    end
+  else
+    begin
       pmcv := pmemchunk_var(result);
       append_to_list_var(pmcv);
       pmcv^.size := ((size-sizeof(toschunk)) and sizemask) or (firstblockflag or lastblockflag);
@@ -923,7 +941,9 @@ begin
       if pcurr^.size=size then
         begin
           break;
-    end else begin
+        end
+      else
+        begin
           if (pcurr^.size>size) then
             begin
               if (not assigned(pbest)) or
@@ -982,7 +1002,9 @@ begin
     begin
       size := (size+sizeof(tmemchunk_fixed_hdr)+(blocksize-1)) and fixedsizemask;
       sysgetmem := sysgetmem_fixed(size);
-  end else begin
+    end
+  else
+    begin
       size := (size+sizeof(tmemchunk_var_hdr)+(blocksize-1)) and sizemask;
       sysgetmem := sysgetmem_var(size);
     end;
@@ -1059,7 +1081,9 @@ begin
   if (pcurrsize and fixedsizeflag) = 0 then
     begin
       result := sysfreemem_var(pmemchunk_var(p-sizeof(tmemchunk_var_hdr)), pcurrsize and sizemask);
-  end else begin
+    end
+  else
+    begin
       result := sysfreemem_fixed(pmemchunk_fixed(p-sizeof(tmemchunk_fixed_hdr)), pcurrsize and fixedsizemask);
     end;
 end;
@@ -1088,7 +1112,9 @@ begin
     begin
       size := (size+sizeof(tmemchunk_var_hdr)+(blocksize-1)) and sizemask;
       result := sysfreemem_var(pmemchunk_var(p-sizeof(tmemchunk_var_hdr)), size);
-  end else begin
+    end
+  else
+    begin
       size := (size+sizeof(tmemchunk_fixed_hdr)+(blocksize-1)) and fixedsizemask;
       result := sysfreemem_fixed(pmemchunk_fixed(p-sizeof(tmemchunk_fixed_hdr)), size);
     end;
@@ -1106,7 +1132,9 @@ begin
     begin
       SysMemSize := SysMemSize and sizemask;
       dec(SysMemSize, sizeof(tmemchunk_var_hdr));
-  end else begin
+    end
+  else
+    begin
       SysMemSize := SysMemSize and fixedsizemask;
       dec(SysMemSize, sizeof(tmemchunk_fixed_hdr));
     end;
@@ -1142,7 +1170,9 @@ begin
   if size <= (maxblocksize - sizeof(tmemchunk_fixed_hdr)) then
     begin
       size := (size+sizeof(tmemchunk_fixed_hdr)+(blocksize-1)) and fixedsizemask;
-  end else begin
+    end
+  else
+    begin
       size := (size+sizeof(tmemchunk_var_hdr)+(blocksize-1)) and sizemask;
     end;
 
@@ -1151,7 +1181,9 @@ begin
   if (pcurrsize and fixedsizeflag) = 0 then
     begin
       currsize := pcurrsize and sizemask;
-  end else begin
+    end
+  else
+    begin
       currsize := pcurrsize and fixedsizemask;
     end;
   oldsize := currsize;
@@ -1303,7 +1335,11 @@ end;
 
 {
   $Log$
-  Revision 1.35  2004-06-29 20:50:32  peter
+  Revision 1.36  2004-08-10 18:58:36  jonas
+    * changed formatting to conform to the rest of the compiler/rtl
+    * fixed SysMaxAvail so it also looks at the free fixed size blocks
+
+  Revision 1.35  2004/06/29 20:50:32  peter
     * readded support for ReturnIfGrowHeapFails
 
   Revision 1.34  2004/06/27 19:47:27  florian