implemented solution

1 files changed, 109 insertions, 1 deletions

diff --git a/subx/074print-int-decimal.subx b/subx/074print-int-decimal.subx
index cce8e21e..e5dbaa30 100644
--- a/subx/074print-int-decimal.subx
+++ b/subx/074print-int-decimal.subx
@@ -6,20 +6,128 @@
 # . 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
 
 #? Entry:  # run a single test, while debugging
-#?     e8/call test-print-int32-decimal/disp32
+#?     e8/call test-print-int32-decimal-negative/disp32
+#?
 #?     # syscall(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-to-EAX  1/imm32/exit
 #?     cd/syscall  0x80/imm8
 
 print-int32-decimal:  # out : (address stream), n : int32
+    # PSEUDOCODE
+    # based on K&R itoa: https://en.wikibooks.org/wiki/C_Programming/stdlib.h/itoa
+    # push SENTINAL
+    # if n >= 0:
+    #   goto digit-encode
+    # else:
+    #   n = -n
+    #   negative = true
+    # while true:
+    #   push n % 10 + '0'
+    #   n = n / 10
+    #   break if n == 0
+    # if negative:
+    #   push '-'
+    # while true:
+    #   EAX = pop
+    #   break if EAX == SENTINAL
+    #   out->data[out->write++] = EAX
+    #
     # . prolog
     55/push-EBP
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
     # . save registers
+    50/push-EAX
+    51/push-ECX
+    52/push-EDX
+    53/push-EBX
+    57/push-EDI
+
+    # negative = false
+    bf/copy-to-EDI  0/imm32                                                                                                                           # EDI = 0
+
+    # push sentinal for $append-loop
+    68/push-sentinel   0/imm32
+
+    # EAX = n
+    8b/copy                         1/mod/*+disp8   5/rm32/EBP    .           .             .           0/r32/EAX   0xc/disp8       .                 # EAX = *(EBP+12)
+    # if n >= 0 jump to digit-encode
+    3d/compare-EAX-and  0/imm32
+    7d/jump-if-greater-eq $digit-encode:prelude/disp8
+    # else
+    # n = -n
+    f7  3/subop/negate              3/mod/direct    0/rm32/EAX                                                                                        # EAX = -EAX
+
+    # negative = true
+    bf/copy-to-EDI  1/imm32                                                                                                                           # EDI = 1
+
+$digit-encode:prelude:
+    # EBX = n
+    8b/copy                         3/mod/direct    0/rm32/EAX    .           .             .           3/r32/EBX   .               .                 # EBX = EAX
+
+$digit-encode-loop:
+    # EAX = EBX(n)
+    89/copy                         3/mod/direct    0/rm32/EAX    .           .             .           3/r32/EBX   .               .                 # EAX = EBX
+    b9/copy-to-ECX    0xa/imm32
+    99/sign-extend-EAX-into-EDX
+    # EDX:EAX(n) / ECX(10)
+
+    # EDX, EAX = n % 10, n / 10
+    f7          7/subop/idiv        3/mod/direct    1/rm32/ECX    .           .             .           .           .               .                 # divide EDX:EAX by ECX, storing quotient in EAX and remainder in EDX
+    81          0/subop/add         3/mod/direct    2/rm32/EDX    .           .             .           .           .               0x30/imm32        # EDX += '0' (0x30)
+
+    # push n % 10 + '0'
+    52/push-EDX
+
+    # EBX = n / 10
+    89/copy                         3/mod/direct    3/rm32/EBX    .           .             .           0/r32/EAX   .               .                 # EBX = EAX
+
+    # loop if n / 10 > 0
+    3d/compare-EAX-and  0/imm32
+    7f/jump-if-greater $digit-encode-loop/disp8
+    # else:
+
+    8b/copy                         3/mod/direct    7/rm32/EDI    .           .             .           0/r32/EAX   .               .                 # EAX = EDX
+    # . if !negative: goto append-loop
+    3d/compare-EAX-and 0/imm32
+    74/jump-if-equal   $append-loop:prelude/disp8
+    # . else
+    68/push-negative   0x2d/imm32 # push '-'
+
+$append-loop:prelude:
+    # EBX = &out
+    8b/copy                         1/mod/*+disp8   5/rm32/EBP    .           .             .           3/r32/EBX   8/disp8         .                 # copy *(EBP+8) to EBX
+
+$append-loop:
+    # EAX = next_character
+    58/pop-to-EAX
+
+    3d/compare-EAX                  .               .             .           .             .           .           .               0/imm32           # EAX == 0
+    74/jump-if-equal   $append-loop:break/disp8
+
+    # ECX = out->write
+    8b/copy                         0/mod/indirect  3/rm32/EBX    .           .             .           1/r32/ECX   .               .                 # ECX = *EBX
+
+    # out->data[out->write] = next_character
+    # . ECX = &out->data[out->write]
+    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    3/base/EBX  1/index/ECX   .           1/r32/ECX   0xc/disp8       .                 # copy EBX+ECX+12 to ECX
+    # . out->data[out->write] = EAX
+    89/copy                         0/mod/indirect  1/rm32/ECX    .           .             .           0/r32/ECX  .                .                 # *ECX = EAX
+
+    # out->write++
+    ff          0/subop/increment   0/mod/indirect  3/rm32/EBX    .           .             .           .           .               .                 # (*EBX)++
+    eb/jump $append-loop/disp8
+
+$append-loop:break:
+
 $print-int32-decimal:end:
     # . reclaim locals
     # . restore registers
+    57/pop-to-EDI
+    5b/pop-to-EBX
+    5a/pop-to-EDX
+    59/pop-to-ECX
+    58/pop-to-EAX
     # . epilog
     89/copy                         3/mod/direct    4/rm32/ESP    .           .             .           5/r32/EBP   .               .                 # copy EBP to ESP
     5d/pop-to-EBP