Semi-working, but prone to anus, keyboard driver

[fpgaboy.git] / insn_vop_intr.v

diff --git a/insn_vop_intr.v b/insn_vop_intr.v
index 06218f48c2f4feac4a068c99d186e1280fdd9cf8..ce0bcf8acb5f91bbaf9b645f412da983f63825c6 100644 (file)
--- a/insn_vop_intr.v
+++ b/insn_vop_intr.v
@@ -1,9 +1,12 @@
 `ifdef EXECUTE
        `INSN_VOP_INTR: begin
                case (cycle)
-               0:      `EXEC_WRITE(`_SP - 1, `_PCH);
-               1:      `EXEC_WRITE(`_SP - 2, `_PCL);
-               2:      `EXEC_NEWCYCLE;
+               0:      `EXEC_WRITE(`_SP - 1, `_PCH)
+               1:      `EXEC_WRITE(`_SP - 2, `_PCL)
+               2:      begin
+                               irqack <= 1;
+                               `EXEC_NEWCYCLE
+                       end
                endcase
        end
 `endif
@@ -16,6 +19,7 @@
                2:      begin
                                ie <= 0;
                                `_PC <= {8'b0, jaddr};
+                               irqack <= 0;    // Must be at the same time as we latch jaddr, or we race!
                                `_SP <= `_SP - 2;
                        end
                endcase