From bb910e14a4556310f582c0280d0a7469112613a3 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 18 Jun 2017 18:01:33 -0400 Subject: [PATCH] Dealt with the CB page. --- Processors/Z80/Z80.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Processors/Z80/Z80.hpp b/Processors/Z80/Z80.hpp index 5c4531269..e15ecd9d2 100644 --- a/Processors/Z80/Z80.hpp +++ b/Processors/Z80/Z80.hpp @@ -355,14 +355,14 @@ template class Processor { RMWI(a_, op) #define IX_READ_OP_GROUP(op) \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)), \ - Program(WAIT(2), FETCHL(temp8_, INDEX_ADDR()), {MicroOp::op, &temp8_}, WAIT(1)) + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}), \ + Instr(4, Read4(INDEX_ADDR(), temp8_), {MicroOp::op, &temp8_}) #define ADD16(d, s) Program(InternalOperation(4), InternalOperation(3), {MicroOp::ADD16, &s.full, &d.full}) #define ADC16(d, s) Program(InternalOperation(4), InternalOperation(3), {MicroOp::ADC16, &s.full, &d.full})