[#201] SSEM: Fix code generator

emustudio · Sep 3, 2021 · e05ee04 · e05ee04
1 parent 0cb5c62
commit e05ee04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/...ins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CodeGenerator.java b/...ins/compiler/as-ssem/src/main/java/net/emustudio/plugins/compiler/ssem/CodeGenerator.java
@@ -19,15 +19,14 @@ public ByteBuffer generateCode(Program program) {
             } else if (instruction.tokenType == SSEMParser.NUM) {
                 code.putInt((int) NumberUtils.reverseBits(instruction.operand, 32));
             } else {
-                System.out.println(instruction);
                 writeInstruction(instruction.getOpcode(), instruction.operand);
             }
         });
         return code.clear();
     }
 
     private void writeInstruction(int opcode, long operand) {
-        int instruction = (int)((operand & 0x1F) | (((opcode & 0x07) << 12)));
+        int instruction = (int)((operand & 0x1F) | (((opcode & 0x07) << 13)));
         code.putInt(NumberUtils.reverseBits(instruction, 32));
     }
 }
diff --git a/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/RunnerTest.java b/plugins/compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/RunnerTest.java
@@ -48,7 +48,7 @@ public void testCommandLine() throws Exception {
 
         byte[] expected = new byte[33 * 4];
         expected[4] = 0x68;
-        expected[5] = 0x06;
+        expected[5] = 0x03;
         assertArrayEquals(expected, bytes);
     }
 

diff --git a/.../compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/SSEMCompilerTest.java b/.../compiler/as-ssem/src/test/java/net/emustudio/plugins/compiler/ssem/SSEMCompilerTest.java
@@ -31,13 +31,12 @@
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
-import java.lang.reflect.Array;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
 
 import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotEquals;
 
 public class SSEMCompilerTest {
     private SSEMCompiler compiler;
@@ -98,24 +97,24 @@ public void testCopyrightIsKnown() {
     @Test
     public void testSTO() throws Exception {
         compile("00 STO 22\n");
-        assertProgram(0x68, 6, 0, 0);
+        assertProgram(0x68, 3, 0, 0);
     }
 
     @Test
     public void testLDN() throws Exception {
         compile("00 LDN 29");
-        assertProgram(0xB8,4,0,0);
+        assertProgram(0xB8,2,0,0);
     }
 
     @Test
     public void testSUB() throws Exception {
         compile("00 SUB 30");
-        assertProgram(0x78,8,0,0);
+        assertProgram(0x78,4,0,0);
     }
 
     @Test
     public void testSTP() throws Exception {
         compile("00 STP");
-        assertProgram(0,0x0E,0,0);
+        assertProgram(0,7,0,0);
     }
 }