Move screen datatypes and add tests for instructions

craigthomas · Feb 20, 2025 · e4643c4 · e4643c4
1 parent bc0f323
commit e4643c4
Show file tree

Hide file tree

Showing 21 changed files with 460 additions and 106 deletions.
diff --git a/src/main/java/ca/craigthomas/yacoco3e/components/IOController.java b/src/main/java/ca/craigthomas/yacoco3e/components/IOController.java
@@ -5,6 +5,7 @@
 package ca.craigthomas.yacoco3e.components;
 
 import ca.craigthomas.yacoco3e.datatypes.*;
+import ca.craigthomas.yacoco3e.datatypes.screen.ScreenMode;
 
 import static ca.craigthomas.yacoco3e.datatypes.RegisterSet.*;
 

diff --git a/src/main/java/ca/craigthomas/yacoco3e/components/Instruction.java b/src/main/java/ca/craigthomas/yacoco3e/components/Instruction.java
@@ -60,33 +60,30 @@ public int execute(IOController io) throws MalformedInstructionException {
             io.incrementPC();
         }
 
-        if (!isValidInstruction) {
-            call(io);
-            return 0;
-        }
-
-        switch (addressingMode) {
-            case IMMEDIATE:
-                getImmediate(io);
-                break;
-
-            case INDEXED:
-                getIndexed(io);
-                break;
-
-            case DIRECT:
-                getDirect(io);
-                break;
-
-            case EXTENDED:
-                getExtended(io);
-                break;
-
-            default:
-                addressRead = new UnsignedWord(0);
-                wordRead = new UnsignedWord(0);
-                byteRead = new UnsignedByte(0);
-                break;
+        if (isValidInstruction) {
+            switch (addressingMode) {
+                case IMMEDIATE:
+                    getImmediate(io);
+                    break;
+
+                case INDEXED:
+                    getIndexed(io);
+                    break;
+
+                case DIRECT:
+                    getDirect(io);
+                    break;
+
+                case EXTENDED:
+                    getExtended(io);
+                    break;
+
+                default:
+                    addressRead = new UnsignedWord(0);
+                    wordRead = new UnsignedWord(0);
+                    byteRead = new UnsignedByte(0);
+                    break;
+            }
         }
 
         return call(io);

diff --git a/src/main/java/ca/craigthomas/yacoco3e/components/Screen.java b/src/main/java/ca/craigthomas/yacoco3e/components/Screen.java
@@ -4,9 +4,8 @@
  */
 package ca.craigthomas.yacoco3e.components;
 
-import ca.craigthomas.yacoco3e.datatypes.*;
+import ca.craigthomas.yacoco3e.datatypes.screen.*;
 
-import java.awt.*;
 import java.awt.image.BufferedImage;
 
 public class Screen

diff --git a/src/main/java/ca/craigthomas/yacoco3e/datatypes/MemoryResult.java b/src/main/java/ca/craigthomas/yacoco3e/datatypes/MemoryResult.java
diff --git a/...mas/yacoco3e/datatypes/G1CScreenMode.java → ...oco3e/datatypes/screen/G1CScreenMode.java b/...mas/yacoco3e/datatypes/G1CScreenMode.java → ...oco3e/datatypes/screen/G1CScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G1RScreenMode.java → ...oco3e/datatypes/screen/G1RScreenMode.java b/...mas/yacoco3e/datatypes/G1RScreenMode.java → ...oco3e/datatypes/screen/G1RScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G2CScreenMode.java → ...oco3e/datatypes/screen/G2CScreenMode.java b/...mas/yacoco3e/datatypes/G2CScreenMode.java → ...oco3e/datatypes/screen/G2CScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G2RScreenMode.java → ...oco3e/datatypes/screen/G2RScreenMode.java b/...mas/yacoco3e/datatypes/G2RScreenMode.java → ...oco3e/datatypes/screen/G2RScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G3CScreenMode.java → ...oco3e/datatypes/screen/G3CScreenMode.java b/...mas/yacoco3e/datatypes/G3CScreenMode.java → ...oco3e/datatypes/screen/G3CScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G3RScreenMode.java → ...oco3e/datatypes/screen/G3RScreenMode.java b/...mas/yacoco3e/datatypes/G3RScreenMode.java → ...oco3e/datatypes/screen/G3RScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G6CScreenMode.java → ...oco3e/datatypes/screen/G6CScreenMode.java b/...mas/yacoco3e/datatypes/G6CScreenMode.java → ...oco3e/datatypes/screen/G6CScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/G6RScreenMode.java → ...oco3e/datatypes/screen/G6RScreenMode.java b/...mas/yacoco3e/datatypes/G6RScreenMode.java → ...oco3e/datatypes/screen/G6RScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...as/yacoco3e/datatypes/SG12ScreenMode.java → ...co3e/datatypes/screen/SG12ScreenMode.java b/...as/yacoco3e/datatypes/SG12ScreenMode.java → ...co3e/datatypes/screen/SG12ScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...as/yacoco3e/datatypes/SG24ScreenMode.java → ...co3e/datatypes/screen/SG24ScreenMode.java b/...as/yacoco3e/datatypes/SG24ScreenMode.java → ...co3e/datatypes/screen/SG24ScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/SG4ScreenMode.java → ...oco3e/datatypes/screen/SG4ScreenMode.java b/...mas/yacoco3e/datatypes/SG4ScreenMode.java → ...oco3e/datatypes/screen/SG4ScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/SG6ScreenMode.java → ...oco3e/datatypes/screen/SG6ScreenMode.java b/...mas/yacoco3e/datatypes/SG6ScreenMode.java → ...oco3e/datatypes/screen/SG6ScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...mas/yacoco3e/datatypes/SG8ScreenMode.java → ...oco3e/datatypes/screen/SG8ScreenMode.java b/...mas/yacoco3e/datatypes/SG8ScreenMode.java → ...oco3e/datatypes/screen/SG8ScreenMode.java
@@ -2,7 +2,9 @@
  * Copyright (C) 2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
+
+import ca.craigthomas.yacoco3e.datatypes.UnsignedByte;
 
 import java.awt.*;
 

diff --git a/...thomas/yacoco3e/datatypes/ScreenMode.java → ...yacoco3e/datatypes/screen/ScreenMode.java b/...thomas/yacoco3e/datatypes/ScreenMode.java → ...yacoco3e/datatypes/screen/ScreenMode.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2017-2018 Craig Thomas
  * This project uses an MIT style license - see LICENSE for details.
  */
-package ca.craigthomas.yacoco3e.datatypes;
+package ca.craigthomas.yacoco3e.datatypes.screen;
 
 import ca.craigthomas.yacoco3e.components.IOController;