From ecf919437499aa6ff02f19f070746a5c85bf792b Mon Sep 17 00:00:00 2001 From: Dmitry Petukhov Date: Fri, 11 Oct 2019 12:55:07 +0500 Subject: [PATCH 1/5] shave another 4 bytes from stage0 monitor bu using `TRUE R11` for toggle --- stage0/stage0_monitor.hex0 | 30 +++++++++++++++--------------- stage0/stage0_monitor.s | 4 ++-- test/SHA256SUMS | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stage0/stage0_monitor.hex0 b/stage0/stage0_monitor.hex0 index d9fdbe0..64608e1 100644 --- a/stage0/stage0_monitor.hex0 +++ b/stage0/stage0_monitor.hex0 @@ -15,7 +15,7 @@ ## along with stage0. If not, see . # :start ; offset = 0 -E0002D2B0001 # LOADUI R11 1 ; Our toggle +0D00003B # TRUE R11 ; Our toggle E0002D2D0600 # LOADUI R13 0x600 ; Where we are starting our Stack # ;; R14 will be storing our condition 0D00002F # FALSE R15 ; Our holder @@ -28,7 +28,7 @@ E0002D201100 # LOADUI R0 0x1100 E0002D201101 # LOADUI R0 0x1101 42100001 # FOPEN_WRITE -# :loop ; offset = 24 +# :loop ; offset = 22 0D000021 # FALSE R1 ; Read from tty 42100100 # FGETC ; Read a Char E000A030000d # CMPSKIPI.NE R0 13 ; Replace all CR @@ -38,17 +38,17 @@ E0002D20000a # LOADUI R0 10 ; WIth LF # ;; Check for Ctrl-D E000A0300004 # CMPSKIPI.NE R0 4 -3C000110 # JUMP @finish +3C00010e # JUMP @finish # ;; Check for EOF -E0002CC0010a # JUMP.NP R0 @finish +E0002CC00108 # JUMP.NP R0 @finish # ;; Write out unprocessed byte E0002D211101 # LOADUI R1 0x1101 ; Write to TAPE_02 42100200 # FPUTC ; Print the Char # ;; Convert byte to nybble -E0002D0D003e # CALLI R13 @hex ; Convert it +E0002D0D003c # CALLI R13 @hex ; Convert it # ;; Get another byte if nonhex E0002CC0ffc2 # JUMP.NP R0 @loop ; Don't use nonhex chars @@ -62,18 +62,18 @@ E100B0F0000f # ANDI R15 R0 0x0F ; Store First nibble 3C00ffae # JUMP @loop # ;; Combined second nybble in pair with first -# :second_nybble ; offset = 76 +# :second_nybble ; offset = 74 E0002D5F0004 # SL0I R15 4 ; Shift our first nibble E100B000000f # ANDI R0 R0 0x0F ; Mask out top 0500000F # ADD R0 R0 R15 ; Combine nibbles # ;; Writeout and prepare for next cycle -E0002D1B0001 # LOADI R11 1 ; Flip the toggle +0D00003B # TRUE R11 ; Flip the toggle E0002D211100 # LOADUI R1 0x1100 ; Write the combined byte 42100200 # FPUTC ; To TAPE_01 -3C00ff8a # JUMP @loop ; Try to get more bytes +3C00ff8c # JUMP @loop ; Try to get more bytes -# :hex ; offset = 9a +# :hex ; offset = 96 # ;; Deal with line comments starting with # E1001FE00023 # CMPUI R14 R0 35 E0002C5E007e # JUMP.E R14 @ascii_comment @@ -109,23 +109,23 @@ E0002C7E000e # JUMP.LE R14 @ascii_low # ;; Ignore the rest 3C00001e # JUMP @ascii_other -# :ascii_num ; offset = FD +# :ascii_num ; offset = FA E10011000030 # SUBUI R0 R0 48 0D01001D # RET R13 -# :ascii_low ; offset = 108 +# :ascii_low ; offset = 104 E10011000057 # SUBUI R0 R0 87 0D01001D # RET R13 -# :ascii_high ; offset = 112 +# :ascii_high ; offset = 102 E10011000037 # SUBUI R0 R0 55 0D01001D # RET R13 -# :ascii_other ; offset = 11c +# :ascii_other ; offset = 118 0D000030 # TRUE R0 0D01001D # RET R13 -# :ascii_comment ; offset = 124 +# :ascii_comment ; offset = 120 0D000021 # FALSE R1 ; Read from tty 42100100 # FGETC ; Read another char E000A030000d # CMPSKIPI.NE R0 13 ; Replace all CR @@ -137,7 +137,7 @@ E0002D211101 # LOADUI R1 0x1101 ; Write to TAPE_02 E0002C6Effd2 # JUMP.NE R14 @ascii_comment ; Otherwise keep looping 3C00ffc6 # JUMP @ascii_other -# :finish ; offset = 156 +# :finish ; offset = 152 E0002D201100 # LOADUI R0 0x1100 ; Close TAPE_01 42100002 # FCLOSE E0002D201101 # LOADUI R0 0x1101 ; Close TAPE_02 diff --git a/stage0/stage0_monitor.s b/stage0/stage0_monitor.s index 746f6ca..cbef651 100644 --- a/stage0/stage0_monitor.s +++ b/stage0/stage0_monitor.s @@ -15,7 +15,7 @@ ; along with stage0. If not, see . :start - LOADUI R11 1 ; Our toggle + TRUE R11 ; Our toggle LOADUI R13 0x600 ; Where we are starting our Stack ;; R14 will be storing our condition FALSE R15 ; Our holder @@ -69,7 +69,7 @@ ADD R0 R0 R15 ; Combine nibbles ;; Writeout and prepare for next cycle - LOADI R11 1 ; Flip the toggle + TRUE R11 ; Flip the toggle LOADUI R1 0x1100 ; Write the combined byte FPUTC ; To TAPE_01 JUMP @loop ; Try to get more bytes diff --git a/test/SHA256SUMS b/test/SHA256SUMS index 5741dbd..91b7ce3 100644 --- a/test/SHA256SUMS +++ b/test/SHA256SUMS @@ -5,7 +5,7 @@ f4bbf9e9c4828170d0c153ac265382dc705643f95efd2a029243326d426be5a4 roms/forth 2b80849180d5fb3757bcca2471b6337808e5b5ca80b18d93fa82ddef0435b84b roms/lisp 3020b194ead31ae19ba66fc35ed95465514373f6005896350d1608c9efabbdca roms/M0 059d38e34275029f2de5f600f08fe01bd13cd173f7da58e3fbec7114074beff2 roms/SET -792e2be913921dd55a28f55dcf2e6b1523d34fdbccc27c38f77e74c99ef97a4b roms/stage0_monitor +cd2e30b50ad0d9587573d35d8b5153a0ba435beeee6f56c3dfe29b986ab4f7b3 roms/stage0_monitor 13b45134a88c1c6db349cb40f82269cee9edfce71ac644dc0e137bad053bf5ce roms/stage1_assembler-0 156f555fce5b02f52445652b1ed0b443295706cdfbe23c5a021bd4efc77179bb roms/stage1_assembler-1 2c02c50958f489a660a4915d2a9e207a0c61f411d42628bdaf4dcf6bf7149a9d roms/stage1_assembler-2 From c9232a21c7c5bdc1df55b9e2ed4e8e6128078296 Mon Sep 17 00:00:00 2001 From: Dmitry Petukhov Date: Fri, 11 Oct 2019 17:06:08 +0500 Subject: [PATCH 2/5] reduce stage0_monitor size by 6 bytes (put often used values in regs) --- stage0/stage0_monitor.hex0 | 64 +++++++++++++++++++++----------------- stage0/stage0_monitor.s | 32 +++++++++++-------- test/SHA256SUMS | 2 +- 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/stage0/stage0_monitor.hex0 b/stage0/stage0_monitor.hex0 index 64608e1..d258774 100644 --- a/stage0/stage0_monitor.hex0 +++ b/stage0/stage0_monitor.hex0 @@ -15,20 +15,25 @@ ## along with stage0. If not, see . # :start ; offset = 0 -0D00003B # TRUE R11 ; Our toggle -E0002D2D0600 # LOADUI R13 0x600 ; Where we are starting our Stack + +0D00003C # TRUE R12 ; Our toggle, set to -1 (0xFFFFFFFF) + +# ;; Prepare often-used values that will be held in registers +090001AC # ABS R10 R12 ; Set R10 to 1 +E0002D2B1100 # LOADUI R11 0x1100 ; R11 will hold 0x1100 +090004DB # COPY R13 R11 ; Stack will start at 0x1100 # ;; R14 will be storing our condition 0D00002F # FALSE R15 ; Our holder # ;; Prep TAPE_01 -E0002D201100 # LOADUI R0 0x1100 +0900040B # COPY R0 R11 ; 0x1100 42100001 # FOPEN_WRITE # ;; Prep TAPE_02 -E0002D201101 # LOADUI R0 0x1101 +050210BA # OR R0 R11 R10 ; 0x1101 42100001 # FOPEN_WRITE -# :loop ; offset = 22 +# :loop ; offset = 26 0D000021 # FALSE R1 ; Read from tty 42100100 # FGETC ; Read a Char E000A030000d # CMPSKIPI.NE R0 13 ; Replace all CR @@ -36,44 +41,47 @@ E0002D20000a # LOADUI R0 10 ; WIth LF 42100200 # FPUTC ; Display the Char to User # ;; Check for Ctrl-D - E000A0300004 # CMPSKIPI.NE R0 4 -3C00010e # JUMP @finish +3C000108 # JUMP @finish # ;; Check for EOF -E0002CC00108 # JUMP.NP R0 @finish +E0002CC00102 # JUMP.NP R0 @finish # ;; Write out unprocessed byte -E0002D211101 # LOADUI R1 0x1101 ; Write to TAPE_02 +050211BA # OR R1 R11 R10 ; Write to TAPE_02 42100200 # FPUTC ; Print the Char # ;; Convert byte to nybble -E0002D0D003c # CALLI R13 @hex ; Convert it +E0002D0D003a # CALLI R13 @hex ; Convert it # ;; Get another byte if nonhex -E0002CC0ffc2 # JUMP.NP R0 @loop ; Don't use nonhex chars +E0002CC0ffc4 # JUMP.NP R0 @loop ; Don't use nonhex chars # ;; Deal with the case of second nybble -E0002C9B000e # JUMP.Z R11 @second_nybble ; Jump if toggled +E0002C9C000e # JUMP.Z R12 @second_nybble ; Jump if toggled # ;; Process first byte of pair E100B0F0000f # ANDI R15 R0 0x0F ; Store First nibble -0D00002B # FALSE R11 ; Flip the toggle -3C00ffae # JUMP @loop +0D00002C # FALSE R12 ; Flip the toggle +3C00ffb0 # JUMP @loop # ;; Combined second nybble in pair with first -# :second_nybble ; offset = 74 + +# :second_nybble ; offset = 76 E0002D5F0004 # SL0I R15 4 ; Shift our first nibble E100B000000f # ANDI R0 R0 0x0F ; Mask out top 0500000F # ADD R0 R0 R15 ; Combine nibbles # ;; Writeout and prepare for next cycle -0D00003B # TRUE R11 ; Flip the toggle -E0002D211100 # LOADUI R1 0x1100 ; Write the combined byte -42100200 # FPUTC ; To TAPE_01 -3C00ff8c # JUMP @loop ; Try to get more bytes +0D00003C # TRUE R12 ; Flip the toggle + +# ; Write the combined byte +0900041B # COPY R1 R11 ; To TAPE_01 +42100200 # FPUTC +3C00ff90 # JUMP @loop ; Try to get more bytes # :hex ; offset = 96 + # ;; Deal with line comments starting with # E1001FE00023 # CMPUI R14 R0 35 E0002C5E007e # JUMP.E R14 @ascii_comment @@ -107,9 +115,9 @@ E1001FE00066 # CMPUI R14 R0 102 E0002C7E000e # JUMP.LE R14 @ascii_low # ;; Ignore the rest -3C00001e # JUMP @ascii_other +3C00001e # JUMP @ascii_other -# :ascii_num ; offset = FA +# :ascii_num ; offset = fa E10011000030 # SUBUI R0 R0 48 0D01001D # RET R13 @@ -117,7 +125,7 @@ E10011000030 # SUBUI R0 R0 48 E10011000057 # SUBUI R0 R0 87 0D01001D # RET R13 -# :ascii_high ; offset = 102 +# :ascii_high ; offset = 10e E10011000037 # SUBUI R0 R0 55 0D01001D # RET R13 @@ -132,14 +140,14 @@ E000A030000d # CMPSKIPI.NE R0 13 ; Replace all CR E0002D20000a # LOADUI R0 10 ; WIth LF 42100200 # FPUTC ; Let the user see it E1001FE0000a # CMPUI R14 R0 10 ; Stop at the end of line -E0002D211101 # LOADUI R1 0x1101 ; Write to TAPE_02 +050211BA # OR R1 R11 R10 ; Write to TAPE_02 42100200 # FPUTC ; The char we just read -E0002C6Effd2 # JUMP.NE R14 @ascii_comment ; Otherwise keep looping -3C00ffc6 # JUMP @ascii_other +E0002C6Effd4 # JUMP.NE R14 @ascii_comment ; Otherwise keep looping +3C00ffc8 # JUMP @ascii_other -# :finish ; offset = 152 -E0002D201100 # LOADUI R0 0x1100 ; Close TAPE_01 +# :finish ; offset = 150 +0900040B # COPY R0 R11 ; Close TAPE_01 42100002 # FCLOSE -E0002D201101 # LOADUI R0 0x1101 ; Close TAPE_02 +050210BA # OR R0 R11 R10 ; Close TAPE_02 42100002 # FCLOSE FFFFFFFF # HALT diff --git a/stage0/stage0_monitor.s b/stage0/stage0_monitor.s index cbef651..c47a809 100644 --- a/stage0/stage0_monitor.s +++ b/stage0/stage0_monitor.s @@ -15,17 +15,22 @@ ; along with stage0. If not, see . :start - TRUE R11 ; Our toggle - LOADUI R13 0x600 ; Where we are starting our Stack + TRUE R12 ; Our toggle, set to -1 (0xFFFFFFFF) + + ;; Prepare often-used values that will be held in registers + ABS R10 R12 ; Set R10 to 1 + LOADUI R11 0x1100 ; R11 will hold 0x1100 + + COPY R13 R11 ; Stack will start at 0x1100 ;; R14 will be storing our condition FALSE R15 ; Our holder ;; Prep TAPE_01 - LOADUI R0 0x1100 + COPY R0 R11 ; 0x1100 FOPEN_WRITE ;; Prep TAPE_02 - LOADUI R0 0x1101 + OR R0 R11 R10 ; 0x1101 FOPEN_WRITE :loop @@ -45,7 +50,7 @@ JUMP.NP R0 @finish ;; Write out unprocessed byte - LOADUI R1 0x1101 ; Write to TAPE_02 + OR R1 R11 R10 ; Write to TAPE_02 FPUTC ; Print the Char ;; Convert byte to nybble @@ -55,11 +60,11 @@ JUMP.NP R0 @loop ; Don't use nonhex chars ;; Deal with the case of second nybble - JUMP.Z R11 @second_nybble ; Jump if toggled + JUMP.Z R12 @second_nybble ; Jump if toggled ;; Process first byte of pair ANDI R15 R0 0x0F ; Store First nibble - FALSE R11 ; Flip the toggle + FALSE R12 ; Flip the toggle JUMP @loop ;; Combined second nybble in pair with first @@ -69,9 +74,10 @@ ADD R0 R0 R15 ; Combine nibbles ;; Writeout and prepare for next cycle - TRUE R11 ; Flip the toggle - LOADUI R1 0x1100 ; Write the combined byte - FPUTC ; To TAPE_01 + TRUE R12 ; Flip the toggle + ; Write the combined byte + COPY R1 R11 ; To TAPE_01 + FPUTC JUMP @loop ; Try to get more bytes :hex @@ -121,14 +127,14 @@ LOADUI R0 10 ; WIth LF FPUTC ; Let the user see it CMPUI R14 R0 10 ; Stop at the end of line - LOADUI R1 0x1101 ; Write to TAPE_02 + OR R1 R11 R10 ; Write to TAPE_02 FPUTC ; The char we just read JUMP.NE R14 @ascii_comment ; Otherwise keep looping JUMP @ascii_other :finish - LOADUI R0 0x1100 ; Close TAPE_01 + COPY R0 R11 ; Close TAPE_01 FCLOSE - LOADUI R0 0x1101 ; Close TAPE_02 + OR R0 R11 R10 ; Close TAPE_02 FCLOSE HALT diff --git a/test/SHA256SUMS b/test/SHA256SUMS index 91b7ce3..80e2260 100644 --- a/test/SHA256SUMS +++ b/test/SHA256SUMS @@ -5,7 +5,7 @@ f4bbf9e9c4828170d0c153ac265382dc705643f95efd2a029243326d426be5a4 roms/forth 2b80849180d5fb3757bcca2471b6337808e5b5ca80b18d93fa82ddef0435b84b roms/lisp 3020b194ead31ae19ba66fc35ed95465514373f6005896350d1608c9efabbdca roms/M0 059d38e34275029f2de5f600f08fe01bd13cd173f7da58e3fbec7114074beff2 roms/SET -cd2e30b50ad0d9587573d35d8b5153a0ba435beeee6f56c3dfe29b986ab4f7b3 roms/stage0_monitor +49ccb24650f9112f71f487b1956418efa511b7fa61f8abf40420ff833dcd959b roms/stage0_monitor 13b45134a88c1c6db349cb40f82269cee9edfce71ac644dc0e137bad053bf5ce roms/stage1_assembler-0 156f555fce5b02f52445652b1ed0b443295706cdfbe23c5a021bd4efc77179bb roms/stage1_assembler-1 2c02c50958f489a660a4915d2a9e207a0c61f411d42628bdaf4dcf6bf7149a9d roms/stage1_assembler-2 From d21dc971d11a6f78a555c784f9dc2ff027614a37 Mon Sep 17 00:00:00 2001 From: Dmitry Petukhov Date: Sat, 12 Oct 2019 02:27:58 +0500 Subject: [PATCH 3/5] leave stack at zero; to not do FALSE R15 because it is zero on start --- stage0/stage0_monitor.hex0 | 34 ++++++++++++++++++++++------------ stage0/stage0_monitor.s | 15 ++++++++++++--- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/stage0/stage0_monitor.hex0 b/stage0/stage0_monitor.hex0 index d258774..d680dc4 100644 --- a/stage0/stage0_monitor.hex0 +++ b/stage0/stage0_monitor.hex0 @@ -21,9 +21,19 @@ # ;; Prepare often-used values that will be held in registers 090001AC # ABS R10 R12 ; Set R10 to 1 E0002D2B1100 # LOADUI R11 0x1100 ; R11 will hold 0x1100 -090004DB # COPY R13 R11 ; Stack will start at 0x1100 - # ;; R14 will be storing our condition -0D00002F # FALSE R15 ; Our holder + # + # ;; R14 will be storing our condition + # ;; + # ;; R13 will be a stack pointer. It will be zero + # ;; on the start, and the stack grows up. + # ;; This means that when stack is used, the + # ;; first instructions of this program will be + # ;; overwritten. But because this is initialization + # ;; code, it is already not used at the time. + # ;; And the stack usage is fixed - there is only one CALL + # ;; instruction in this file + # ;; + # ;; R15 Is our holder. It is initialized to zero on start. # ;; Prep TAPE_01 0900040B # COPY R0 R11 ; 0x1100 @@ -33,7 +43,7 @@ E0002D2B1100 # LOADUI R11 0x1100 ; R11 will hold 0x1100 050210BA # OR R0 R11 R10 ; 0x1101 42100001 # FOPEN_WRITE -# :loop ; offset = 26 +# :loop ; offset = 1e 0D000021 # FALSE R1 ; Read from tty 42100100 # FGETC ; Read a Char E000A030000d # CMPSKIPI.NE R0 13 ; Replace all CR @@ -67,7 +77,7 @@ E100B0F0000f # ANDI R15 R0 0x0F ; Store First nibble # ;; Combined second nybble in pair with first -# :second_nybble ; offset = 76 +# :second_nybble ; offset = 6e E0002D5F0004 # SL0I R15 4 ; Shift our first nibble E100B000000f # ANDI R0 R0 0x0F ; Mask out top 0500000F # ADD R0 R0 R15 ; Combine nibbles @@ -80,7 +90,7 @@ E100B000000f # ANDI R0 R0 0x0F ; Mask out top 42100200 # FPUTC 3C00ff90 # JUMP @loop ; Try to get more bytes -# :hex ; offset = 96 +# :hex ; offset = 8e # ;; Deal with line comments starting with # E1001FE00023 # CMPUI R14 R0 35 @@ -117,23 +127,23 @@ E0002C7E000e # JUMP.LE R14 @ascii_low # ;; Ignore the rest 3C00001e # JUMP @ascii_other -# :ascii_num ; offset = fa +# :ascii_num ; offset = f2 E10011000030 # SUBUI R0 R0 48 0D01001D # RET R13 -# :ascii_low ; offset = 104 +# :ascii_low ; offset = fc E10011000057 # SUBUI R0 R0 87 0D01001D # RET R13 -# :ascii_high ; offset = 10e +# :ascii_high ; offset = 106 E10011000037 # SUBUI R0 R0 55 0D01001D # RET R13 -# :ascii_other ; offset = 118 +# :ascii_other ; offset = 110 0D000030 # TRUE R0 0D01001D # RET R13 -# :ascii_comment ; offset = 120 +# :ascii_comment ; offset = 118 0D000021 # FALSE R1 ; Read from tty 42100100 # FGETC ; Read another char E000A030000d # CMPSKIPI.NE R0 13 ; Replace all CR @@ -145,7 +155,7 @@ E1001FE0000a # CMPUI R14 R0 10 ; Stop at the end of line E0002C6Effd4 # JUMP.NE R14 @ascii_comment ; Otherwise keep looping 3C00ffc8 # JUMP @ascii_other -# :finish ; offset = 150 +# :finish ; offset = 148 0900040B # COPY R0 R11 ; Close TAPE_01 42100002 # FCLOSE 050210BA # OR R0 R11 R10 ; Close TAPE_02 diff --git a/stage0/stage0_monitor.s b/stage0/stage0_monitor.s index c47a809..f69bb09 100644 --- a/stage0/stage0_monitor.s +++ b/stage0/stage0_monitor.s @@ -21,9 +21,18 @@ ABS R10 R12 ; Set R10 to 1 LOADUI R11 0x1100 ; R11 will hold 0x1100 - COPY R13 R11 ; Stack will start at 0x1100 - ;; R14 will be storing our condition - FALSE R15 ; Our holder + ;; R14 will be storing our condition + ;; + ;; R13 will be a stack pointer. It will be zero + ;; on the start, and the stack grows up. + ;; This means that when stack is used, the + ;; first instructions of this program will be + ;; overwritten. But because this is initialization + ;; code, it is already not used at the time. + ;; And the stack usage is fixed - there is only one CALL + ;; instruction in this file + ;; + ;; R15 Is our holder. It is initialized to zero on start. ;; Prep TAPE_01 COPY R0 R11 ; 0x1100 From fe10bd4df42431684b36c3f277e851eef264d617 Mon Sep 17 00:00:00 2001 From: Dmitry Petukhov Date: Sat, 12 Oct 2019 02:28:47 +0500 Subject: [PATCH 4/5] update hashes for stage0_monitor --- bootstrapping Steps.org | 2 +- test/SHA256SUMS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrapping Steps.org b/bootstrapping Steps.org index 94c8dc1..67b2737 100644 --- a/bootstrapping Steps.org +++ b/bootstrapping Steps.org @@ -37,7 +37,7 @@ gcc Linux\ Bootstrap/hex.c -o bin/hex Then we can use it to make our bootstrap binary: ./bin/hex < stage0/stage0_monitor.hex0 > roms/stage0_monitor -Which should have the sha256sum of 792e2be913921dd55a28f55dcf2e6b1523d34fdbccc27c38f77e74c99ef97a4b +Which should have the sha256sum of c9d397b195c6ba2bb4b19428d8b21e7737a32e5275f3027270d8925aec878042 * Step 2 create a hex assembler Now that we have a Hex monitor, we are now capable of either creating a text file (no ability to correct mistakes along the way) or any arbitrary hex program we want. diff --git a/test/SHA256SUMS b/test/SHA256SUMS index 80e2260..8de36b8 100644 --- a/test/SHA256SUMS +++ b/test/SHA256SUMS @@ -5,7 +5,7 @@ f4bbf9e9c4828170d0c153ac265382dc705643f95efd2a029243326d426be5a4 roms/forth 2b80849180d5fb3757bcca2471b6337808e5b5ca80b18d93fa82ddef0435b84b roms/lisp 3020b194ead31ae19ba66fc35ed95465514373f6005896350d1608c9efabbdca roms/M0 059d38e34275029f2de5f600f08fe01bd13cd173f7da58e3fbec7114074beff2 roms/SET -49ccb24650f9112f71f487b1956418efa511b7fa61f8abf40420ff833dcd959b roms/stage0_monitor +c9d397b195c6ba2bb4b19428d8b21e7737a32e5275f3027270d8925aec878042 roms/stage0_monitor 13b45134a88c1c6db349cb40f82269cee9edfce71ac644dc0e137bad053bf5ce roms/stage1_assembler-0 156f555fce5b02f52445652b1ed0b443295706cdfbe23c5a021bd4efc77179bb roms/stage1_assembler-1 2c02c50958f489a660a4915d2a9e207a0c61f411d42628bdaf4dcf6bf7149a9d roms/stage1_assembler-2 From f2f8abe49e6bf7dfe191fc110817e326bf5b155c Mon Sep 17 00:00:00 2001 From: Dmitry Petukhov Date: Sat, 12 Oct 2019 02:30:16 +0500 Subject: [PATCH 5/5] add asm as a dependency to test_stage0_monitor_asm_match --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index f612705..975c9d8 100644 --- a/makefile +++ b/makefile @@ -110,7 +110,7 @@ Generate-rom-test: ALL-ROMS mkdir -p test sha256sum roms/* | sort -k2 >| test/SHA256SUMS -test_stage0_monitor_asm_match: stage0_monitor +test_stage0_monitor_asm_match: asm stage0_monitor mkdir -p test/stage0_test_scratch sed 's/^[^#]*# //' stage0/stage0_monitor.hex0 > test/stage0_test_scratch/stage0_monitor.hex0.s bin/asm test/stage0_test_scratch/stage0_monitor.hex0.s > test/stage0_test_scratch/stage0_monitor.hex0.hex0