Skip to content

Refactor screen and instruction tests #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craigthomas merged 2 commits into from
Feb 21, 2025
Merged

Refactor screen and instruction tests #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4643c4
Move screen datatypes and add tests for instructions
craigthomas Feb 20, 2025
4970d3e
Add in unit tests for addressing modes
craigthomas Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/ca/craigthomas/yacoco3e/components/IOController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
51 changes: 24 additions & 27 deletions src/main/java/ca/craigthomas/yacoco3e/components/Instruction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/ca/craigthomas/yacoco3e/components/Screen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions src/main/java/ca/craigthomas/yacoco3e/datatypes/MemoryResult.java
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G1CScreenMode.java → ...oco3e/datatypes/screen/G1CScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G1RScreenMode.java → ...oco3e/datatypes/screen/G1RScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G2CScreenMode.java → ...oco3e/datatypes/screen/G2CScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G2RScreenMode.java → ...oco3e/datatypes/screen/G2RScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G3CScreenMode.java → ...oco3e/datatypes/screen/G3CScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G3RScreenMode.java → ...oco3e/datatypes/screen/G3RScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G6CScreenMode.java → ...oco3e/datatypes/screen/G6CScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/G6RScreenMode.java → ...oco3e/datatypes/screen/G6RScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...as/yacoco3e/datatypes/SG12ScreenMode.java → ...co3e/datatypes/screen/SG12ScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...as/yacoco3e/datatypes/SG24ScreenMode.java → ...co3e/datatypes/screen/SG24ScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/SG4ScreenMode.java → ...oco3e/datatypes/screen/SG4ScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/SG6ScreenMode.java → ...oco3e/datatypes/screen/SG6ScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
4 changes: 3 additions & 1 deletion ...mas/yacoco3e/datatypes/SG8ScreenMode.java → ...oco3e/datatypes/screen/SG8ScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion ...thomas/yacoco3e/datatypes/ScreenMode.java → ...yacoco3e/datatypes/screen/ScreenMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading