g65816: Make absolute indexed indirect JMP/JSR fetch destination addresses from program memory instead of data memory when the two are separated; remove some not-useful definitions

* tv965: Correct NMI line hookup
This commit is contained in:
AJR 2022-01-15 18:09:37 -05:00
parent 25383fcef3
commit 259e63ca72
2 changed files with 2 additions and 9 deletions

View File

@ -75,7 +75,6 @@
#define read_8_DXI(A) g65816i_read_8_normal(A) #define read_8_DXI(A) g65816i_read_8_normal(A)
#define read_8_DIY(A) g65816i_read_8_normal(A) #define read_8_DIY(A) g65816i_read_8_normal(A)
#define read_8_DLIY(A) g65816i_read_8_normal(A) #define read_8_DLIY(A) g65816i_read_8_normal(A)
#define read_8_AXI(A) g65816i_read_8_normal(A)
#define read_8_S(A) g65816i_read_8_normal(A) #define read_8_S(A) g65816i_read_8_normal(A)
#define read_8_SIY(A) g65816i_read_8_normal(A) #define read_8_SIY(A) g65816i_read_8_normal(A)
@ -96,7 +95,7 @@
#define read_16_DXI(A) g65816i_read_16_normal(A) #define read_16_DXI(A) g65816i_read_16_normal(A)
#define read_16_DIY(A) g65816i_read_16_normal(A) #define read_16_DIY(A) g65816i_read_16_normal(A)
#define read_16_DLIY(A) g65816i_read_16_normal(A) #define read_16_DLIY(A) g65816i_read_16_normal(A)
#define read_16_AXI(A) g65816i_read_16_normal(A) #define read_16_AXI(A) g65816i_read_16_immediate(A)
#define read_16_S(A) g65816i_read_16_normal(A) #define read_16_S(A) g65816i_read_16_normal(A)
#define read_16_SIY(A) g65816i_read_16_normal(A) #define read_16_SIY(A) g65816i_read_16_normal(A)
@ -117,7 +116,6 @@
#define read_24_DXI(A) g65816i_read_24_normal(A) #define read_24_DXI(A) g65816i_read_24_normal(A)
#define read_24_DIY(A) g65816i_read_24_normal(A) #define read_24_DIY(A) g65816i_read_24_normal(A)
#define read_24_DLIY(A) g65816i_read_24_normal(A) #define read_24_DLIY(A) g65816i_read_24_normal(A)
#define read_24_AXI(A) g65816i_read_24_normal(A)
#define read_24_S(A) g65816i_read_24_normal(A) #define read_24_S(A) g65816i_read_24_normal(A)
#define read_24_SIY(A) g65816i_read_24_normal(A) #define read_24_SIY(A) g65816i_read_24_normal(A)
@ -137,7 +135,6 @@
#define write_8_DXI(A, V) g65816i_write_8_normal(A, V) #define write_8_DXI(A, V) g65816i_write_8_normal(A, V)
#define write_8_DIY(A, V) g65816i_write_8_normal(A, V) #define write_8_DIY(A, V) g65816i_write_8_normal(A, V)
#define write_8_DLIY(A, V) g65816i_write_8_normal(A, V) #define write_8_DLIY(A, V) g65816i_write_8_normal(A, V)
#define write_8_AXI(A, V) g65816i_write_8_normal(A, V)
#define write_8_S(A, V) g65816i_write_8_normal(A, V) #define write_8_S(A, V) g65816i_write_8_normal(A, V)
#define write_8_SIY(A, V) g65816i_write_8_normal(A, V) #define write_8_SIY(A, V) g65816i_write_8_normal(A, V)
@ -157,7 +154,6 @@
#define write_16_DXI(A, V) g65816i_write_16_normal(A, V) #define write_16_DXI(A, V) g65816i_write_16_normal(A, V)
#define write_16_DIY(A, V) g65816i_write_16_normal(A, V) #define write_16_DIY(A, V) g65816i_write_16_normal(A, V)
#define write_16_DLIY(A, V) g65816i_write_16_normal(A, V) #define write_16_DLIY(A, V) g65816i_write_16_normal(A, V)
#define write_16_AXI(A, V) g65816i_write_16_normal(A, V)
#define write_16_S(A, V) g65816i_write_16_normal(A, V) #define write_16_S(A, V) g65816i_write_16_normal(A, V)
#define write_16_SIY(A, V) g65816i_write_16_normal(A, V) #define write_16_SIY(A, V) g65816i_write_16_normal(A, V)
@ -178,7 +174,6 @@
#define OPER_8_DXI() read_8_DXI(EA_DXI()) #define OPER_8_DXI() read_8_DXI(EA_DXI())
#define OPER_8_DIY() read_8_DIY(EA_DIY()) #define OPER_8_DIY() read_8_DIY(EA_DIY())
#define OPER_8_DLIY() read_8_DLIY(EA_DLIY()) #define OPER_8_DLIY() read_8_DLIY(EA_DLIY())
#define OPER_8_AXI() read_8_AXI(EA_AXI())
#define OPER_8_S() read_8_S(EA_S()) #define OPER_8_S() read_8_S(EA_S())
#define OPER_8_SIY() read_8_SIY(EA_SIY()) #define OPER_8_SIY() read_8_SIY(EA_SIY())
@ -198,7 +193,6 @@
#define OPER_16_DXI() read_16_DXI(EA_DXI()) #define OPER_16_DXI() read_16_DXI(EA_DXI())
#define OPER_16_DIY() read_16_DIY(EA_DIY()) #define OPER_16_DIY() read_16_DIY(EA_DIY())
#define OPER_16_DLIY() read_16_DLIY(EA_DLIY()) #define OPER_16_DLIY() read_16_DLIY(EA_DLIY())
#define OPER_16_AXI() read_16_AXI(EA_AXI())
#define OPER_16_S() read_16_S(EA_S()) #define OPER_16_S() read_16_S(EA_S())
#define OPER_16_SIY() read_16_SIY(EA_SIY()) #define OPER_16_SIY() read_16_SIY(EA_SIY())
@ -218,7 +212,6 @@
#define OPER_24_DXI() read_24_DXI(EA_DXI()) #define OPER_24_DXI() read_24_DXI(EA_DXI())
#define OPER_24_DIY() read_24_DIY(EA_DIY()) #define OPER_24_DIY() read_24_DIY(EA_DIY())
#define OPER_24_DLIY() read_24_DLIY(EA_DLIY()) #define OPER_24_DLIY() read_24_DLIY(EA_DLIY())
#define OPER_24_AXI() read_24_AXI(EA_AXI())
#define OPER_24_S() read_24_S(EA_S()) #define OPER_24_S() read_24_S(EA_S())
#define OPER_24_SIY() read_24_SIY(EA_SIY()) #define OPER_24_SIY() read_24_SIY(EA_SIY())

View File

@ -86,7 +86,7 @@ void tv965_state::tv965(machine_config &config)
scn2672_device &crtc(SCN2672(config, "crtc", 26.9892_MHz_XTAL / 10)); scn2672_device &crtc(SCN2672(config, "crtc", 26.9892_MHz_XTAL / 10));
crtc.set_character_width(10); crtc.set_character_width(10);
crtc.set_display_callback(FUNC(tv965_state::draw_character)); crtc.set_display_callback(FUNC(tv965_state::draw_character));
crtc.intr_callback().set_inputline("maincpu", INPUT_LINE_NMI); crtc.intr_callback().set_inputline(m_maincpu, G65816_LINE_NMI);
crtc.set_screen("screen"); crtc.set_screen("screen");
mos6551_device &acia1(MOS6551(config, "acia1", 0)); mos6551_device &acia1(MOS6551(config, "acia1", 0));