Browse Source

* fixed small things regarding TEMPHEAP

florian 26 years ago
parent
commit
e7dacebccc
2 changed files with 14 additions and 7 deletions
  1. 8 5
      rtl/inc/heap.inc
  2. 6 2
      rtl/inc/heaph.inc

+ 8 - 5
rtl/inc/heap.inc

@@ -329,6 +329,10 @@ end;
     begin
       if not heap_split then
        begin
+         getmem(tempheap.block,sizeof(tblocks));
+         getmem(tempheap.nblock,sizeof(tnblocks));
+         fillchar(tempheap.block^,sizeof(tblocks),0);
+         fillchar(tempheap.nblock^,sizeof(tnblocks),0);
          baseheap.heaporg:=heaporg;
          baseheap.heapptr:=heapptr;
          baseheap.freelist:=freelist;
@@ -346,10 +350,6 @@ end;
          tempheap.heapend:=heapend;
          tempheap.memavail:=longint(tempheap.heapend) - longint(tempheap.heaporg);
          tempheap.heapsize:=tempheap.memavail;
-         getmem(tempheap.block,sizeof(tblocks));
-         getmem(tempheap.nblock,sizeof(tnblocks));
-         fillchar(tempheap.block^,sizeof(tblocks),0);
-         fillchar(tempheap.nblock^,sizeof(tnblocks),0);
          heapend:=baseheap.heapend;
          internal_memavail:=calc_memavail;
          baseheap.memavail:=internal_memavail;
@@ -1086,7 +1086,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  1999-01-22 12:39:21  pierre
+  Revision 1.6  1999-02-08 09:31:39  florian
+    * fixed small things regarding TEMPHEAP
+
+  Revision 1.5  1999/01/22 12:39:21  pierre
    + added text arg for dump_stack
 
   Revision 1.4  1998/12/16 00:22:24  peter

+ 6 - 2
rtl/inc/heaph.inc

@@ -54,16 +54,20 @@ Procedure releaseheap(oldfreelist,oldheapptr : pointer);
     allow_special : boolean =true;
 
   Procedure split_heap;
+  Procedure unsplit_heap;
   Procedure switch_to_base_heap;
   Procedure switch_to_temp_heap;
-  Procedure switch_heap;
+  Procedure switch_heap;  
   Procedure releasetempheap;
   Procedure gettempmem(var p : pointer;size : longint);
 {$endif TEMPHEAP}
 
 {
   $Log$
-  Revision 1.7  1998-10-01 14:55:18  peter
+  Revision 1.8  1999-02-08 09:31:40  florian
+    * fixed small things regarding TEMPHEAP
+
+  Revision 1.7  1998/10/01 14:55:18  peter
     + memorymanager like delphi
 
   Revision 1.6  1998/09/08 15:03:27  peter