Refactoring code; add a procesing unit to separate the opcodes pocesing

Author: Javi

chip8_local/bin/.gitignore

@@ -0,0 +1 @@
+/es/

chip8_local/bin/es/javiercrespo/Chip8.class

@@ -24,317 +24,32 @@ public class Chip8 {
 	private static Cpu cpu;
 	private static Display display;
 	private static Keyboard keyboard;
+	private static ProcesingUnit pu;
 	private static Sprite sprites;
 
 	public static void main(String[] args) throws InterruptedException {
 
 		cpu 		= new Cpu();
 		display 	= new Display();
 		keyboard 	= new Keyboard();
+		pu			= new ProcesingUnit(cpu, keyboard, display);
 		sprites		= new Sprite();
 
+		
 		init();
 		loadRom();
 		//cpu.dumpMemory();
 		prepareGUI();
+		
 		boolean end = false;
 
+		
 		while (!end) {
-			int opcode = (int) ((((cpu.memory[cpu.pc] & 0xFF) << 8) + (cpu.memory[cpu.pc+1] & 0xFF)) & 0xFFFF);
-			short nnn 	= (short) (opcode & 0xFFF);
-			short kk 	= (short) (opcode & 0xFF);
-			short n 	= (short) (opcode & 0xF);
-			short x 	= (short) (opcode >> 8 & 0xF);
-			short y 	= (short) (opcode >> 4 & 0xF);
-			short msb	= (short) (opcode >> 12 & 0xF);
-			/*
-			System.out.println("opcode: " + String.format("0x%04X",opcode));
-			System.out.println("nnn: " + String.format("%03X",nnn));
-			System.out.println("kk: " + String.format("%02X",kk));
-			System.out.println("n: " + String.format("%01X",n));
-			System.out.println("x: " + String.format("%01X",x));
-			System.out.println("y: " + String.format("%01X",y));
-			System.out.println("msb: " + String.format("%01X",msb));
-			*/
-
-			
-			switch (msb) {
-				case 0:
-					if (n==0x0)
-						if (opcode==0x00E0) {
-							for (int i = 0; i< cpu.screen.length; i++){
-								cpu.screen[i] = 0x0; //CLS
-							}
-							
-						} else if (opcode==0X00EE) {
-								cpu.pc = cpu.sp--;
-								//cpu.sp = (short) (cpu.sp - 0x01);
-						}
-					break;
-					
-				case 1: cpu.pc = (short) (nnn & 0x0FFF); break;
-				
-				case 2:
-					if (cpu.sp < 16) {
-						cpu.stack[++cpu.sp] = cpu.pc;
-					}
-					cpu.pc = nnn;
-					break;
-
-				case 3: 
-					if (cpu.v[x]  == kk) {
-						cpu.pc += 0x0002;
-					}
-					break;
-
-				case 4: 
-					if (cpu.v[x] != kk) {
-						cpu.pc += 0x0002;
-					}
-					break;
-
-				case 5: 
-					if (cpu.v[x] == cpu.v[y]) {
-						cpu.pc += 0x0002;
-					}
-					break;
-
-				case 6: 
-					cpu.v[x] = (short) (kk & 0xFF);
-					break;
-
-				case 7: cpu.v[x] = (short) ((cpu.v[x] + kk) & 0xFF); break;
-				
-				case 8: 
-					switch (n) {
-						case 0: cpu.v[x] = cpu.v[y]; break;
-						
-						case 1: cpu.v[x] = (short) (cpu.v[x] | cpu.v[y]); cpu.pc = nnn; break;
-						
-						case 2: cpu.v[x] = (short) (cpu.v[x] & cpu.v[y]); break;
-						
-						case 3: cpu.v[x] = (short) (cpu.v[x] ^ cpu.v[y]); break;
-						
-						case 4:
-								int sum = cpu.v[x] + cpu.v[y];
-
-								if (sum > 0xFF) cpu.v[0xF] = 1;
-								else cpu.v[0xF] = 0;
-
-								cpu.v[x] = (short) (sum & 0xFF);
-
-								/*cpu.v[0xF] = (short) ((cpu.v[x] > cpu.v[x] + cpu.v[y]) ? 1 : 0); // Carry
-								cpu.v[x] += cpu.v[y];*/
-							break;
-							
-						case 5:
-							
-							if(cpu.v[x] > cpu.v[y]) cpu.v[0xF] = 1;
-							else cpu.v[0xF] = 0;
-							
-							short sub = (short)((cpu.v[x] - cpu.v[y]) & 0xFF);
-							cpu.v[x] = sub;							
-							
-							/*
-								cpu.v[0xF] = (short) ((cpu.v[x] > cpu.v[y]) ? 1 : 0); // Carry
-								cpu.v[x] -= cpu.v[y];
-								*/
-							break;
-							
-						case 6: 
-								cpu.v[0xF] = (short) (cpu.v[x] & 0x1); // Carry
-								cpu.v[x] >>>= 1;
-								break;
-								
-						case 7: 
-								if (cpu.v[y] > cpu.v[x]) cpu.v[0xF] = 1;
-								else cpu.v[0xF] = 0;
-								
-								cpu.v[x] = (short) (cpu.v[y] - cpu.v[x]);
-								
-								/*
-								cpu.v[0xF] = (short) ((cpu.v[y] > cpu.v[x]) ? 1 : 0); // Carry
-								cpu.v[x] = (short) (cpu.v[y] - cpu.v[x]);
-								*/
-								break;
-								
-						case 0xE:
-							
-								byte b = (byte)(cpu.v[x] >>> 7 & 0x1);
-								cpu.v[0xF] = b;
-								cpu.v[x] = (short)((cpu.v[x] << 1) & 0xFF);
-								
-								/*
-								cpu.v[0xF] = (short) (((cpu.v[x] & 0x80) != 0) ? 1 : 0);
-								cpu.v[x] <<= 1;
-								*/
-								break;
-					}
-					break;
-				
-				case 9: 
-					if (cpu.v[x] != cpu.v[y]) {
-						cpu.pc += 0x0002;
-						//cpu.pc = (short) (cpu.pc + 2 & 0xFFF);
-					}
-					break;
-				
-				case 0xA: cpu.i = nnn; break;
-				
-				case 0xB: cpu.pc = (short) ((cpu.v[0] + nnn & 0XFFF)); break;
-				
-				case 0xC:
-					cpu.v[x] = (short) (cpu.rnd.nextInt(256) & kk); break; //Random value
-				
-				case 0xD: 
-					//DRW
-					/*
-					byte readBytes = 0;
-					byte vf = (byte)0x0;
-					while (readBytes < n){
-						byte currentByte = (byte) cpu.memory[cpu.i + readBytes];
-						for (int i=0; i<=7; i++) {
-							int px = cpu.v[x] & 0xFF;
-							int py = cpu.v[y] & 0xFF;
-							int pos = (64* (py + px) & 0xFF);
-							boolean previousPixel = false;
-							if (cpu.screen[pos] == 1) previousPixel = true;
-							boolean newPixel = previousPixel ^ isBitSet(currentByte, 7-i);
-							short valPixel = 0;
-							if (newPixel == true) valPixel = 1;
-							cpu.screen[pos] = valPixel;
-							
-							if(previousPixel == true && newPixel == false) {
-								vf = (byte)0x01;
-							}
-						}
-						
-						cpu.v[0xF] = vf;
-						readBytes++;
-					}
-					*/
-					//Flag a true?
-					
-					//System.out.println ("DRW x:" + String.format("%01X",x) + " y:" + String.format("%01X",y) + " n:" + String.format("%01X",n));
-					
-					cpu.v[15] = 0;
-					for (int j=0; j<n; j++) {
-						short sprite = cpu.memory[cpu.i + j];
-						//System.out.println("sprite: " + Integer.toBinaryString(cpu.memory[cpu.i + j]));
-						for (int i=0; i<8; i++) {
-							int px = (cpu.v[x] + i) & 63;
-							int py = (cpu.v[y] + j) & 31;
-							int pos = ((64 * py + px) & 0xFFFF);
-
-							boolean isActive = ((sprite & (1 << (7-i))) != 0);
-							
-							//System.out.print(sprite & (1 << (7-i)));
-							//System.out.print("  - isActive: "+isActive);
-							//System.out.println("  - cpu.screen[pos]" + cpu.screen[pos]);
-							
-							
-							if (isActive & (cpu.screen[pos] == 1)) cpu.v[15] = 1;
-							cpu.screen[pos] ^= (short) (isActive ? 1 : 0);
-						}
-					}
-
-					display.drawFlag = true;
-					
-					break;
-				
-				case 0xE:
-						
-					switch (kk) {
-						case 0x9E:
-							if (cpu.v[x] == keyboard.getCurrentKey()) {
-								cpu.pc+=0x0002;
-							}
-							break;
-							
-						case 0xA1:
-							if (cpu.v[x] != keyboard.getCurrentKey()) {
-								cpu.pc+=0x0002;
-							}
-							break;
-					}
-					break;
-
-				case 0xF:
-					switch(kk) {
-					
-					case 0x07: cpu.v[x] = (short) (cpu.dt & 0xFF); break;
-					
-					case 0x0A:
-						
-				        int currentKey = keyboard.getCurrentKey();
-				        while (currentKey == 0) {
-				            try {
-				                Thread.sleep(300);
-				            } catch (InterruptedException e) {
-				                e.printStackTrace();
-				            }
-				            currentKey = keyboard.getCurrentKey();
-				        }
-				        cpu.v[x] = (short) currentKey;
-
-						break;
-					
-					case 0x15: cpu.dt = cpu.v[x]; break;
-					
-					case 0x18: cpu.st = cpu.v[x]; break;
-					
-					case 0x1E: cpu.i += cpu.v[x]; break;
-					
-					case 0x29: cpu.i = (short) (0x65 + cpu.v[x] * 5); break; //Draw Sprites
-					
-					case 0x33:
-						cpu.memory[cpu.i + 2] = (short) (cpu.v[x] % 10); 
-						cpu.memory[cpu.i + 1] = (short) (cpu.v[x] / 10/* % 10*/);
-						cpu.memory[cpu.i] = (short) (cpu.v[x] / 100);
-						break;
-					
-					case 0x55:
-						for (int reg=0; reg <=x; reg++) {
-							cpu.memory[cpu.i + reg] = cpu.v[reg]; 
-						}
-						break;
-						
-					case 0x65:
-						for (int reg=0; reg <=x; reg++) {
-							cpu.v[reg] = cpu.memory[cpu.i + reg];
-						}
-						break;
-					}
-					//break;
-			}
-			
-			
-			
-			
-			//Display
-			if (display.drawFlag = true) {
-				display.paint(display.getGraphics(), cpu.screen);
-				//display.paintFullScreen(cpu.screen);
-			}
-			display.drawFlag = false;
-			
-
-			//Increment program counter
+			pu.run();
 			//end = true;
-			cpu.pc+=0x2;
-			if (cpu.pc >= 4096) cpu.pc = 0x200;
-			
-			//1000 / 60
-            Thread.sleep(1000 / 60);
-            if (cpu.dt > 0) --cpu.dt;
-            if (cpu.st > 0){
-            	if (cpu.st == 1)// Toolkit.getDefaultToolkit().beep();
-            	--cpu.st;
-            }
-        	
-            //cpu.screen[0] = cpu.screen[63] = cpu.screen[1984] = cpu.screen[2047] = 1;
-            //display.paint(display.getGraphics(), cpu.screen);
 		}
+		
+		
 
 	}
 
@@ -353,7 +68,7 @@ private static void init() {
 
 	}
 
-	//Hardcoded load pong.rom in memory
+
 	private static void loadRom() {
 
 		File file = new File("roms/PONG");
@@ -387,11 +102,8 @@ private static void prepareGUI(){
         f.pack();
         f.setResizable(false);
         f.setVisible(true);
+        f.addKeyListener(keyboard);
+
+	}
 
-}
-	
-	private static  Boolean isBitSet(byte b, int bit)
-    {
-        return (b & (1 << bit)) != 0;
-    }
 }

chip8_local/bin/es/javiercrespo/Display.class

@@ -3,7 +3,11 @@
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.image.BufferStrategy;
 
+import javax.swing.JFrame;
 import javax.swing.JPanel;
 
 public class Display extends JPanel {
@@ -20,6 +24,9 @@ public Display() {
 
 	}
 
+    
+
+    
     public Dimension getPreferredSize() {
         return new Dimension(COL * SCALE, FIL * SCALE);
     }