Add DECX instruction

aleury · Jan 15, 2024 · 7d14568 · 7d14568
1 parent b7dcbef
commit 7d14568
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/examples/factorial.g b/examples/factorial.g
@@ -1,6 +1,6 @@
 ; Tasks:
 ; 1. Implement MULA - done
-; 2. Implement SETX
+; 2. Implement SETX - done
 ; 3. Implement DECX (and DECA, DECY)
 ; 4. Implement JXNZ
 ; 5. Implement CALL and RTRN

diff --git a/gmachine.go b/gmachine.go
@@ -25,6 +25,7 @@ const (
 	OpOUTA
 	OpINCA
 	OpDECA
+	OpDECX
 	OpADDA
 	OpMULA
 	OpMOVA
@@ -66,6 +67,7 @@ var opcodes = map[string]Word{
 	"OUTA": OpOUTA,
 	"INCA": OpINCA,
 	"DECA": OpDECA,
+	"DECX": OpDECX,
 	"ADDA": OpADDA,
 	"MULA": OpMULA,
 	"MOVA": OpMOVA,
@@ -130,6 +132,8 @@ func (g *Machine) Run() {
 			g.A++
 		case OpDECA:
 			g.A--
+		case OpDECX:
+			g.X--
 		case OpADDA:
 			switch g.Next() {
 			case RegX:

diff --git a/gmachine_test.go b/gmachine_test.go
@@ -143,6 +143,20 @@ func TestDECA(t *testing.T) {
 	}
 }
 
+func TestDECX(t *testing.T) {
+	t.Parallel()
+	g := gmachine.New(nil)
+	g.X = 1
+	var wantX gmachine.Word = 0
+	err := assembleAndRunFromString(g, "DECX")
+	if err != nil {
+		t.Fatal("didn't expect an error", err)
+	}
+	if wantX != g.X {
+		t.Errorf("want X value %d, got %d", wantX, g.X)
+	}
+}
+
 func TestSETA(t *testing.T) {
 	t.Parallel()
 	g := gmachine.New(nil)

diff --git a/testdata/gc.txtar b/testdata/gc.txtar
@@ -9,6 +9,6 @@ SETA 42
 OUTA
 
 -- want --
-0000000 0000 0000 0000 0900 0000 0000 0000 2a00
+0000000 0000 0000 0000 0a00 0000 0000 0000 2a00
 0000010 0000 0000 0000 0300                    
-0000018
+0000018
diff --git a/token/token.go b/token/token.go
@@ -24,6 +24,7 @@ var opcodes = map[string]TokenType{
 	"OUTA": OPCODE,
 	"INCA": OPCODE,
 	"DECA": OPCODE,
+	"DECX": OPCODE,
 	"ADDA": OPCODE,
 	"MULA": OPCODE,
 	"MOVA": OPCODE,

diff --git a/token/token_test.go b/token/token_test.go
@@ -16,6 +16,7 @@ func TestLookupIdent(t *testing.T) {
 		{"OUTA", token.OPCODE},
 		{"INCA", token.OPCODE},
 		{"DECA", token.OPCODE},
+		{"DECX", token.OPCODE},
 		{"ADDA", token.OPCODE},
 		{"MULA", token.OPCODE},
 		{"MOVA", token.OPCODE},