Fpu (#9)

* MIP-79 - make reserved public * MIP-79 - add support for disabling CoProcessor1 * MIP-79 - add named system service - add more methods to TerminalInputListener
cleverchuk · Jun 18, 2023 · 2006213 · 2006213
1 parent 32bc87f
commit 2006213
Show file tree

Hide file tree

Showing 14 changed files with 348 additions and 243 deletions.
diff --git a/mips/src/androidTest/java/com/cleverchuk/mips/MipsSimulatorTest.java b/mips/src/androidTest/java/com/cleverchuk/mips/MipsSimulatorTest.java
diff --git a/mips/src/main/java/com/cleverchuk/mips/compiler/lexer/MipsLexer.java b/mips/src/main/java/com/cleverchuk/mips/compiler/lexer/MipsLexer.java
@@ -41,7 +41,7 @@ public final class MipsLexer {
     public MipsLexer() {
     }
 
-    public static final Map<String, TokenType> RESERVED = new HashMap<>() {{
+    public static final Map<String, TokenType> RESERVED = new HashMap<String, TokenType>() {{
         put("data", TokenType.DATA);
         put("text", TokenType.TEXT);
         put("ascii", TokenType.ASCII);
@@ -56,7 +56,7 @@ public MipsLexer() {
 
     }};
 
-    public static final Map<String, String> DECI_TO_CPU_REG = new HashMap<>() {{
+    public static final Map<String, String> DECI_TO_CPU_REG = new HashMap<String, String>() {{
         put("0", "zero");
         put("1", "at");
         put("2", "v0");
@@ -91,7 +91,7 @@ public MipsLexer() {
         put("31", "ra");
     }};
 
-    public static final Map<String, String> DECI_TO_FPU_REG = new HashMap<>() {{
+    public static final Map<String, String> DECI_TO_FPU_REG = new HashMap<String, String>() {{
         put("0", "f0"); //FIR readonly
         put("1", "f1");
         put("2", "f2");

diff --git a/mips/src/main/java/com/cleverchuk/mips/compiler/lexer/Token.java b/mips/src/main/java/com/cleverchuk/mips/compiler/lexer/Token.java
@@ -1,7 +1,5 @@
 package com.cleverchuk.mips.compiler.lexer;
 
-import com.cleverchuk.mips.simulator.fpu.DataFormat;
-
 public class Token {
     private final TokenType tokenType;
 
@@ -13,23 +11,20 @@ public class Token {
 
     private final String code;
 
-    private DataFormat format;
     public Token(TokenType tokenType, Object value, int line) {
         this.tokenType = tokenType;
         this.value = value;
         this.line = line;
         this.pos = -1;
         this.code = null;
-        this.format = null;
     }
 
-    public Token(TokenType tokenType, Object value, int line, int pos, String code, DataFormat format) {
+    public Token(TokenType tokenType, Object value, int line, int pos, String code) {
         this.tokenType = tokenType;
         this.value = value;
         this.line = line;
         this.pos = pos;
         this.code = code;
-        this.format = format;
     }
 
     public TokenType getTokenType() {
@@ -48,10 +43,6 @@ public int getPos() {
         return pos;
     }
 
-    public DataFormat getFormat() {
-        return format;
-    }
-
     public String getCode() {
         return code;
     }
@@ -69,7 +60,6 @@ public static class TokenBuilder {
 
         private int pos;
 
-        private DataFormat format;
 
         private String code;
 
@@ -93,13 +83,8 @@ public TokenBuilder pos(int pos) {
             return this;
         }
 
-        public TokenBuilder format(DataFormat format) {
-            this.format = format;
-            return this;
-        }
-
         public Token build() {
-            return new Token(tokenType, value, line, pos, code, format);
+            return new Token(tokenType, value, line, pos, code);
         }
     }
 }
diff --git a/mips/src/main/java/com/cleverchuk/mips/dev/OnUserInputListener.java b/mips/src/main/java/com/cleverchuk/mips/dev/OnUserInputListener.java
diff --git a/mips/src/main/java/com/cleverchuk/mips/dev/TerminalInputListener.java b/mips/src/main/java/com/cleverchuk/mips/dev/TerminalInputListener.java
@@ -0,0 +1,18 @@
+package com.cleverchuk.mips.dev;
+
+public interface TerminalInputListener {
+    default void onIntInput(int data) {
+    }
+
+    default void onDoubleInput(double data) {
+    }
+
+    default void onFloatInput(float data) {
+    }
+
+    default void onStringInput(String data) {
+    }
+
+    default void onCharInput(char data) {
+    }
+}