From 9e2d8075539a6012b682d26e935c77e3a4a4023b Mon Sep 17 00:00:00 2001 From: Jeremiah Orians Date: Thu, 15 Jun 2017 16:36:05 -0400 Subject: [PATCH] Fixed the arithmetic order issue found by reepca --- CHANGELOG.org | 1 + bootstrapping Steps.org | 2 +- stage2/forth.s | 6 +++--- test/SHA256SUMS | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index a524d49..dc795fb 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -23,6 +23,7 @@ Added DP! to stage2 forth ** Changed Extended VPATH in makefile to shorten dependency names Updated checksum for stage2 forth +Reversed the order of operands in stage2 forth arithmetic ** 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 8bca632..3b31623 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 a0d760e98534ec7abea6677e80fac98d2ec42d5bb1f02b1575122831fed46651 +roms/forth should with the sha256sum of 82e88791a784d9633a457e5cabbed5383e6c4f54d0711428c034c4ae2424fc21 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 e5fb670..7f3c30c 100644 --- a/stage2/forth.s +++ b/stage2/forth.s @@ -293,7 +293,7 @@ :Sub_Code POPR R0 R14 ; Get top of stack POPR R1 R14 ; Get second item on Stack - SUB R0 R0 R1 ; Perform the subtraction + SUB R0 R1 R0 ; Perform the subtraction PUSHR R0 R14 ; Store the result JSR_COROUTINE R11 ; NEXT @@ -338,7 +338,7 @@ :DIV_Code POPR R0 R14 ; Get top of stack POPR R1 R14 ; Get second item on Stack - DIV R0 R0 R1 ; Perform division and keep top half + DIV R0 R1 R0 ; Perform division and keep top half PUSHR R0 R14 ; Store the result JSR_COROUTINE R11 ; NEXT @@ -353,7 +353,7 @@ :MOD_Code POPR R0 R14 ; Get top of stack POPR R1 R14 ; Get second item on Stack - MOD R0 R0 R1 ; Perform division and keep remainder + MOD R0 R1 R0 ; Perform division and keep remainder PUSHR R0 R14 ; Store the result JSR_COROUTINE R11 ; NEXT diff --git a/test/SHA256SUMS b/test/SHA256SUMS index eef3e2c..dae5071 100644 --- a/test/SHA256SUMS +++ b/test/SHA256SUMS @@ -1,6 +1,6 @@ 8f465d3ec1cba00a7d024a1964e74bb6d241f86a73c77d95d8ceb10d09c8f7b9 roms/CAT 59f0502748af32e3096e026a95e77216179cccfe803a05803317414643e2fcec roms/DEHEX -a0d760e98534ec7abea6677e80fac98d2ec42d5bb1f02b1575122831fed46651 roms/forth +82e88791a784d9633a457e5cabbed5383e6c4f54d0711428c034c4ae2424fc21 roms/forth 4c146297da8c672955698a82207295b28feb389c9856a2c6ea6a60ce7e84260a roms/lisp 2b9727381aec15a504c0898189fbc2344209d8e04451e3fa5d743e08e38f64cf roms/M0 24a4d74eb2eb7a82e68335643855658b27b5a6c3b13db473539f3e08d6f26ceb roms/SET