about summary refs log tree commit diff stats
path: root/linux/120allocate.subx
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-08-22 21:06:36 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-08-22 21:09:28 -0700
commit827dd4a7fe98e80e776b206bb4966e22e22ce3c9 (patch)
tree699e33beb349cee09fc82d81dfd9c7ebef25e90a /linux/120allocate.subx
parentb41aed4a9adda23ca2613a24fefa3eafbd611987 (diff)
downloadmu-827dd4a7fe98e80e776b206bb4966e22e22ce3c9.tar.gz
start throwing error on duplicate label
One less error that's only in the bootstrap phase.

On the other hand, for simplicity I got rid of the ability to override
the Entry label. One less special case, but we're also going further
from the ability to run subsets of layers. We haven't really been
exercising it for a long time, though (commit 7842, March 2021 when we
made baremetal the default).
Diffstat (limited to 'linux/120allocate.subx')
-rw-r--r--linux/120allocate.subx24
1 files changed, 12 insertions, 12 deletions
diff --git a/linux/120allocate.subx b/linux/120allocate.subx
index 254c5f33..58c6c26d 100644
--- a/linux/120allocate.subx
+++ b/linux/120allocate.subx
@@ -42,18 +42,18 @@ Next-alloc-id:  # int
 # . op          subop               mod             rm32          base        index         scale       r32
 # . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
-# Let's start initializing the default allocation descriptor.
-
-Entry:
-    # initialize heap
-    # . Heap = new-segment(Heap-size)
-    # . . push args
-    68/push  Heap/imm32
-    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32            .             .           .           Heap-size/disp32                  # push *Heap-size
-    # . . call
-    e8/call  new-segment/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
+#? # Let's start initializing the default allocation descriptor.
+#? 
+#? Entry:
+#?     # initialize heap
+#?     # . Heap = new-segment(Heap-size)
+#?     # . . push args
+#?     68/push  Heap/imm32
+#?     ff          6/subop/push        0/mod/indirect  5/rm32/.disp32            .             .           .           Heap-size/disp32                  # push *Heap-size
+#?     # . . call
+#?     e8/call  new-segment/disp32
+#?     # . . discard args
+#?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
 
     e8/call  run-tests/disp32  # 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.
 $array-equal-main:end: