4667

Standardize on hyphens in all names.
And we'll use colons for namespacing labels in functions.

1 files changed, 66 insertions, 65 deletions

diff --git a/subx/052kernel_string_equal.subx b/subx/052kernel_string_equal.subx
index 21bd9a09..b0b646c5 100644
--- a/subx/052kernel_string_equal.subx
+++ b/subx/052kernel_string_equal.subx
@@ -21,15 +21,15 @@
 # 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
 
 # main:  (manual test if this is the last file loaded)
-  e8/call  run_tests/disp32  # 'run_tests' is a function created automatically by SubX. It calls all functions that start with 'test_'.
-  # exit(Num_test_failures)
-  8b/copy                         0/mod/indirect  5/rm32/.disp32            .             .           3/r32/EBX   Num_test_failures/disp32          # copy *Num_test_failures to EBX
+  e8/call  run-tests/disp32  # 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.
+  # exit(Num-test-failures)
+  8b/copy                         0/mod/indirect  5/rm32/.disp32            .             .           3/r32/EBX   Num-test-failures/disp32          # copy *Num-test-failures to EBX
   b8/copy                         .               .             .           .             .           .           .               1/imm32           # copy to EAX
   cd/syscall  0x80/imm8
 
 # compare a null-terminated ascii string with a more idiomatic length-prefixed byte array
 # reason for the name: the only place we should have null-terminated ascii strings is from commandline args
-kernel_string_equal:  # s : null-terminated ascii string, benchmark : length-prefixed ascii string -> EAX : boolean
+kernel-string-equal:  # s : null-terminated ascii string, benchmark : length-prefixed ascii string -> EAX : boolean
   # prolog
   55/push-EBP
   89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
@@ -65,9 +65,9 @@ kernel_string_equal:  # s : null-terminated ascii string, benchmark : length-pre
   # initialize loop counter i into ECX
   b9/copy                         .               .             .           .             .           .           .               0/imm32/exit      # copy to ECX
   # while (i/ECX < n/EDX)
-$kernel_string_loop:
+$kernel-string-equal:loop:
   39/compare                      3/mod/direct    1/rm32/ECX    .           .             .           2/r32/EDX   .               .                 # compare ECX with EDX
-  74/jump-if-equal  $kernel_string_break/disp8
+  74/jump-if-equal  $kernel-string-equal:break/disp8
     # c1/EAX, c2/EBX = *s, *benchmark
   b8/copy  0/imm32  # clear EAX
   8a/copy                         0/mod/indirect  7/rm32/EDI    .           .             .           0/r32/EAX   .               .                 # copy byte at *EDI to lower byte of EAX
@@ -75,29 +75,30 @@ $kernel_string_loop:
   8a/copy                         0/mod/indirect  6/rm32/ESI    .           .             .           3/r32/EBX   .               .                 # copy byte at *ESI to lower byte of EBX
     # if (c1 == 0) return false
   3d/compare-EAX  0/imm32
-  74/jump-if-equal  $kernel_string_fail/disp8
+  74/jump-if-equal  $kernel-string-equal:false/disp8
     # if (c1 != c2) return false
   39/compare                      3/mod/direct    0/rm32/EAX    .           .             .           3/r32/EBX   .               .                 # compare EAX with EBX
-  75/jump-if-not-equal  $kernel_string_fail/disp8
+  75/jump-if-not-equal  $kernel-string-equal:false/disp8
     # ++s1, ++s2, ++i
   41/inc-ECX
   46/inc-ESI
   47/inc-EDI
   # end while
-  eb/jump  $kernel_string_loop/disp8
-$kernel_string_break:
+  eb/jump  $kernel-string-equal:loop/disp8
+$kernel-string-equal:break:
   # if (*s/EDI == 0) return true
   b8/copy  0/imm32  # clear EAX
   8a/copy                         0/mod/indirect  7/rm32/EDI    .           .             .           0/r32/EAX   .               .                 # copy byte at *EDI to lower byte of EAX
   3d/compare-EAX  0/imm32
-  75/jump-if-not-equal  $kernel_string_fail/disp8
+  75/jump-if-not-equal  $kernel-string-equal:false/disp8
+$kernel-string-equal:true:
   b8/copy                         .               .             .           .             .           .           .               1/imm32           # copy to EAX
-  eb/jump  $kernel_string_end/disp8
+  eb/jump  $kernel-string-equal:end/disp8
   # return false
-$kernel_string_fail:
+$kernel-string-equal:false:
   b8/copy                         .               .             .           .             .           .           .               0/imm32           # copy to EAX
 
-$kernel_string_end:
+$kernel-string-equal:end:
   # restore registers
   5f/pop-to-EDI
   5e/pop-to-ESI
@@ -111,151 +112,151 @@ $kernel_string_end:
 
 ## tests
 
-test_compare_null_kernel_string_with_empty_array:
-  # EAX = kernel_string_equal(Null_kernel_string, "")
+test-compare-null-kernel-string-with-empty-array:
+  # EAX = kernel-string-equal(Null-kernel-string, "")
     # push args
   68/push  ""/imm32
-  68/push  Null_kernel_string/imm32
+  68/push  Null-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 1, msg)
+  # call check-ints-equal(EAX, 1, msg)
     # push args
-  68/push  "F - test_compare_null_kernel_string_with_empty_array"/imm32
+  68/push  "F - test-compare-null-kernel-string-with-empty-array"/imm32
   68/push  1/imm32/true
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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_compare_null_kernel_string_with_non_empty_array:
-  # EAX = kernel_string_equal(Null_kernel_string, "Abc")
+test-compare-null-kernel-string-with-non-empty-array:
+  # EAX = kernel-string-equal(Null-kernel-string, "Abc")
     # push args
   68/push  "Abc"/imm32
-  68/push  Null_kernel_string/imm32
+  68/push  Null-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 0, msg)
+  # call check-ints-equal(EAX, 0, msg)
     # push args
-  68/push  "F - test_compare_null_kernel_string_with_non_empty_array"/imm32
+  68/push  "F - test-compare-null-kernel-string-with-non-empty-array"/imm32
   68/push  0/imm32/false
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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_compare_kernel_string_with_equal_array:
-  # EAX = kernel_string_equal(Abc_kernel_string, "Abc")
+test-compare-kernel-string-with-equal-array:
+  # EAX = kernel-string-equal(Abc-kernel-string, "Abc")
     # push args
   68/push  "Abc"/imm32
-  68/push  Abc_kernel_string/imm32
+  68/push  Abc-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 1, msg)
+  # call check-ints-equal(EAX, 1, msg)
     # push args
-  68/push  "F - test_compare_kernel_string_with_equal_array"/imm32
+  68/push  "F - test-compare-kernel-string-with-equal-array"/imm32
   68/push  1/imm32/true
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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_compare_kernel_string_with_inequal_array:
-  # EAX = kernel_string_equal(Abc_kernel_string, "Adc")
+test-compare-kernel-string-with-inequal-array:
+  # EAX = kernel-string-equal(Abc-kernel-string, "Adc")
     # push args
   68/push  "Adc"/imm32
-  68/push  Abc_kernel_string/imm32
+  68/push  Abc-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 0, msg)
+  # call check-ints-equal(EAX, 0, msg)
     # push args
-  68/push  "F - test_compare_kernel_string_with_equal_array"/imm32
+  68/push  "F - test-compare-kernel-string-with-equal-array"/imm32
   68/push  0/imm32/false
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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_compare_kernel_string_with_empty_array:
-  # EAX = kernel_string_equal(Abc_kernel_string, "")
+test-compare-kernel-string-with-empty-array:
+  # EAX = kernel-string-equal(Abc-kernel-string, "")
     # push args
   68/push  ""/imm32
-  68/push  Abc_kernel_string/imm32
+  68/push  Abc-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 0)
+  # call check-ints-equal(EAX, 0)
     # push args
-  68/push  "F - test_compare_kernel_string_with_equal_array"/imm32
+  68/push  "F - test-compare-kernel-string-with-equal-array"/imm32
   68/push  0/imm32/false
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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_compare_kernel_string_with_shorter_array:
-  # EAX = kernel_string_equal(Abc_kernel_string, "Ab")
+test-compare-kernel-string-with-shorter-array:
+  # EAX = kernel-string-equal(Abc-kernel-string, "Ab")
     # push args
   68/push  "Ab"/imm32
-  68/push  Abc_kernel_string/imm32
+  68/push  Abc-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 0)
+  # call check-ints-equal(EAX, 0)
     # push args
-  68/push  "F - test_compare_kernel_string_with_shorter_array"/imm32
+  68/push  "F - test-compare-kernel-string-with-shorter-array"/imm32
   68/push  0/imm32/false
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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_compare_kernel_string_with_longer_array:
-  # EAX = kernel_string_equal(Abc_kernel_string, "Abcd")
+test-compare-kernel-string-with-longer-array:
+  # EAX = kernel-string-equal(Abc-kernel-string, "Abcd")
     # push args
   68/push  "Abcd"/imm32
-  68/push  Abc_kernel_string/imm32
+  68/push  Abc-kernel-string/imm32
     # call
-  e8/call  kernel_string_equal/disp32
+  e8/call  kernel-string-equal/disp32
     # discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  # call check_ints_equal(EAX, 0)
+  # call check-ints-equal(EAX, 0)
     # push args
-  68/push  "F - test_compare_kernel_string_with_longer_array"/imm32
+  68/push  "F - test-compare-kernel-string-with-longer-array"/imm32
   68/push  0/imm32/false
   50/push-EAX
     # call
-  e8/call  check_ints_equal/disp32
+  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
 
 == data
 
-Null_kernel_string:
+Null-kernel-string:
   00/null
-Abc_kernel_string:
+Abc-kernel-string:
   41/A 62/b 63/c 00/null
 
 # vim:nowrap:textwidth=0