93843f07844e — Laurens Holst 7 years ago
Heap: Rename heaps to main / upper.
6 files changed, 15 insertions(+), 15 deletions(-)

M src/ArrayList.asm
M src/Channel.asm
M src/Class.asm
M src/ROM.asm
M src/Synthesix.asm
M src/ui/UIBuffer.asm
M src/ArrayList.asm +2 -2
@@ 32,7 32,7 @@ ArrayList_Constructor:
 	sla c
 	rl b
 	push ix
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_Allocate
 	pop ix
 	ld (ix + ArrayList.buffer),e

          
@@ 58,7 58,7 @@ ArrayList_Destructor:
 	sla c
 	rl b
 	push ix
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_Free
 	pop ix
 	ret

          
M src/Channel.asm +1 -1
@@ 47,7 47,7 @@ Channel_Constructor: PROC
 	push ix
 	xor a
 	ld bc,128
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_AllocateClear
 	pop ix
 	ld (ix + Channel.keys),e

          
M src/Class.asm +4 -4
@@ 2,7 2,7 @@ 
 ; ix <- new object
 ; Modifies: af, bc, de, hl, ix
 Class_New: PROC
-	ld ix,Heap_heap
+	ld ix,Heap_main
 Cont:
 	ld c,(iy - 2)
 	ld b,(iy - 1)

          
@@ 18,7 18,7 @@ Cont:
 ; Allocate a new object in the upper memory heap.
 ; Parameters are the same as New.
 Class_NewUpper:
-	ld ix,Heap_heapUpper
+	ld ix,Heap_upper
 	jp Class_New.Cont
 
 ; iy = class template

          
@@ 28,10 28,10 @@ Class_Destroy:
 	ld b,(iy - 1)
 	ld e,ixl
 	ld d,ixh
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_IsInHeap
 	jp c,Heap_Free
-	ld ix,Heap_heapUpper
+	ld ix,Heap_upper
 	call Heap_IsInHeap
 	jp c,Heap_Free
 	call System_ThrowException

          
M src/ROM.asm +4 -4
@@ 151,14 151,14 @@ ROM_bank4000:
 ROM_bank6000:
 	dw ROM_BANK_6000_CHANGE | ROM_CodeBank2
 
-Heap_heap:
+Heap_main:
 	Heap 8000H, 3000H
 
-Heap_heapUpper:
-	Heap Heap_heapUpperSpace, 100H
+Heap_upper:
+	Heap Heap_upperSpace, 100H
 
 	ALIGN 4
-Heap_heapUpperSpace:
+Heap_upperSpace:
 	ds 100H
 
 	ENDS

          
M src/Synthesix.asm +2 -2
@@ 24,9 24,9 @@ Synthesix_Main:
 
 ;	call System_EnableTurbo
 
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_Constructor
-	ld ix,Heap_heapUpper
+	ld ix,Heap_upper
 	call Heap_Constructor
 
 	call MemoryTest_Test

          
M src/ui/UIBuffer.asm +2 -2
@@ 31,13 31,13 @@ UIBuffer_New:
 UIBuffer_Constructor:
 	ld a," "
 	ld bc,UIBuffer.HEIGHT * UIBuffer.WIDTH
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_AllocateClear
 	ld (iy + UIBuffer.buffer),e
 	ld (iy + UIBuffer.buffer + 1),d
 	ld a,0
 	ld bc,UIBuffer.HEIGHT * UIBuffer.WIDTH / 8
-	ld ix,Heap_heap
+	ld ix,Heap_main
 	call Heap_AllocateClear
 	ld (iy + UIBuffer.blinkBuffer),e
 	ld (iy + UIBuffer.blinkBuffer + 1),d