4920

7 files changed, 4 insertions, 178 deletions

diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1
index 5d45b5fa..e2d5636f 100755
--- a/subx/apps/crenshaw2-1
+++ b/subx/apps/crenshaw2-1
Binary files differdiff --git a/subx/apps/crenshaw2-1b b/subx/apps/crenshaw2-1b
index b462d387..aba0f893 100755
--- a/subx/apps/crenshaw2-1b
+++ b/subx/apps/crenshaw2-1b
Binary files differdiff --git a/subx/apps/factorial b/subx/apps/factorial
index f5c91de1..97116bad 100755
--- a/subx/apps/factorial
+++ b/subx/apps/factorial
Binary files differdiff --git a/subx/apps/handle b/subx/apps/handle
index 61f3e1dd..35633c17 100755
--- a/subx/apps/handle
+++ b/subx/apps/handle
Binary files differdiff --git a/subx/apps/hex b/subx/apps/hex
index b51a79be..4d5a737f 100755
--- a/subx/apps/hex
+++ b/subx/apps/hex
Binary files differdiff --git a/subx/apps/hex.subx b/subx/apps/hex.subx
index 1d306782..8f6e1575 100644
--- a/subx/apps/hex.subx
+++ b/subx/apps/hex.subx
@@ -490,7 +490,7 @@ scan-next-byte:  # in : (address buffered-file), err : (address buffered-file),
     #   repeatedly
     #     EAX = read-byte(in)
     #     if EAX == 0xffffffff return EAX
-    #     if is-hex-lowercase-byte?(EAX) return EAX
+    #     if is-hex-byte?(EAX) return EAX
     #     if EAX == ' ' or '\t' or '\n' continue
     #     if EAX == '#' skip-until-newline(in)
     #     else error-byte(ed, err, "invalid byte: " EAX)
@@ -510,14 +510,14 @@ $scan-next-byte:loop:
     # if (EAX == 0xffffffff) return EAX
     3d/compare-with-EAX  0xffffffff/imm32
     74/jump-if-equal  $scan-next-byte:end/disp8
-    # if is-hex-lowercase-byte?(EAX) return EAX
+    # if is-hex-byte?(EAX) return EAX
     # . save EAX for now
     50/push-EAX
-    # . is-hex-lowercase-byte?(EAX)
+    # . is-hex-byte?(EAX)
     # . . push args
     50/push-EAX
     # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
+    e8/call  is-hex-byte?/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # . compare with 'false'
@@ -1408,177 +1408,6 @@ $test-scan-next-byte-aborts-on-invalid-byte:end:
     5d/pop-to-EBP
     c3/return
 
-is-hex-lowercase-byte?:  # c : byte -> bool/EAX
-    # . prolog
-    55/push-EBP
-    89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # . save registers
-    51/push-ECX
-    # ECX = c
-    8b/copy                         1/mod/*+disp8   5/rm32/EBP    .           .             .           1/r32/ECX   8/disp8         .                 # copy *(EBP+8) to ECX
-    # return false if c < '0'
-    b8/copy-to-EAX  0/imm32/false
-    81          7/subop/compare     3/mod/direct    1/rm32/ECX    .           .             .           .           .               0x30/imm32        # compare ECX
-    7c/jump-if-lesser  $is-hex-lowercase-byte?:end/disp8
-    # return false if c > 'f'
-    81          7/subop/compare     3/mod/direct    1/rm32/ECX    .           .             .           .           .               0x66/imm32        # compare ECX
-    7f/jump-if-greater  $is-hex-lowercase-byte?:end/disp8
-    # return true if c <= '9'
-    b8/copy-to-EAX  1/imm32/true
-    81          7/subop/compare     3/mod/direct    1/rm32/ECX    .           .             .           .           .               0x39/imm32        # compare ECX
-    7e/jump-if-lesser-or-equal  $is-hex-lowercase-byte?:end/disp8
-    # return true if c >= 'a'
-    81          7/subop/compare     3/mod/direct    1/rm32/ECX    .           .             .           .           .               0x61/imm32        # compare ECX
-    7d/jump-if-greater-or-equal  $is-hex-lowercase-byte?:end/disp8
-    # otherwise return false
-    b8/copy-to-EAX  0/imm32/false
-$is-hex-lowercase-byte?:end:
-    # . restore registers
-    59/pop-to-ECX
-    # . epilog
-    89/copy                         3/mod/direct    4/rm32/ESP    .           .             .           5/r32/EBP   .               .                 # copy EBP to ESP
-    5d/pop-to-EBP
-    c3/return
-
-test-hex-below-0:
-    # is-hex-lowercase-byte?(0x2f)
-    # . . push args
-    68/push  0x2f/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 0, msg)
-    # . . push args
-    68/push  "F - test-hex-below-0"/imm32
-    68/push  0/imm32/false
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    c3/return
-
-test-hex-0-to-9:
-    # is-hex-lowercase-byte?(0x30)
-    # . . push args
-    68/push  0x30/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 1, msg)
-    # . . push args
-    68/push  "F - test-hex-at-0"/imm32
-    68/push  1/imm32/true
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    # is-hex-lowercase-byte?(0x39)
-    # . . push args
-    68/push  0x39/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 1, msg)
-    # . . push args
-    68/push  "F - test-hex-at-9"/imm32
-    68/push  1/imm32/true
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    c3/return
-
-test-hex-above-9-to-a:
-    # is-hex-lowercase-byte?(0x3a)
-    # . . push args
-    68/push  0x3a/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 0, msg)
-    # . . push args
-    68/push  "F - test-hex-above-9-to-a"/imm32
-    68/push  0/imm32/false
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    c3/return
-
-test-hex-a-to-f:
-    # is-hex-lowercase-byte?(0x61)
-    # . . push args
-    68/push  0x61/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 1, msg)
-    # . . push args
-    68/push  "F - test-hex-at-a"/imm32
-    68/push  1/imm32/true
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    # is-hex-lowercase-byte?(0x66)
-    # . . push args
-    68/push  0x66/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 1, msg)
-    # . . push args
-    68/push  "F - test-hex-at-f"/imm32
-    68/push  1/imm32/true
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    c3/return
-
-test-hex-above-f:
-    # is-hex-lowercase-byte?(0x67)
-    # . . push args
-    68/push  0x67/imm32
-    # . . call
-    e8/call  is-hex-lowercase-byte?/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # check-ints-equal(EAX, 0, msg)
-    # . . push args
-    68/push  "F - test-hex-above-f"/imm32
-    68/push  0/imm32/false
-    50/push-EAX
-    # . . call
-    e8/call  check-ints-equal/disp32
-    # . . discard args
-    81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
-    c3/return
-
-parse-hex-digit:  # in/EAX : byte -> out/EAX : num
-    # no error checking; accepts argument in EAX
-    # if EAX <= '9' return EAX - '0'
-    3d/compare-EAX  0x39/imm32/9
-    7f/jump-if-greater  $parse-hex-digit:else/disp8
-    2d/subtract-from-EAX  0x30/imm32/0
-    c3/return
-$parse-hex-digit:else:
-    # otherwise return EAX - 'a' + 10
-    2d/subtract-from-EAX  0x57/imm32/a-10
-    c3/return
-
 skip-until-newline:  # in : (address buffered-file) -> <void>
     # pseudocode:
     #   push EAX
diff --git a/subx/apps/pack.subx b/subx/apps/pack.subx
index d83a5398..b2b7a32a 100644
--- a/subx/apps/pack.subx
+++ b/subx/apps/pack.subx
@@ -121,10 +121,7 @@ $main:end:
 #   slice-equal?(slice, kernel string)
 
 # helpers:
-#   is-hex-int(in : &slice)
-#   parse-hex-int(in : &slice) -> int
 #   emit-maybe(out : &buffered-file, n : int, width : int)
-#   emit-hex-int(out : &buffered-file, n : int)
 #   emit(out : &buffered-file, word : &slice)
 #   has-metadata?(word : &slice, s : &kernel-string) -> bool