diff --git a/CHANGELOG.org b/CHANGELOG.org index 312e853..146cbef 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -30,6 +30,7 @@ Updated checksum for stage2 forth Reversed the order of operands in stage2 forth arithmetic Modified webIDE to leverage new enhanced disassembler output Altered stage2 forth KEY to echo keypress so that S" and similiar functions behave like gforth +Altered EXECUTE in stage2 forth to set R12 and load its pointer and jump ** Fixed Stack offset bug in stage2 forth was found and fixed by reepca in record time diff --git a/bootstrapping Steps.org b/bootstrapping Steps.org index 52cc0dc..d57d4a7 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 65b93c67f5d369190d3deaa5ef94948071e6502cd64cc1cc2de9672f7dc859e6 +roms/forth should with the sha256sum of 520551c19bfb8af895c701e83b8b9c098324752e2902845731117ad1b92b5952 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 07f138e..9f55a43 100644 --- a/stage2/forth.s +++ b/stage2/forth.s @@ -1273,7 +1273,8 @@ NOP ; Flags &Execute_Code ; Where assembly is Stored :Execute_Code - POPR R0 R14 ; Get value off parameter stack + POPR R12 R14 ; Get address pointer off parameter stack + LOAD R0 R12 0 ; Get address from pointer JSR_COROUTINE R0 ; Jump to that address ;; Interaction Commands diff --git a/test/SHA256SUMS b/test/SHA256SUMS index bfbaf1d..cd19047 100644 --- a/test/SHA256SUMS +++ b/test/SHA256SUMS @@ -1,6 +1,6 @@ 8f465d3ec1cba00a7d024a1964e74bb6d241f86a73c77d95d8ceb10d09c8f7b9 roms/CAT 59f0502748af32e3096e026a95e77216179cccfe803a05803317414643e2fcec roms/DEHEX -65b93c67f5d369190d3deaa5ef94948071e6502cd64cc1cc2de9672f7dc859e6 roms/forth +520551c19bfb8af895c701e83b8b9c098324752e2902845731117ad1b92b5952 roms/forth 4c146297da8c672955698a82207295b28feb389c9856a2c6ea6a60ce7e84260a roms/lisp 2b9727381aec15a504c0898189fbc2344209d8e04451e3fa5d743e08e38f64cf roms/M0 24a4d74eb2eb7a82e68335643855658b27b5a6c3b13db473539f3e08d6f26ceb roms/SET