Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(MESS) ti89: Removed runtime tagmap lookups. (nw)

Browse Source
This commit is contained in:
Curt Coder 2013-01-26 21:40:40 +00:00
parent e226976939
commit 69abd4265b
2 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mess/drivers/ti89.c
View File

@ -25,13 +25,23 @@
UINT8 ti68k_state::keypad_r (running_machine &machine) UINT8 ti68k_state::keypad_r (running_machine &machine)
{ {
UINT8 port, bit, data = 0xff; UINT8 bit, data = 0xff;
static const char *const bitnames[] = {"BIT0", "BIT1", "BIT2", "BIT3", "BIT4", "BIT5", "BIT6", "BIT7"};
for (bit = 0; bit < 10; bit++) for (bit = 0; bit < 10; bit++)
{
if (~m_kb_mask & (0x01 << bit)) if (~m_kb_mask & (0x01 << bit))
for (port = 0; port < 8; port++) {
data ^= machine.root_device().ioport(bitnames[port])->read() & (0x01 << bit) ? 0x01 << port : 0x00; data ^= m_io_bit0->read() & (0x01 << bit) ? 0x01 : 0x00;
data ^= m_io_bit1->read() & (0x01 << bit) ? 0x02 : 0x00;
data ^= m_io_bit2->read() & (0x01 << bit) ? 0x04 : 0x00;
data ^= m_io_bit3->read() & (0x01 << bit) ? 0x08 : 0x00;
data ^= m_io_bit4->read() & (0x01 << bit) ? 0x10 : 0x00;
data ^= m_io_bit5->read() & (0x01 << bit) ? 0x20 : 0x00;
data ^= m_io_bit6->read() & (0x01 << bit) ? 0x40 : 0x00;
data ^= m_io_bit7->read() & (0x01 << bit) ? 0x80 : 0x00;
}
}
return data; return data;
} }
@ -145,9 +155,7 @@ READ16_MEMBER ( ti68k_state::flash_r )
} }
else else
{ {
UINT16 *rom_base = (UINT16 *)(*space.machine().root_device().memregion("flash")); return m_rom_base[offset];
return rom_base[offset];
} }
} }
@ -166,7 +174,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ti68k_state::ti68k_timer_callback)
m_timer_val = (m_io_hw1[0x0b]) & 0xff; m_timer_val = (m_io_hw1[0x0b]) & 0xff;
} }
if (!BIT(m_io_hw1[0x0a], 7) && ((m_hw_version == m_HW1) || (!BIT(m_io_hw1[0x0f], 2) && !BIT(m_io_hw1[0x0f], 1)))) if (!BIT(m_io_hw1[0x0a], 7) && ((m_hw_version == HW1) || (!BIT(m_io_hw1[0x0f], 2) && !BIT(m_io_hw1[0x0f], 1))))
{ {
if (!(m_timer & 0x003f)) if (!(m_timer & 0x003f))
m_maincpu->set_input_line(M68K_IRQ_1, HOLD_LINE); m_maincpu->set_input_line(M68K_IRQ_1, HOLD_LINE);
@ -416,31 +424,31 @@ INPUT_PORTS_END
void ti68k_state::machine_start() void ti68k_state::machine_start()
{ {
UINT16 *rom = (UINT16 *)(*machine().root_device().memregion("flash")); m_rom_base = (UINT16 *)(*memregion("flash"));
int i; int i;
m_flash_mem = !((rom[0x32] & 0x0f) != 0); m_flash_mem = !((m_rom_base[0x32] & 0x0f) != 0);
if (m_flash_mem) if (m_flash_mem)
{ {
UINT32 base = ((((rom[0x82]) << 16) | rom[0x83]) & 0xffff)>>1; UINT32 base = ((((m_rom_base[0x82]) << 16) | m_rom_base[0x83]) & 0xffff)>>1;
if (rom[base] >= 8) if (m_rom_base[base] >= 8)
m_hw_version = ((rom[base + 0x0b]) << 16) | rom[base + 0x0c]; m_hw_version = ((m_rom_base[base + 0x0b]) << 16) | m_rom_base[base + 0x0c];
if (!m_hw_version) if (!m_hw_version)
m_hw_version = m_HW1; m_hw_version = HW1;
for (i = 0x9000; i < 0x100000; i++) for (i = 0x9000; i < 0x100000; i++)
if (rom[i] == 0xcccc && rom[i + 1] == 0xcccc) if (m_rom_base[i] == 0xcccc && m_rom_base[i + 1] == 0xcccc)
break; break;
m_initial_pc = ((rom[i + 4]) << 16) | rom[i + 5]; m_initial_pc = ((m_rom_base[i + 4]) << 16) | m_rom_base[i + 5];
} }
else else
{ {
m_hw_version = m_HW1; m_hw_version = HW1;
m_initial_pc = ((rom[2]) << 16) | rom[3]; m_initial_pc = ((m_rom_base[2]) << 16) | m_rom_base[3];
m_maincpu->space(AS_PROGRAM).unmap_read(0x200000, 0x5fffff); m_maincpu->space(AS_PROGRAM).unmap_read(0x200000, 0x5fffff);

22
src/mess/includes/ti89.h
View File

@ -15,20 +15,38 @@ public:
ti68k_state(const machine_config &mconfig, device_type type, const char *tag) ti68k_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_flash(*this, "flash") m_flash(*this, "flash"),
m_io_bit0(*this, "BIT0"),
m_io_bit1(*this, "BIT1"),
m_io_bit2(*this, "BIT2"),
m_io_bit3(*this, "BIT3"),
m_io_bit4(*this, "BIT4"),
m_io_bit5(*this, "BIT5"),
m_io_bit6(*this, "BIT6"),
m_io_bit7(*this, "BIT7")
{ } { }
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<sharp_unk128mbit_device> m_flash; required_device<sharp_unk128mbit_device> m_flash;
required_ioport m_io_bit0;
required_ioport m_io_bit1;
required_ioport m_io_bit2;
required_ioport m_io_bit3;
required_ioport m_io_bit4;
required_ioport m_io_bit5;
required_ioport m_io_bit6;
required_ioport m_io_bit7;
// hardware versions // hardware versions
enum { m_HW1=1, m_HW2, m_HW3, m_HW4 }; enum { HW1=1, HW2, HW3, HW4 };
// HW specifications // HW specifications
UINT8 m_hw_version; UINT8 m_hw_version;
bool m_flash_mem; bool m_flash_mem;
UINT32 m_initial_pc; UINT32 m_initial_pc;
UINT16 *m_rom_base;
// keyboard // keyboard
UINT16 m_kb_mask; UINT16 m_kb_mask;
UINT8 m_on_key; UINT8 m_on_key;