reformat some word-on-heap definitions; change underscores to hyphens

having chewed on it, we still prefer kebab-case

Force-Push: yes
Change-Id: I6ec87be808a4060599d052e8698d677dba7d0134

1 files changed, 41 insertions, 40 deletions

diff --git a/quine.asm b/quine.asm
index b5822cb..5206368 100644
--- a/quine.asm
+++ b/quine.asm
@@ -2114,8 +2114,8 @@ cold_start:
   dq pack_next, lit, 8, packalign, early_here_store
 
   ; This was "unroll3".
-  dq litstring, "3unroll", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "3unroll", early_create, early_self_codeword
+  dq early_here, fetch
   dq rax, pop_reg64
   dq rbx, pop_reg64
   dq rcx, pop_reg64
@@ -2269,8 +2269,8 @@ cold_start:
   dq rax, push_reg64
   dq pack_next, lit, 8, packalign, early_here_store
 
-  dq litstring, "litstring", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "litstring", early_create, early_self_codeword
+  dq early_here, fetch
   dq rsi, push_reg64
   dq rsi, rdi, mov_reg64_reg64
   dq rax, rax, xor_reg64_reg64
@@ -2357,8 +2357,8 @@ cold_start:
   dq rbx, eax, mov_reg32_indirect_reg64
   dq pack_next, lit, 8, packalign, early_here_store
 
-  dq litstring, "memcopy", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "memcopy", early_create, early_self_codeword
+  dq early_here, fetch
   dq rsi, rdx, mov_reg64_reg64
   dq rcx, pop_reg64
   dq rsi, pop_reg64
@@ -2367,8 +2367,8 @@ cold_start:
   dq rdx, rsi, mov_reg64_reg64
   dq pack_next, lit, 8, packalign, early_here_store
 
-  dq litstring, "stringlen", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "stringlen", early_create, early_self_codeword
+  dq early_here, fetch
   dq rdi, pop_reg64
   dq rdi, rbx, mov_reg64_reg64
   dq rax, rax, xor_reg64_reg64
@@ -2387,8 +2387,8 @@ cold_start:
   dq pack_next, lit, 8, packalign, early_here_store
 
   ; This was "zbranch".
-  dq litstring, "0branch", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "0branch", early_create, early_self_codeword
+  dq early_here, fetch
   dq rax, pop_reg64
   dq rax, rax, test_reg64_reg64
   ; Retrieve the saved address for the start of "branch". Compute the
@@ -2403,24 +2403,27 @@ cold_start:
   dq lods64
   dq pack_next, lit, 8, packalign, early_here_store
 
-  dq litstring, "execute", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "execute", early_create, early_self_codeword
+  dq early_here, fetch
   dq rax, pop_reg64
   dq rax, jmp_abs_indirect_reg64
   dq lit, 8, packalign, early_here_store
 
+  ; This was "sys_exit".
+  ;
   ; This name is exactly eight bytes long. Don't even ask (go read litstring's
   ; code if you really need to know).
-  dq litstring, "sys_exit", 0, early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "sys-exit", 0, early_create, early_self_codeword
+  dq early_here, fetch
   dq lit, 60, rax, mov_reg64_imm64
   dq rdi, pop_reg64
   dq syscall
   dq hlt
   dq pack_next, lit, 8, packalign, early_here_store
 
-  dq litstring, "sys_write", early_create, early_self_codeword, early_here
-  dq fetch
+  ; This was "sys_write".
+  dq litstring, "sys-write", early_create, early_self_codeword
+  dq early_here, fetch
   dq rcx, pop_reg64
   dq rdx, pop_reg64
   dq rsi, push_reg64
@@ -2435,12 +2438,12 @@ cold_start:
   dq litstring, "dup", early_find, early_comma
   dq litstring, "stringlen", early_find, early_comma
   dq litstring, "swap", early_find, early_comma
-  dq litstring, "sys_write", early_find, early_comma
+  dq litstring, "sys-write", early_find, early_comma
   dq litstring, "exit", early_find, early_comma
   dq early_here, fetch, lit, 8, packalign, early_here_store
 
   dq litstring, "crash", early_create, early_self_codeword, early_here, fetch
-  ; TODO
+  dq hlt
   dq lit, 8, packalign, early_here_store
 
   ; We could in theory call this 64pack, by analogy to 32! and so on, but it's
@@ -2449,51 +2452,49 @@ cold_start:
   ; Also, unlike with ! we specify the size even for the 64-bit version,
   ; because the user of pack64 and its variants is always doing something
   ; where exact byte sizes are crucial.
-  dq litstring, "pack64", early_create, early_self_codeword, early_here, fetch
+  dq litstring, "pack64", early_create, early_docol_codeword
   ; TODO this is actually in Forth
-  dq lit, 8, packalign, early_here_store
+  dq early_here, fetch, lit, 8, packalign, early_here_store
 
-  dq litstring, "pack32", early_create, early_self_codeword, early_here, fetch
+  dq litstring, "pack32", early_create, early_docol_codeword
   ; TODO this is actually in Forth
-  dq lit, 8, packalign, early_here_store
+  dq early_here, fetch, lit, 8, packalign, early_here_store
 
-  dq litstring, "pack16", early_create, early_self_codeword, early_here, fetch
+  dq litstring, "pack16", early_create, early_docol_codeword
   ; TODO this is actually in Forth
-  dq lit, 8, packalign, early_here_store
+  dq early_here, fetch, lit, 8, packalign, early_here_store
 
-  dq litstring, "pack8", early_create, early_self_codeword, early_here, fetch
+  dq litstring, "pack8", early_create, early_docol_codeword
   ; TODO this is actually in Forth
-  dq lit, 8, packalign, early_here_store
+  dq early_here, fetch, lit, 8, packalign, early_here_store
 
-  dq litstring, "packstring", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "packstring", early_create, early_docol_codeword
   ; TODO this is actually in Forth
-  dq lit, 8, packalign, early_here_store
+  dq early_here, fetch, lit, 8, packalign, early_here_store
 
-  dq litstring, "packalign", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "packalign", early_create, early_docol_codeword
   ; TODO this is actually in Forth
-  dq lit, 8, packalign, early_here_store
+  dq early_here, fetch, lit, 8, packalign, early_here_store
 
-  dq litstring, "litpack64", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "litpack64", early_create, early_self_codeword
+  dq early_here, fetch
   ; TODO
   dq lit, 8, packalign, early_here_store
 
-  dq litstring, "litpack32", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "litpack32", early_create, early_self_codeword
+  dq early_here, fetch
   ; TODO
   dq lit, 8, packalign, early_here_store
 
-  dq litstring, "litpack16", early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "litpack16", early_create, early_self_codeword
+  dq early_here, fetch
   ; TODO
   dq lit, 8, packalign, early_here_store
 
   ; This name is exactly eight bytes long. Don't even ask (go read litstring's
   ; code if you really need to know).
-  dq litstring, "litpack8", 0, early_create, early_self_codeword, early_here
-  dq fetch
+  dq litstring, "litpack8", 0, early_create, early_self_codeword
+  dq early_here, fetch
   ; TODO
   dq lit, 8, packalign, early_here_store