diff options
| -rw-r--r-- | 066write-int-hex.subx | 22 | ||||
| -rw-r--r-- | 103screen.subx | 4 | ||||
| -rwxr-xr-x | apps/assort | bin | 44400 -> 44404 bytes | |||
| -rwxr-xr-x | apps/braces | bin | 46263 -> 46267 bytes | |||
| -rwxr-xr-x | apps/calls | bin | 50910 -> 50914 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1 | bin | 43741 -> 43745 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1b | bin | 44288 -> 44292 bytes | |||
| -rwxr-xr-x | apps/dquotes | bin | 48022 -> 48026 bytes | |||
| -rw-r--r-- | apps/dquotes.subx | 4 | ||||
| -rwxr-xr-x | apps/factorial | bin | 42844 -> 42848 bytes | |||
| -rwxr-xr-x | apps/hex | bin | 46580 -> 46584 bytes | |||
| -rwxr-xr-x | apps/mu | bin | 341142 -> 341146 bytes | |||
| -rw-r--r-- | apps/mu.subx | 2 | ||||
| -rwxr-xr-x | apps/pack | bin | 56979 -> 56983 bytes | |||
| -rwxr-xr-x | apps/sigils | bin | 58632 -> 58636 bytes | |||
| -rwxr-xr-x | apps/survey | bin | 54332 -> 54336 bytes | |||
| -rw-r--r-- | apps/survey.subx | 16 | ||||
| -rwxr-xr-x | apps/tests | bin | 43172 -> 43176 bytes |
18 files changed, 24 insertions, 24 deletions
diff --git a/066write-int-hex.subx b/066write-int-hex.subx index b1909940..eb3e48c4 100644 --- a/066write-int-hex.subx +++ b/066write-int-hex.subx @@ -175,7 +175,7 @@ test-write-byte-hex-buffered: # . end c3/return -print-int32: # f: (addr stream byte), n: int +write-int32-hex: # f: (addr stream byte), n: int # pseudocode: # write(f, "0x") # ecx = 28 @@ -194,7 +194,7 @@ print-int32: # f: (addr stream byte), n: int 51/push-ecx # ecx = 28 b9/copy-to-ecx 0x1c/imm32 -$print-int32:print-hex-prefix: +$write-int32-hex:print-hex-prefix: # write(f, "0x") # . . push args 68/push "0x"/imm32 @@ -203,10 +203,10 @@ $print-int32:print-hex-prefix: e8/call write/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp -$print-int32:loop: +$write-int32-hex:loop: # if (ecx < 0) break 81 7/subop/compare 3/mod/direct 1/rm32/ecx . . . . . 0/imm32 # compare ecx - 7c/jump-if-< $print-int32:end/disp8 + 7c/jump-if-< $write-int32-hex:end/disp8 # eax = n >> ecx 8b/copy 1/mod/*+disp8 5/rm32/ebp . . . 0/r32/eax 0xc/disp8 . # copy *(ebp+12) to eax d3/>>ecx 5/subop/pad-zeroes 3/mod/direct 0/rm32/eax . . . . . . # shift eax right by ecx bits, padding zeroes @@ -223,8 +223,8 @@ $print-int32:loop: 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # ecx -= 4 81 5/subop/subtract 3/mod/direct 1/rm32/ecx . . . . . 4/imm32 # subtract from ecx - eb/jump $print-int32:loop/disp8 -$print-int32:end: + eb/jump $write-int32-hex:loop/disp8 +$write-int32-hex:end: # . restore registers 59/pop-to-ecx 58/pop-to-eax @@ -233,8 +233,8 @@ $print-int32:end: 5d/pop-to-ebp c3/return -test-print-int32: - # - check that print-int32 prints the hex textual representation +test-write-int32-hex: + # - check that write-int32-hex prints the hex textual representation # setup # . clear-stream(_test-stream) # . . push args @@ -243,17 +243,17 @@ test-print-int32: e8/call clear-stream/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp - # print-int32(_test-stream, 0x8899aa) + # write-int32-hex(_test-stream, 0x8899aa) # . . push args 68/push 0x8899aa/imm32 68/push _test-stream/imm32 # . . call - e8/call print-int32/disp32 + e8/call write-int32-hex/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # check-stream-equal(_test-stream, "0x008899aa", msg) # . . push args - 68/push "F - test-print-int32"/imm32 + 68/push "F - test-write-int32-hex"/imm32 68/push "0x008899aa"/imm32 68/push _test-stream/imm32 # . . call diff --git a/103screen.subx b/103screen.subx index 5ad27acb..0b9371a6 100644 --- a/103screen.subx +++ b/103screen.subx @@ -154,14 +154,14 @@ $print-byte:end: c3/return # just because Mu has no support for global variables yet -print-int32-to-screen: # n: int +write-int32-hex-to-screen: # n: int # . prologue 55/push-ebp 89/<- %ebp 4/r32/esp # (write-int32-hex-buffered Stdout *(ebp+8)) (flush Stdout) -$print-int32-to-screen:end: +$write-int32-hex-to-screen:end: # . epilogue 89/<- %esp 5/r32/ebp 5d/pop-to-ebp diff --git a/apps/assort b/apps/assort index f57b0183..e86d5472 100755 --- a/apps/assort +++ b/apps/assort Binary files differdiff --git a/apps/braces b/apps/braces index 46af2437..e208f3de 100755 --- a/apps/braces +++ b/apps/braces Binary files differdiff --git a/apps/calls b/apps/calls index 5adaaa4f..63624be8 100755 --- a/apps/calls +++ b/apps/calls Binary files differdiff --git a/apps/crenshaw2-1 b/apps/crenshaw2-1 index 00cb2e16..b79a6253 100755 --- a/apps/crenshaw2-1 +++ b/apps/crenshaw2-1 Binary files differdiff --git a/apps/crenshaw2-1b b/apps/crenshaw2-1b index f9aa2c32..d0e31bf7 100755 --- a/apps/crenshaw2-1b +++ b/apps/crenshaw2-1b Binary files differdiff --git a/apps/dquotes b/apps/dquotes index 6710aafc..c0b11177 100755 --- a/apps/dquotes +++ b/apps/dquotes Binary files differdiff --git a/apps/dquotes.subx b/apps/dquotes.subx index db93830a..eb355fd4 100644 --- a/apps/dquotes.subx +++ b/apps/dquotes.subx @@ -915,12 +915,12 @@ $emit-string-literal-data:emit-length: # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # print(out, "#{len}/imm32 ") - # . print-int32(out, len) + # . write-int32-hex(out, len) # . . push args 50/push-eax ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp . . . . 8/disp8 . # push *(ebp+8) # . . call - e8/call print-int32/disp32 + e8/call write-int32-hex/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # . write(out, "/imm32 ") diff --git a/apps/factorial b/apps/factorial index 75195683..3c35ab6a 100755 --- a/apps/factorial +++ b/apps/factorial Binary files differdiff --git a/apps/hex b/apps/hex index c904d808..e59ab578 100755 --- a/apps/hex +++ b/apps/hex Binary files differdiff --git a/apps/mu b/apps/mu index 1f9f76ab..4fe31095 100755 --- a/apps/mu +++ b/apps/mu Binary files differdiff --git a/apps/mu.subx b/apps/mu.subx index 391dee3c..ef830b10 100644 --- a/apps/mu.subx +++ b/apps/mu.subx @@ -7817,7 +7817,7 @@ new-block-name: # fn: (addr function), out: (addr handle var) (write %edx "$") (write %edx %eax) (write %edx ":") - (print-int32 %edx *Next-block-index) + (write-int32-hex %edx *Next-block-index) ff 0/subop/increment *Next-block-index # var s/eax: slice = {name->data, name->data + name->write} (clobbering edx) # . eax = name->write diff --git a/apps/pack b/apps/pack index 8819e5dc..e5abcd4e 100755 --- a/apps/pack +++ b/apps/pack Binary files differdiff --git a/apps/sigils b/apps/sigils index e897306a..46c21b5a 100755 --- a/apps/sigils +++ b/apps/sigils Binary files differdiff --git a/apps/survey b/apps/survey index 4226811f..ed2dcf08 100755 --- a/apps/survey +++ b/apps/survey Binary files differdiff --git a/apps/survey.subx b/apps/survey.subx index d9ae3257..80c5194e 100644 --- a/apps/survey.subx +++ b/apps/survey.subx @@ -3628,12 +3628,12 @@ trace-sssns: # s1: (addr array byte), s2: (addr array byte), s3: (addr array by e8/call write/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # print-int32(*Trace-stream, n4) + # write-int32-hex(*Trace-stream, n4) # . . push args ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp . . . . 0x14/disp8 . # push *(ebp+20) ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 . . . Trace-stream/disp32 # push *Trace-stream # . . call - e8/call print-int32/disp32 + e8/call write-int32-hex/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # trace(s5) # implicitly adds a newline and finalizes the trace line @@ -3719,12 +3719,12 @@ trace-snsns: # s1: (addr array byte), n2: int, s3: (addr array byte), n4: int, e8/call write/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # print-int32(*Trace-stream, n2) + # write-int32-hex(*Trace-stream, n2) # . . push args ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp . . . . 0xc/disp8 . # push *(ebp+12) ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 . . . Trace-stream/disp32 # push *Trace-stream # . . call - e8/call print-int32/disp32 + e8/call write-int32-hex/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # write(*Trace-stream, s3) @@ -3735,12 +3735,12 @@ trace-snsns: # s1: (addr array byte), n2: int, s3: (addr array byte), n4: int, e8/call write/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # print-int32(*Trace-stream, n4) + # write-int32-hex(*Trace-stream, n4) # . . push args ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp . . . . 0x14/disp8 . # push *(ebp+20) ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 . . . Trace-stream/disp32 # push *Trace-stream # . . call - e8/call print-int32/disp32 + e8/call write-int32-hex/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # trace(s5) # implicitly adds a newline and finalizes the trace line @@ -3967,12 +3967,12 @@ trace-slsns: # s1: (addr array byte), l2: (addr slice), s3: (addr array byte), e8/call write/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # print-int32(*Trace-stream, n4) + # write-int32-hex(*Trace-stream, n4) # . . push args ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp . . . . 0x14/disp8 . # push *(ebp+20) ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 . . . Trace-stream/disp32 # push *Trace-stream # . . call - e8/call print-int32/disp32 + e8/call write-int32-hex/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp # trace(s5) # implicitly adds a newline and finalizes the trace line diff --git a/apps/tests b/apps/tests index 9e93e6a3..581e5135 100755 --- a/apps/tests +++ b/apps/tests Binary files differ |