about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xsubx/apps/assortbin19393 -> 19649 bytes
-rw-r--r--subx/apps/assort.subx74
-rw-r--r--subx/apps/crenshaw2-1.subx14
-rw-r--r--subx/apps/crenshaw2-1b.subx14
-rw-r--r--subx/apps/hex.subx30
-rw-r--r--subx/apps/pack.subx56
6 files changed, 78 insertions, 110 deletions
diff --git a/subx/apps/assort b/subx/apps/assort
index 85425fc9..16084ccd 100755
--- a/subx/apps/assort
+++ b/subx/apps/assort
Binary files differdiff --git a/subx/apps/assort.subx b/subx/apps/assort.subx
index 8aefffb3..5c13f31b 100644
--- a/subx/apps/assort.subx
+++ b/subx/apps/assort.subx
@@ -26,7 +26,7 @@
 Entry:  # run tests if necessary, convert stdin if not
 
     # for debugging: run a single test
-#?     e8/call test-get-or-insert-segment/disp32
+#?     e8/call test-convert/disp32
 #?     8b/copy                         0/mod/indirect  5/rm32/.disp32            .             .           3/r32/EBX   Num-test-failures/disp32          # copy *Num-test-failures to EBX
 #?     eb/jump  $main:end/disp8
 
@@ -1232,24 +1232,24 @@ _test-input-stream:
     # current read index
     0/imm32
     # length
-    0x80/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    0x100/imm32  # 256 bytes
+    # data (16 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # a test buffered file for _test-input-stream
 _test-input-buffered-file:
@@ -1270,24 +1270,24 @@ _test-output-stream:
     # current read index
     0/imm32
     # length
-    0x80/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    0x100/imm32  # 256 bytes
+    # data (16 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # a test buffered file for _test-output-stream
 _test-output-buffered-file:
diff --git a/subx/apps/crenshaw2-1.subx b/subx/apps/crenshaw2-1.subx
index 4aa83988..68c5f146 100644
--- a/subx/apps/crenshaw2-1.subx
+++ b/subx/apps/crenshaw2-1.subx
@@ -595,14 +595,10 @@ _test-error-stream:
     0/imm32
     # length
     0x40/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    # data (4 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # . . vim:nowrap:textwidth=0
diff --git a/subx/apps/crenshaw2-1b.subx b/subx/apps/crenshaw2-1b.subx
index 87826588..969d12f0 100644
--- a/subx/apps/crenshaw2-1b.subx
+++ b/subx/apps/crenshaw2-1b.subx
@@ -794,14 +794,10 @@ _test-error-stream:
     0/imm32
     # length
     0x40/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    # data (4 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # . . vim:nowrap:textwidth=0
diff --git a/subx/apps/hex.subx b/subx/apps/hex.subx
index 08aff7e5..536bb65d 100644
--- a/subx/apps/hex.subx
+++ b/subx/apps/hex.subx
@@ -1515,25 +1515,17 @@ _test-error-stream:
     0/imm32
     # current read index
     0/imm32
-    # length
-    0x80/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    # line
+    0x80/imm32  # 128 bytes
+    # data (8 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # a test buffered file for _test-error-stream
 _test-error-buffered-file:
diff --git a/subx/apps/pack.subx b/subx/apps/pack.subx
index ef2a52c0..6ce49ae1 100644
--- a/subx/apps/pack.subx
+++ b/subx/apps/pack.subx
@@ -7622,24 +7622,16 @@ _test-input-stream:
     # current read index
     0/imm32
     # length
-    0x80/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    0x80/imm32  # 128 bytes
+    # data (8 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # a test buffered file for _test-input-stream
 _test-input-buffered-file:
@@ -7660,24 +7652,16 @@ _test-output-stream:
     # current read index
     0/imm32
     # length
-    0x80/imm32
-    # data
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
-    00 00 00 00 00 00 00 00  # 8 bytes
+    0x80/imm32  # 128 bytes
+    # data (8 lines x 16 bytes/line)
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 # a test buffered file for _test-output-stream
 _test-output-buffered-file: