X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/5509558d05f30339f3393f02f67e8854cbe25a00..714630d3e8be5d536b67fa25f4b4745e9aaf42a3:/insn_alu8.v

diff --git a/insn_alu8.v b/insn_alu8.v
index 6abcb90..2921b18 100644
--- a/insn_alu8.v
+++ b/insn_alu8.v
@@ -1,10 +1,13 @@
 `ifdef EXECUTE
-	`INSN_ALU8: begin
-		if ((opcode[2:0] == `INSN_reg_dHL) && (cycle == 0))
-			`EXEC_READ(_HL);
+	`INSN_ALU8,`INSN_ALU8IMM: begin
+		if ((opcode[7:6] == 2'b11) && (cycle == 0)) begin	// alu8imm
+			`EXEC_INC_PC
+			`EXEC_READ(`_PC + 1)
+		end else if ((opcode[2:0] == `INSN_reg_dHL) && (cycle == 0))
+			`EXEC_READ(`_HL)
 		else begin
-			`EXEC_NEWCYCLE;
-			`EXEC_INC_PC;
+			`EXEC_NEWCYCLE
+			`EXEC_INC_PC
 			case (opcode[2:0])
 			`INSN_reg_A:	tmp <= `_A;
 			`INSN_reg_B:	tmp <= `_B;
@@ -20,14 +23,14 @@
 `endif
 
 `ifdef WRITEBACK
-	`INSN_ALU8: begin
-		if ((opcode[2:0] == `INSN_reg_dHL) && (cycle == 0)) begin
+	`INSN_ALU8,`INSN_ALU8IMM: begin
+		if (((opcode[2:0] == `INSN_reg_dHL) || (opcode[7:6] == 2'b11)) && (cycle == 0)) begin
 			/* Sit on our asses. */
 		end else begin		/* Actually do the computation! */
 			case (opcode[5:3])
 			`INSN_alu_ADD: begin
 				`_A <= `_A + tmp;
-				`_F <=	{ /* Z */ ((`_A + tmp) == 0) ? 1'b1 : 1'b0,
+				`_F <=	{ /* Z */ ((`_A + tmp) == 8'b0) ? 1'b1 : 1'b0,
 					  /* N */ 1'b0,
 					  /* H */ (({1'b0,`_A[3:0]} + {1'b0,tmp[3:0]}) >> 4 == 1) ? 1'b1 : 1'b0,
 					  /* C */ (({1'b0,`_A} + {1'b0,tmp}) >> 8 == 1) ? 1'b1 : 1'b0,
@@ -36,7 +39,7 @@
 			end
 			`INSN_alu_ADC: begin
 				`_A <= `_A + tmp + {7'b0,`_F[4]};
-				`_F <=	{ /* Z */ ((`_A + tmp + {7'b0,`_F[4]}) == 0) ? 1'b1 : 1'b0,
+				`_F <=	{ /* Z */ ((`_A + tmp + {7'b0,`_F[4]}) == 8'b0) ? 1'b1 : 1'b0,
 					  /* N */ 1'b0,
 					  /* H */ (({1'b0,`_A[3:0]} + {1'b0,tmp[3:0]} + {4'b0,`_F[4]}) >> 4 == 1) ? 1'b1 : 1'b0,
 					  /* C */ (({1'b0,`_A} + {1'b0,tmp} + {8'b0,`_F[4]}) >> 8 == 1) ? 1'b1 : 1'b0,
@@ -54,7 +57,7 @@
 			end
 			`INSN_alu_SBC: begin
 				`_A <= `_A - (tmp + {7'b0,`_F[4]});
-				`_F <= 	{ /* Z */ ((`_A - (tmp + {7'b0,`_F[4]})) == 0) ? 1'b1 : 1'b0,
+				`_F <= 	{ /* Z */ ((`_A - (tmp + {7'b0,`_F[4]})) == 8'b0) ? 1'b1 : 1'b0,
 					  /* N */ 1'b1,
 					  /* H */ (({1'b0,tmp[3:0]} + {4'b0,`_F[4]}) > {1'b0,`_A[3:0]}) ? 1'b1 : 1'b0,
 					  /* C */ (({1'b0,tmp} + {8'b0,`_F[4]}) > {1'b0,`_A[7:0]}) ? 1'b1 : 1'b0,