lose some space & get_safe_pc() (nw)

This commit is contained in:
smf- 2017-12-31 12:52:03 +00:00
parent 6adf45347f
commit c29a52b04d

View File

@ -55,23 +55,19 @@ public:
DECLARE_READ8_MEMBER( astra_fgpa_r )
{
int pc = space.device().safe_pc();
if (offset==fgpa_first_read_addr)
{
return 0xff;
}
else
{
logerror("%08x astra_fgpa_r offset %02x\n", pc, offset);
logerror("%s astra_fgpa_r offset %02x\n", machine().describe_context(), offset);
return 0xff;
}
}
DECLARE_WRITE8_MEMBER( astra_fgpa_w )
{
int pc = space.device().safe_pc();
if (offset==fgpa_rom_write_addr)
{
// the games write most of the ROM data to a port
@ -79,30 +75,26 @@ public:
}
else
{
logerror("%08x astra_fgpa_w offset %02x %02x\n", pc, offset, data);
logerror("%s astra_fgpa_w offset %02x %02x\n", machine().describe_context(), offset, data);
}
}
/* 2nd copy for the 2nd board (assume same addresses for now */
DECLARE_READ8_MEMBER( astra_fgpa_slave_r )
{
int pc = space.device().safe_pc();
if (offset==fgpa_first_read_addr)
{
return 0xff;
}
else
{
logerror("%08x astra_fgpa_slave_r offset %02x\n", pc, offset);
logerror("%s astra_fgpa_slave_r offset %02x\n", machine().describe_context(), offset);
return 0xff;
}
}
DECLARE_WRITE8_MEMBER( astra_fgpa_slave_w )
{
int pc = space.device().safe_pc();
if (offset==fgpa_rom_write_addr)
{
// the games write most of the ROM data to a port
@ -110,7 +102,7 @@ public:
}
else
{
logerror("%08x astra_fgpa_slave_w offset %02x %02x\n", pc, offset, data);
logerror("%s astra_fgpa_slave_w offset %02x %02x\n", machine().describe_context(), offset, data);
}
}
@ -132,7 +124,6 @@ public:
READ32_MEMBER(astrafr_state::astrafr_mem_r)
{
int pc = space.device().safe_pc();
int cs = m_maincpu->get_cs(offset * 4);
switch ( cs )
@ -148,7 +139,7 @@ READ32_MEMBER(astrafr_state::astrafr_mem_r)
return m_mainram[offset];
default:
logerror("%08x maincpu read access offset %08x mem_mask %08x cs %d\n", pc, offset*4, mem_mask, cs);
logerror("%s maincpu read access offset %08x mem_mask %08x cs %d\n", machine().describe_context(), offset*4, mem_mask, cs);
}
@ -159,7 +150,6 @@ READ32_MEMBER(astrafr_state::astrafr_mem_r)
WRITE32_MEMBER(astrafr_state::astrafr_mem_w)
{
int pc = space.device().safe_pc();
int address = offset * 4;
int cs = m_maincpu->get_cs(address);
@ -182,14 +172,13 @@ WRITE32_MEMBER(astrafr_state::astrafr_mem_w)
break;
default:
logerror("%08x maincpu write access offset %08x data %08x mem_mask %08x cs %d\n", pc, address, data, mem_mask, cs);
logerror("%s maincpu write access offset %08x data %08x mem_mask %08x cs %d\n", machine().describe_context(), address, data, mem_mask, cs);
}
}
READ32_MEMBER(astrafr_state::astrafr_slave_mem_r)
{
int pc = space.device().safe_pc();
int cs = m_slavecpu->get_cs(offset * 4);
switch ( cs )
@ -205,7 +194,7 @@ READ32_MEMBER(astrafr_state::astrafr_slave_mem_r)
return m_slaveram[offset];
default:
logerror("%08x slavecpu read access offset %08x mem_mask %08x cs %d\n", pc, offset*4, mem_mask, cs);
logerror("%s slavecpu read access offset %08x mem_mask %08x cs %d\n", machine().describe_context(), offset*4, mem_mask, cs);
}
@ -214,7 +203,6 @@ READ32_MEMBER(astrafr_state::astrafr_slave_mem_r)
WRITE32_MEMBER(astrafr_state::astrafr_slave_mem_w)
{
int pc = space.device().safe_pc();
int address = offset * 4;
int cs = m_slavecpu->get_cs(address);
@ -237,7 +225,7 @@ WRITE32_MEMBER(astrafr_state::astrafr_slave_mem_w)
break;
default:
logerror("%08x slavecpu write access offset %08x data %08x mem_mask %08x cs %d\n", pc, address, data, mem_mask, cs);
logerror("%s slavecpu write access offset %08x data %08x mem_mask %08x cs %d\n", machine().describe_context(), address, data, mem_mask, cs);
}
}