diff --git a/CHANGELOG.org b/CHANGELOG.org index 0086e04..824865d 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -22,6 +22,7 @@ Incorporated High level prototypes into makefile Extended VPATH in makefile to shorten dependency names ** Fixed +Stack offset bug in stage2 forth was found and fixed by reepca in record time ** Removed diff --git a/bootstrapping Steps.org b/bootstrapping Steps.org index e70fa8f..3a8a983 100644 --- a/bootstrapping Steps.org +++ b/bootstrapping Steps.org @@ -174,7 +174,7 @@ Then we use our M0 Line macro assembler to convert our assembly into hex2 format Then we need to assemble that hex into our desired program: ./bin/vm --rom roms/stage1_assembler-2 --tape_01 temp2 --tape_02 roms/forth --memory 48K -roms/forth should with the sha256sum of 0aacf6258e9de0acde755229ad14e6ce13ab7a43b0360dadeb862f8facccc422 +roms/forth should with the sha256sum of 7f2645eada56a748f209dabbca39f72c4594017a78e6fcc8aed77a51a73093f7 Our forth will first attempt to evaluate any code in tape_01 and then evaluate any code that the user types in (Otherwise there is no way for a forth fan to have a chance against the lisp in terms of being able to bootstrap something cool) diff --git a/stage2/forth.s b/stage2/forth.s index 28821f6..014126f 100644 --- a/stage2/forth.s +++ b/stage2/forth.s @@ -154,7 +154,7 @@ NOP ; Flags &Dup_Code ; Where assembly is Stored :Dup_Code - LOAD R0 R14 0 ; Get top of stack + LOAD R0 R14 -4 ; Get top of stack PUSHR R0 R14 ; Push copy onto it JSR_COROUTINE R11 ; NEXT @@ -167,7 +167,7 @@ NOP ; Flags &Over_Code ; Where assembly is Stored :Over_Code - LOAD R0 R14 -4 ; Get second from Top of stack + LOAD R0 R14 -8 ; Get second from Top of stack PUSHR R0 R14 ; Push it onto top of stack JSR_COROUTINE R11 ; NEXT diff --git a/test/SHA256SUMS b/test/SHA256SUMS index ae67346..5ef989b 100644 --- a/test/SHA256SUMS +++ b/test/SHA256SUMS @@ -1,6 +1,6 @@ 8f465d3ec1cba00a7d024a1964e74bb6d241f86a73c77d95d8ceb10d09c8f7b9 roms/CAT 59f0502748af32e3096e026a95e77216179cccfe803a05803317414643e2fcec roms/DEHEX -0aacf6258e9de0acde755229ad14e6ce13ab7a43b0360dadeb862f8facccc422 roms/forth +7f2645eada56a748f209dabbca39f72c4594017a78e6fcc8aed77a51a73093f7 roms/forth 4c146297da8c672955698a82207295b28feb389c9856a2c6ea6a60ce7e84260a roms/lisp 2b9727381aec15a504c0898189fbc2344209d8e04451e3fa5d743e08e38f64cf roms/M0 24a4d74eb2eb7a82e68335643855658b27b5a6c3b13db473539f3e08d6f26ceb roms/SET