about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-04-18 10:39:28 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-04-18 11:56:10 -0700
commit8c7aaa6b96f6e3407508f962ab1be7a9c1f9b2cc (patch)
tree9b89f165c8f9eaf0b3d5ecd3c4efe140ca5b4cb5
parent6e6e840e88a5d28067ac650fd5b6dc938cb53709 (diff)
downloadmu-8c7aaa6b96f6e3407508f962ab1be7a9c1f9b2cc.tar.gz
revert experiment: expand heap
There are several things in the codebase right now that don't seem sustainable.
I need to take them out and bring them back in more gradually.
-rw-r--r--120allocate.subx2
-rw-r--r--boot.subx5
2 files changed, 3 insertions, 4 deletions
diff --git a/120allocate.subx b/120allocate.subx
index 502271ff..38c4110b 100644
--- a/120allocate.subx
+++ b/120allocate.subx
@@ -28,7 +28,7 @@ Heap:  # allocation-descriptor
   # curr
   0x01000000/imm32  # 16 MB
   # limit
-  0xc0000000/imm32  # 64 MB
+  0x02000000/imm32  # 32 MB
 
 Next-alloc-id:  # int
   0x100/imm32  # save a few alloc ids for fake handles
diff --git a/boot.subx b/boot.subx
index 9110a8ba..db36f88e 100644
--- a/boot.subx
+++ b/boot.subx
@@ -17,10 +17,9 @@
 # Memory map of a Mu computer:
 #   code: currently 4 tracks loaded from the primary disk to [0x00007c00, 0x00048600)
 #   stack: grows down from 0x00070000
-#   heap: [0x01000000, 0xc0000000)
+#   heap: [0x01000000, 0x02000000)
 #     see 120allocate.subx
-# Consult https://wiki.osdev.org/Memory_Map_(x86) before modifying any of
-# this. And don't forget to keep *stack-debug.subx in sync.
+# Consult https://wiki.osdev.org/Memory_Map_(x86) before modifying any of this.
 
 == code