1
0
mirror of https://github.com/jscrane/r65emu.git synced 2024-07-17 23:29:05 +00:00

fixes for Energia IDE

This commit is contained in:
Stephen Crane 2017-10-05 09:55:39 +01:00
parent fc7ded7f40
commit e181f8e483
2 changed files with 6 additions and 6 deletions

View File

@ -1020,17 +1020,17 @@ z80::z80(Memory &m, PortDevice<z80> &ports): CPU(m)
*p++ = &z80::retpo; *p++ = &z80::pophl;
*p++ = &z80::jppo; *p++ = &z80::exSPhl;
*p++ = &z80::callpo; *p++ = &z80::pushhl;
*p++ = &z80::and; *p++ = &z80::rst20;
*p++ = &z80::and_; *p++ = &z80::rst20;
*p++ = &z80::retpe; *p++ = &z80::jphl;
*p++ = &z80::jppe; *p++ = &z80::exdehl;
*p++ = &z80::callpe; *p++ = &z80::ed;
*p++ = &z80::xor; *p++ = &z80::rst28;
*p++ = &z80::xor_; *p++ = &z80::rst28;
// 0xf0
*p++ = &z80::retp; *p++ = &z80::popaf;
*p++ = &z80::jpp; *p++ = &z80::di;
*p++ = &z80::callp; *p++ = &z80::pushaf;
*p++ = &z80::or; *p++ = &z80::rst30;
*p++ = &z80::or_; *p++ = &z80::rst30;
*p++ = &z80::retm; *p++ = &z80::ldsphl;
*p++ = &z80::jpm; *p++ = &z80::ei;
*p++ = &z80::callm; *p++ = &z80::fd;

6
z80.h
View File

@ -713,7 +713,7 @@ private:
void exSPhl() { _exSP(HL); }
void callpo() { _call(!flags.P); }
void pushhl() { _mc(IR, 1); _push(HL); }
void and() { _and(_rb(PC++)); }
void and_() { _and(_rb(PC++)); }
void rst20() { _mc(IR, 11); _push(PC); PC = 0x20; }
// 0xe8
@ -733,7 +733,7 @@ private:
void exdehl() { _exch(DE, HL); }
void callpe() { _call(flags.P); }
void ed();
void xor() { _xor(_rb(PC++)); }
void xor_() { _xor(_rb(PC++)); }
void rst28() { _mc(IR, 11); _push(PC); PC = 0x28; }
// 0xf0
@ -743,7 +743,7 @@ private:
void di() { _iff1 = _iff2 = false; }
void callp() { _call(!flags.S); }
void pushaf() { _mc(IR, 1); _push(AF); }
void or() { _or(_rb(PC++)); }
void or_() { _or(_rb(PC++)); }
void rst30() { _mc(IR, 11); _push(PC); PC = 0x30; }
// 0xf8