Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-06 18:39:28 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

(MESS) apple3: Some cleanup, plus writes to Fxxx when write protect isn't asserted go through to the underlying RAM. [R. Belmont]

Browse Source
This commit is contained in:
R. Belmont 2014-02-17 13:08:10 +00:00
parent 8c5f5f9014
commit 91df0b0fa1
2 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mess/includes/apple3.h
View File

@ -129,7 +129,7 @@ private:
UINT8 *m_bank2, *m_bank3, *m_bank4, *m_bank5, *m_bank8, *m_bank9; UINT8 *m_bank2, *m_bank3, *m_bank4, *m_bank5, *m_bank8, *m_bank9;
UINT8 *m_bank10, *m_bank11; UINT8 *m_bank10, *m_bank11;
UINT8 *m_bank6, *m_bank7; UINT8 *m_bank6, *m_bank7rd, *m_bank7wr;
int m_speaker_state; int m_speaker_state;
int m_c040_time; int m_c040_time;
UINT16 m_lastchar, m_strobe; UINT16 m_lastchar, m_strobe;

73
src/mess/machine/apple3.c
View File

@ -53,6 +53,15 @@ static void apple3_update_drives(device_t *device);
#define LOG_MEMORY 1 #define LOG_MEMORY 1
#define LOG_INDXADDR 1 #define LOG_INDXADDR 1
#define ENV_SLOWSPEED (0x80)
#define ENV_IOENABLE (0x40)
#define ENV_VIDENABLE (0x20)
#define ENV_NMIENABLE (0x10)
#define ENV_WRITEPROT (0x08)
#define ENV_STACK1XX (0x04)
#define ENV_PRIMARYROM (0x02)
#define ENV_ROMENABLE (0x01)
READ8_MEMBER(apple3_state::apple3_c0xx_r) READ8_MEMBER(apple3_state::apple3_c0xx_r)
{ {
UINT8 result = 0xFF; UINT8 result = 0xFF;
@ -402,10 +411,10 @@ void apple3_state::apple3_update_memory()
logerror("apple3_update_memory(): via_0_b=0x%02x via_1_a=0x0x%02x\n", m_via_0_b, m_via_1_a); logerror("apple3_update_memory(): via_0_b=0x%02x via_1_a=0x0x%02x\n", m_via_0_b, m_via_1_a);
} }
machine().device("maincpu")->set_unscaled_clock((m_via_0_a & 0x80) ? 1000000 : 2000000); machine().device("maincpu")->set_unscaled_clock((m_via_0_a & ENV_SLOWSPEED) ? 1000000 : 2000000);
/* bank 2 (0100-01FF) */ /* bank 2 (0100-01FF) */
if (!(m_via_0_a & 0x04)) if (!(m_via_0_a & ENV_STACK1XX))
{ {
if (m_via_0_b < 0x20) if (m_via_0_b < 0x20)
{ {
@ -440,13 +449,13 @@ void apple3_state::apple3_update_memory()
m_bank5 = apple3_bankaddr(~0, 0x2000); m_bank5 = apple3_bankaddr(~0, 0x2000);
/* bank 8 (C000-C0FF) */ /* bank 8 (C000-C0FF) */
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
m_bank8 = apple3_bankaddr(~0, 0x4000); m_bank8 = apple3_bankaddr(~0, 0x4000);
} }
/* bank 9 (C100-C4FF) */ /* bank 9 (C100-C4FF) */
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
m_bank9 = apple3_bankaddr(~0, 0x4100); m_bank9 = apple3_bankaddr(~0, 0x4100);
} }
@ -455,7 +464,7 @@ void apple3_state::apple3_update_memory()
m_bank10 = apple3_bankaddr(~0, 0x4500); m_bank10 = apple3_bankaddr(~0, 0x4500);
/* bank 11 (C800-CFFF) */ /* bank 11 (C800-CFFF) */
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
m_bank11 = apple3_bankaddr(~0, 0x4800); m_bank11 = apple3_bankaddr(~0, 0x4800);
} }
@ -464,14 +473,15 @@ void apple3_state::apple3_update_memory()
m_bank6 = apple3_bankaddr(~0, 0x5000); m_bank6 = apple3_bankaddr(~0, 0x5000);
/* install bank 7 (F000-FFFF) */ /* install bank 7 (F000-FFFF) */
if (m_via_0_a & 0x01) m_bank7wr = apple3_bankaddr(~0, 0x7000);
if (m_via_0_a & ENV_ROMENABLE)
{ {
m_bank7 = memregion("maincpu")->base(); m_bank7rd = memregion("maincpu")->base();
} }
else else
{ {
m_rom_has_been_disabled = true; m_rom_has_been_disabled = true;
m_bank7 = apple3_bankaddr(~0, 0x7000); m_bank7rd = m_bank7wr;
// if we had an IRQ waiting for RAM to be paged in... // if we had an IRQ waiting for RAM to be paged in...
apple3_irq_update(); apple3_irq_update();
@ -523,7 +533,7 @@ void apple3_state::apple3_irq_update()
// working in all cases. // working in all cases.
// Bonus points: for some reason this isn't a problem with -debug. // Bonus points: for some reason this isn't a problem with -debug.
// m6502 heisenbug maybe? // m6502 heisenbug maybe?
if ((m_via_0_a & 0x01) && (m_rom_has_been_disabled)) if ((m_via_0_a & ENV_ROMENABLE) && (m_rom_has_been_disabled))
{ {
return; return;
} }
@ -626,23 +636,6 @@ UINT8 *apple3_state::apple3_get_indexed_addr(offs_t offset, bool is_write)
result = apple3_bankaddr(~0, ((offs_t) m_via_0_b) * 0x100 + offset); result = apple3_bankaddr(~0, ((offs_t) m_via_0_b) * 0x100 + offset);
} }
} }
else if ((offset >= 0xF000) && (m_via_0_a & 0x01) && (is_write))
{
/* The Apple /// Diagnostics seems to expect that indexed writes
* always write to RAM. That image jumps to an address that is
* undefined unless this code is enabled.
*
* The confidence test and the diagnostics together indicates
* that this *doesn't* apply to the VIA region, however.
*
* The Diagnostics' ROM test shows this is for writes only.
*/
if (offset < 0xffd0 || offset > 0xffef)
{
result = apple3_bankaddr(~0, offset - 0x8000);
}
}
return result; return result;
} }
@ -801,7 +794,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r)
} }
else if (offset < 0xc100) else if (offset < 0xc100)
{ {
if (m_via_0_a & 0x40) if (m_via_0_a & ENV_IOENABLE)
{ {
if (!space.debugger_access()) if (!space.debugger_access())
{ {
@ -815,7 +808,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r)
} }
else if (offset < 0xc500) else if (offset < 0xc500)
{ {
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
rv = m_bank9[offset - 0xc100]; rv = m_bank9[offset - 0xc100];
} }
@ -841,7 +834,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r)
} }
else if (offset < 0xd000) else if (offset < 0xd000)
{ {
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
rv = m_bank11[offset - 0xc800]; rv = m_bank11[offset - 0xc800];
} }
@ -879,7 +872,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r)
} }
else else
{ {
rv = m_bank7[offset - 0xf000]; rv = m_bank7rd[offset - 0xf000];
} }
} }
@ -958,7 +951,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w)
} }
else if (offset < 0xc100) else if (offset < 0xc100)
{ {
if (m_via_0_a & 0x40) if (m_via_0_a & ENV_IOENABLE)
{ {
if (!space.debugger_access()) if (!space.debugger_access())
{ {
@ -968,7 +961,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w)
else else
{ {
// is this page write protected? // is this page write protected?
if (!(m_via_0_a & 0x08)) if (!(m_via_0_a & ENV_WRITEPROT))
{ {
m_bank8[offset - 0xc000] = data; m_bank8[offset - 0xc000] = data;
} }
@ -976,9 +969,9 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w)
} }
else if (offset < 0xc500) else if (offset < 0xc500)
{ {
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
if (!(m_via_0_a & 0x08)) if (!(m_via_0_a & ENV_WRITEPROT))
{ {
m_bank9[offset - 0xc100] = data; m_bank9[offset - 0xc100] = data;
} }
@ -1001,16 +994,16 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w)
} }
else if (offset < 0xc800) else if (offset < 0xc800)
{ {
if (!(m_via_0_a & 0x08)) if (!(m_via_0_a & ENV_WRITEPROT))
{ {
m_bank10[offset - 0xc500] = data; m_bank10[offset - 0xc500] = data;
} }
} }
else if (offset < 0xd000) else if (offset < 0xd000)
{ {
if (!(m_via_0_a & 0x40)) if (!(m_via_0_a & ENV_IOENABLE))
{ {
if (!(m_via_0_a & 0x08)) if (!(m_via_0_a & ENV_WRITEPROT))
{ {
m_bank11[offset - 0xc800] = data; m_bank11[offset - 0xc800] = data;
} }
@ -1035,7 +1028,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w)
} }
else if (offset < 0xf000) else if (offset < 0xf000)
{ {
if (!(m_via_0_a & 0x08)) if (!(m_via_0_a & ENV_WRITEPROT))
{ {
m_bank6[offset - 0xd000] = data; m_bank6[offset - 0xd000] = data;
} }
@ -1058,9 +1051,9 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w)
} }
else else
{ {
if (!(m_via_0_a & 0x09)) if (!(m_via_0_a & ENV_WRITEPROT))
{ {
m_bank7[offset - 0xf000] = data; m_bank7wr[offset - 0xf000] = data;
} }
} }
} }