From 18a0b2a85a53d2173ca75d17085aaac6a5a60267 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sun, 20 Jan 2013 19:47:38 +0000 Subject: [PATCH] m740: Correct disassembly for bit+zp+rel. offset form of BBC/BBS [R. Belmont] --- src/emu/cpu/m6502/dm740.lst | 32 ++++++++++++++++---------------- src/emu/cpu/m6502/m6502.c | 5 +++++ src/emu/cpu/m6502/m6502.h | 3 ++- src/emu/cpu/m6502/m740.h | 4 ++-- src/emu/cpu/m6502/om740.lst | 4 ++-- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/emu/cpu/m6502/dm740.lst b/src/emu/cpu/m6502/dm740.lst index d7716c22c05..a55447cd32c 100644 --- a/src/emu/cpu/m6502/dm740.lst +++ b/src/emu/cpu/m6502/dm740.lst @@ -1,18 +1,18 @@ # m740 device -brk_imp ora_idx kil_non bbs_acc nop_zpg ora_zpg asl_zpg bbs_biz php_imp ora_imm asl_acc seb_acc nop_aba ora_aba asl_aba seb_biz -bpl_rel ora_idy clt_imp bbc_acc nop_zpx ora_zpx asl_zpx bbc_biz clc_imp ora_aby nop_imp clb_acc nop_abx ora_abx asl_abx clb_biz -jsr_adr and_idx jsr_spg bbs_acc bit_zpg and_zpg rol_zpg bbs_biz plp_imp and_imm rol_acc seb_acc bit_aba and_aba rol_aba seb_biz -bmi_rel and_idy set_imp bbc_acc nop_zpx and_zpx rol_zpx bbc_biz sec_imp and_aby nop_imp clb_acc ldm_imz and_abx rol_abx clb_biz -rti_imp eor_idx kil_non bbs_acc nop_zpg eor_zpg lsr_zpg bbs_biz pha_imp eor_imm lsr_acc seb_acc jmp_adr eor_aba lsr_aba seb_biz -bvc_rel eor_idy kil_non bbc_acc nop_zpx eor_zpx lsr_zpx bbc_biz cli_imp eor_aby nop_imp clb_acc nop_abx eor_abx lsr_abx clb_biz -rts_imp adc_idx kil_non bbs_acc nop_zpg adc_zpg ror_zpg bbs_biz pla_imp adc_imm ror_acc seb_acc jmp_ind adc_aba ror_aba seb_biz -bvs_rel adc_idy kil_non bbc_acc nop_zpx adc_zpx ror_zpx bbc_biz sei_imp adc_aby nop_imp clb_acc nop_abx adc_abx ror_abx clb_biz -bra_rel sta_idx rrf_zpg bbs_acc sty_zpg sta_zpg stx_zpg bbs_biz dey_imp nop_imm txa_imp seb_acc sty_aba sta_aba stx_aba seb_biz -bcc_rel sta_idy kil_non bbc_acc sty_zpx sta_zpx stx_zpy bbc_biz tya_imp sta_aby txs_imp clb_acc shy_abx sta_abx shx_aby clb_biz -ldy_imm lda_idx ldx_imm bbs_acc ldy_zpg lda_zpg ldx_zpg bbs_biz tay_imp lda_imm tax_imp seb_acc ldy_aba lda_aba ldx_aba seb_biz -bcs_rel lda_idy kil_non bbc_acc ldy_zpx lda_zpx ldx_zpy bbc_biz clv_imp lda_aby tsx_imp clb_acc ldy_abx lda_abx ldx_aby clb_biz -cpy_imm cmp_idx nop_imm bbs_acc cpy_zpg cmp_zpg dec_zpg bbs_biz iny_imp cmp_imm dex_imp seb_acc cpy_aba cmp_aba dec_aba seb_biz -bne_rel cmp_idy kil_non bbc_acc nop_zpx cmp_zpx dec_zpx bbc_biz cld_imp cmp_aby nop_imp clb_acc nop_abx cmp_abx dec_abx clb_biz -cpx_imm sbc_idx nop_imm bbs_acc cpx_zpg sbc_zpg inc_zpg bbs_biz inx_imp sbc_imm nop_imp seb_acc cpx_aba sbc_aba inc_aba seb_biz -beq_rel sbc_idy kil_non bbc_acc nop_zpx sbc_zpx inc_zpx bbc_biz sed_imp sbc_aby nop_imp clb_acc nop_abx sbc_abx inc_abx clb_biz +brk_imp ora_idx kil_non bbs_acc nop_zpg ora_zpg asl_zpg bbs_bzr php_imp ora_imm asl_acc seb_acc nop_aba ora_aba asl_aba seb_biz +bpl_rel ora_idy clt_imp bbc_acc nop_zpx ora_zpx asl_zpx bbc_bzr clc_imp ora_aby nop_imp clb_acc nop_abx ora_abx asl_abx clb_biz +jsr_adr and_idx jsr_spg bbs_acc bit_zpg and_zpg rol_zpg bbs_bzr plp_imp and_imm rol_acc seb_acc bit_aba and_aba rol_aba seb_biz +bmi_rel and_idy set_imp bbc_acc nop_zpx and_zpx rol_zpx bbc_bzr sec_imp and_aby nop_imp clb_acc ldm_imz and_abx rol_abx clb_biz +rti_imp eor_idx kil_non bbs_acc nop_zpg eor_zpg lsr_zpg bbs_bzr pha_imp eor_imm lsr_acc seb_acc jmp_adr eor_aba lsr_aba seb_biz +bvc_rel eor_idy kil_non bbc_acc nop_zpx eor_zpx lsr_zpx bbc_bzr cli_imp eor_aby nop_imp clb_acc nop_abx eor_abx lsr_abx clb_biz +rts_imp adc_idx kil_non bbs_acc nop_zpg adc_zpg ror_zpg bbs_bzr pla_imp adc_imm ror_acc seb_acc jmp_ind adc_aba ror_aba seb_biz +bvs_rel adc_idy kil_non bbc_acc nop_zpx adc_zpx ror_zpx bbc_bzr sei_imp adc_aby nop_imp clb_acc nop_abx adc_abx ror_abx clb_biz +bra_rel sta_idx rrf_zpg bbs_acc sty_zpg sta_zpg stx_zpg bbs_bzr dey_imp nop_imm txa_imp seb_acc sty_aba sta_aba stx_aba seb_biz +bcc_rel sta_idy kil_non bbc_acc sty_zpx sta_zpx stx_zpy bbc_bzr tya_imp sta_aby txs_imp clb_acc shy_abx sta_abx shx_aby clb_biz +ldy_imm lda_idx ldx_imm bbs_acc ldy_zpg lda_zpg ldx_zpg bbs_bzr tay_imp lda_imm tax_imp seb_acc ldy_aba lda_aba ldx_aba seb_biz +bcs_rel lda_idy kil_non bbc_acc ldy_zpx lda_zpx ldx_zpy bbc_bzr clv_imp lda_aby tsx_imp clb_acc ldy_abx lda_abx ldx_aby clb_biz +cpy_imm cmp_idx nop_imm bbs_acc cpy_zpg cmp_zpg dec_zpg bbs_bzr iny_imp cmp_imm dex_imp seb_acc cpy_aba cmp_aba dec_aba seb_biz +bne_rel cmp_idy kil_non bbc_acc nop_zpx cmp_zpx dec_zpx bbc_bzr cld_imp cmp_aby nop_imp clb_acc nop_abx cmp_abx dec_abx clb_biz +cpx_imm sbc_idx nop_imm bbs_acc cpx_zpg sbc_zpg inc_zpg bbs_bzr inx_imp sbc_imm nop_imp seb_acc cpx_aba sbc_aba inc_aba seb_biz +beq_rel sbc_idy kil_non bbc_acc nop_zpx sbc_zpx inc_zpx bbc_bzr sed_imp sbc_aby nop_imp clb_acc nop_abx sbc_abx inc_abx clb_biz reset740 diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index f44a7181c37..d944a433415 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -617,6 +617,11 @@ offs_t m6502_device::disassemble_generic(char *buffer, offs_t pc, const UINT8 *o flags |= 2; break; + case DASM_bzr: + sprintf(buffer, " %d, $%02x, $%04x", (opram[0] >> 5) & 7, opram[1], (pc & 0xf0000) | UINT16(pc + 1 + INT8(opram[2]))); + flags |= 3; + break; + default: fprintf(stderr, "Unhandled dasm mode %d\n", e.mode); abort(); diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index 31b1666cee9..9fe6c9180a9 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -127,7 +127,8 @@ protected: DASM_zpy, /* zero page + Y */ DASM_imz, /* load immediate byte, store to zero page address (M740) */ DASM_spg, /* "special page": implied FF00 plus immediate value (M740)*/ - DASM_biz /* bit, zero page (M740) */ + DASM_biz, /* bit, zero page (M740) */ + DASM_bzr /* bit, zero page, relative offset (M740) */ }; enum { diff --git a/src/emu/cpu/m6502/m740.h b/src/emu/cpu/m6502/m740.h index 2632e0595c6..1a6951ed6e5 100644 --- a/src/emu/cpu/m6502/m740.h +++ b/src/emu/cpu/m6502/m740.h @@ -70,8 +70,8 @@ protected: O(reset740); O(seb_biz); O(seb_acc); O(clb_biz); O(clb_acc); - O(bbc_biz); O(bbc_acc); - O(bbs_biz); O(bbs_acc); + O(bbc_bzr); O(bbc_acc); + O(bbs_bzr); O(bbs_acc); O(rrf_zpg); O(bra_rel); diff --git a/src/emu/cpu/m6502/om740.lst b/src/emu/cpu/m6502/om740.lst index 642bd45ed5f..bb85aaabda1 100644 --- a/src/emu/cpu/m6502/om740.lst +++ b/src/emu/cpu/m6502/om740.lst @@ -50,7 +50,7 @@ seb_biz write(TMP, TMP2); prefetch(); -bbc_biz +bbc_bzr TMP = read_pc(); TMP2 = read(TMP); TMP = read_pc(); @@ -60,7 +60,7 @@ bbc_biz } prefetch(); -bbs_biz +bbs_bzr TMP = read_pc(); TMP2 = read(TMP); TMP = read_pc();