summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/mac.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/mac.cpp')
-rw-r--r--src/mame/machine/mac.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp
index 68df2a75ed4..a8a9e980ba1 100644
--- a/src/mame/machine/mac.cpp
+++ b/src/mame/machine/mac.cpp
@@ -1207,7 +1207,7 @@ READ16_MEMBER ( mac_state::mac_iwm_r )
result = fdc->read(offset >> 8);
if (LOG_MAC_IWM)
- printf("mac_iwm_r: offset=0x%08x mem_mask %04x = %02x (PC %x)\n", offset, mem_mask, result, m_maincpu->pc());
+ printf("%s mac_iwm_r: offset=0x%08x mem_mask %04x = %02x\n", machine().describe_context().c_str(), offset, mem_mask, result);
return (result << 8) | result;
}
@@ -1288,7 +1288,7 @@ WRITE_LINE_MEMBER(mac_state::mac_adb_via_out_cb2)
READ8_MEMBER(mac_state::mac_via_in_a)
{
-// printf("VIA1 IN_A (PC %x)\n", m_maincpu->safe_pc());
+// printf("%s VIA1 IN_A\n", machine().describe_context().c_str());
switch (m_model)
{
@@ -1343,7 +1343,7 @@ READ8_MEMBER(mac_state::mac_via_in_a)
READ8_MEMBER(mac_state::mac_via_in_a_pmu)
{
-// printf("VIA1 IN_A (PC %x)\n", m_maincpu->safe_pc());
+// printf("%s VIA1 IN_A\n", machine().describe_context().c_str());
#if LOG_ADB
// printf("Read PM data %x\n", m_pm_data_recv);
@@ -1389,7 +1389,7 @@ READ8_MEMBER(mac_state::mac_via_in_b)
val |= m_rtc->data_r();
}
-// printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc());
+// printf("%s VIA1 IN_B = %02x\n", machine().describe_context().c_str(), val);
return val;
}
@@ -1418,7 +1418,7 @@ READ8_MEMBER(mac_state::mac_via_in_b_ii)
val |= m_cuda->get_treq()<<3;
}
-// printf("VIA1 IN_B_II = %02x (PC %x)\n", val, m_maincpu->safe_pc());
+// printf("%s VIA1 IN_B_II = %02x\n", machine().describe_context().c_str(), val);
return val;
}
@@ -1433,7 +1433,7 @@ READ8_MEMBER(mac_state::mac_via_in_b_via2pmu)
val |= 0x40;
-// printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc());
+// printf("%s VIA1 IN_B = %02x\n", machine().describe_context().c_str(), val);
return val;
}
@@ -1444,7 +1444,7 @@ READ8_MEMBER(mac_state::mac_via_in_b_pmu)
// printf("Read VIA B: PM_ACK %x\n", m_pm_ack);
val = 0x80 | 0x04 | m_pm_ack; // SCC wait/request (bit 2 must be set at 900c1a or startup tests always fail)
-// printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc());
+// printf("%s VIA1 IN_B = %02x\n", machine().describe_context().c_str(), val);
return val;
}
@@ -1452,7 +1452,7 @@ READ8_MEMBER(mac_state::mac_via_in_b_pmu)
WRITE8_MEMBER(mac_state::mac_via_out_a)
{
device_t *fdc = machine().device("fdc");
-// printf("VIA1 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// printf("%s VIA1 OUT A: %02x\n", machine().describe_context().c_str(), data);
set_scc_waitrequest((data & 0x80) >> 7);
m_screen_buffer = (data & 0x40) >> 6;
@@ -1484,7 +1484,7 @@ WRITE8_MEMBER(mac_state::mac_via_out_a)
WRITE8_MEMBER(mac_state::mac_via_out_a_pmu)
{
-// printf("VIA1 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// printf("%s VIA1 OUT A: %02x\n", machine().describe_context().c_str(), data);
#if LOG_ADB
// printf("%02x to PM\n", data);
@@ -1495,7 +1495,7 @@ WRITE8_MEMBER(mac_state::mac_via_out_a_pmu)
WRITE8_MEMBER(mac_state::mac_via_out_b)
{
-// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
if (AUDIO_IS_CLASSIC)
{
@@ -1530,7 +1530,7 @@ void mac_state::update_volume(void)
WRITE8_MEMBER(mac_state::mac_via_out_b_bbadb)
{
-// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
// SE and Classic have SCSI enable/disable here
if ((m_model == MODEL_MAC_SE) || (m_model == MODEL_MAC_CLASSIC))
@@ -1560,10 +1560,10 @@ WRITE8_MEMBER(mac_state::mac_via_out_b_bbadb)
WRITE8_MEMBER(mac_state::mac_via_out_b_egadb)
{
-// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->pc());
+// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
#if LOG_ADB
- printf("68K: New Egret state: SS %d VF %d (PC %x)\n", (data>>5)&1, (data>>4)&1, m_maincpu->pc());
+ printf("%s 68K: New Egret state: SS %d VF %d\n", machine().describe_context().c_str(), (data>>5)&1, (data>>4)&1);
#endif
m_egret->set_via_full((data&0x10) ? 1 : 0);
m_egret->set_sys_session((data&0x20) ? 1 : 0);
@@ -1571,10 +1571,10 @@ WRITE8_MEMBER(mac_state::mac_via_out_b_egadb)
WRITE8_MEMBER(mac_state::mac_via_out_b_cdadb)
{
-// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->pc());
+// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
#if LOG_ADB
- printf("68K: New Cuda state: TIP %d BYTEACK %d (PC %x)\n", (data>>5)&1, (data>>4)&1, m_maincpu->pc());
+ printf("%s 68K: New Cuda state: TIP %d BYTEACK %d\n", machine().describe_context().c_str(), (data>>5)&1, (data>>4)&1);
#endif
m_cuda->set_byteack((data&0x10) ? 1 : 0);
m_cuda->set_tip((data&0x20) ? 1 : 0);
@@ -1582,12 +1582,12 @@ WRITE8_MEMBER(mac_state::mac_via_out_b_cdadb)
WRITE8_MEMBER(mac_state::mac_via_out_b_via2pmu)
{
-// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
}
WRITE8_MEMBER(mac_state::mac_via_out_b_pmu)
{
-// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
device_t *fdc = machine().device("fdc");
@@ -1750,7 +1750,7 @@ READ8_MEMBER(mac_state::mac_via2_in_a_pmu)
READ8_MEMBER(mac_state::mac_via2_in_b)
{
-// logerror("VIA2 IN B (PC %x)\n", m_maincpu->safe_pc());
+// logerror("%s VIA2 IN B\n", machine().describe_context());
if ((m_model == MODEL_MAC_LC) || (m_model == MODEL_MAC_LC_II) || (m_model == MODEL_MAC_CLASSIC_II))
{
@@ -1767,7 +1767,7 @@ READ8_MEMBER(mac_state::mac_via2_in_b)
READ8_MEMBER(mac_state::mac_via2_in_b_pmu)
{
-// logerror("VIA2 IN B (PC %x)\n", m_maincpu->safe_pc());
+// logerror("%s VIA2 IN B\n", machine().describe_context());
if (m_pm_ack == 2)
{
@@ -1781,18 +1781,18 @@ READ8_MEMBER(mac_state::mac_via2_in_b_pmu)
WRITE8_MEMBER(mac_state::mac_via2_out_a)
{
-// logerror("VIA2 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// logerror("%s VIA2 OUT A: %02x\n", machine().describe_context(), data);
}
WRITE8_MEMBER(mac_state::mac_via2_out_a_pmu)
{
-// logerror("VIA2 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// logerror("%s VIA2 OUT A: %02x\n", machine().describe_context(), data);
m_pm_data_send = data;
}
WRITE8_MEMBER(mac_state::mac_via2_out_b)
{
-// logerror("VIA2 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
+// logerror("%s VIA2 OUT B: %02x\n", machine().describe_context(), data);
// chain 60.15 Hz to VIA1
m_via1->write_ca1(data>>7);
@@ -1806,7 +1806,7 @@ WRITE8_MEMBER(mac_state::mac_via2_out_b)
WRITE8_MEMBER(mac_state::mac_via2_out_b_pmu)
{
-// logerror("VIA2 OUT B PMU: %02x (PC %x)\n", data, m_maincpu->pc());
+// logerror("%s VIA2 OUT B PMU: %02x\n", machine().describe_context(), data);
if ((data & 4) && !(m_pm_req & 4))
{