summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/lr35902
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/lr35902')
-rw-r--r--src/devices/cpu/lr35902/lr35902d.cpp10
-rw-r--r--src/devices/cpu/lr35902/opc_main.hxx1
2 files changed, 6 insertions, 5 deletions
diff --git a/src/devices/cpu/lr35902/lr35902d.cpp b/src/devices/cpu/lr35902/lr35902d.cpp
index 3b25f9b428d..94ce06f3457 100644
--- a/src/devices/cpu/lr35902/lr35902d.cpp
+++ b/src/devices/cpu/lr35902/lr35902d.cpp
@@ -99,11 +99,11 @@ const lr35902_disassembler::lr35902dasm lr35902_disassembler::mnemonic_cb[256] =
};
const lr35902_disassembler::lr35902dasm lr35902_disassembler::mnemonic_main[256]= {
- {zNOP,nullptr}, {zLD,"bc,N"}, {zLD,"(bc),a"}, {zINC,"bc"},
+ {zNOP,nullptr}, {zLD,"bc,N"}, {zLD,"(bc),a"}, {zINC,"bc"},
{zINC,"b"}, {zDEC,"b"}, {zLD,"b,B"}, {zRLCA,nullptr},
{zLD,"(W),sp"}, {zADD,"hl,bc"}, {zLD,"a,(bc)"}, {zDEC,"bc"},
{zINC,"c"}, {zDEC,"c"}, {zLD,"c,B"}, {zRRCA,nullptr},
- {zSTOP,nullptr}, {zLD,"de,N"}, {zLD,"(de),a"}, {zINC,"de"},
+ {zSTOP,"B"}, {zLD,"de,N"}, {zLD,"(de),a"}, {zINC,"de"},
{zINC,"d"}, {zDEC,"d"}, {zLD,"d,B"}, {zRLA,nullptr},
{zJR,"O"}, {zADD,"hl,de"}, {zLD,"a,(de)"}, {zDEC,"de"},
{zINC,"e"}, {zDEC,"e"}, {zLD,"e,B"}, {zRRA,nullptr},
@@ -128,7 +128,7 @@ const lr35902_disassembler::lr35902dasm lr35902_disassembler::mnemonic_main[256]
{zLD,"l,b"}, {zLD,"l,c"}, {zLD,"l,d"}, {zLD,"l,e"},
{zLD,"l,h"}, {zLD,"l,l"}, {zLD,"l,(hl)"}, {zLD,"l,a"},
{zLD,"(hl),b"}, {zLD,"(hl),c"}, {zLD,"(hl),d"}, {zLD,"(hl),e"},
- {zLD,"(hl),h"}, {zLD,"(hl),l"}, {zHLT,nullptr}, {zLD,"(hl),a"},
+ {zLD,"(hl),h"}, {zLD,"(hl),l"}, {zHLT,nullptr}, {zLD,"(hl),a"},
{zLD,"a,b"}, {zLD,"a,c"}, {zLD,"a,d"}, {zLD,"a,e"},
{zLD,"a,h"}, {zLD,"a,l"}, {zLD,"a,(hl)"}, {zLD,"a,a"},
{zADD,"a,b"}, {zADD,"a,c"}, {zADD,"a,d"}, {zADD,"a,e"},
@@ -149,11 +149,11 @@ const lr35902_disassembler::lr35902dasm lr35902_disassembler::mnemonic_main[256]
{zCP,"h"}, {zCP,"l"}, {zCP,"(hl)"}, {zCP,"a"},
{zRET,"nz"}, {zPOP,"bc"}, {zJP,"nz,A"}, {zJP,"A"},
{zCALL,"nz,A"}, {zPUSH,"bc"}, {zADD,"a,B"}, {zRST,"V"},
- {zRET,"z"}, {zRET,nullptr}, {zJP,"z,A"}, {zDB,"cb"},
+ {zRET,"z"}, {zRET,nullptr}, {zJP,"z,A"}, {zDB,"cb"},
{zCALL,"z,A"}, {zCALL,"A"}, {zADC,"a,B"}, {zRST,"V"},
{zRET,"nc"}, {zPOP,"de"}, {zJP,"nc,A"}, {zDB,"d3"},
{zCALL,"nc,A"}, {zPUSH,"de"}, {zSUB,"B"}, {zRST,"V"},
- {zRET,"c"}, {zRETI,nullptr}, {zJP,"c,A"}, {zDB,"db"},
+ {zRET,"c"}, {zRETI,nullptr},{zJP,"c,A"}, {zDB,"db"},
{zCALL,"c,A"}, {zDB,"dd"}, {zSBC,"a,B"}, {zRST,"V"},
{zLD,"(F),a"}, {zPOP,"hl"}, {zLD,"(C),a"}, {zDB,"e3"},
{zDB,"e4"}, {zPUSH,"hl"}, {zAND,"B"}, {zRST,"V"},
diff --git a/src/devices/cpu/lr35902/opc_main.hxx b/src/devices/cpu/lr35902/opc_main.hxx
index e86a48992e8..3ab9e94d101 100644
--- a/src/devices/cpu/lr35902/opc_main.hxx
+++ b/src/devices/cpu/lr35902/opc_main.hxx
@@ -229,6 +229,7 @@ case 0x0F: /* RRCA */
}
break;
case 0x10: /* STOP */
+ mem_read_byte( m_PC++ );
if ( m_gb_speed_change_pending )
{
if (m_gb_speed == 1)