Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix table mask on 91xx

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2012-12-26 03:57:59 +00:00
parent a1ba3901dd
commit 6da76a5c70
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/emu/video/tms9928a.c
View File

@ -18,8 +18,6 @@
** - Colours are incorrect. [fixed by R Nabet ?]
** - Sprites 8-31 are ghosted/cloned in mode 3 when using less than
** three pattern tables. Exact behaviour is not known.
** - On TMS99xxA, the colortable mask in mode 3 acts as a nametable
** mask as well (does not happen on TMS91xx)
** - Address scrambling when setting TMS99xxA to 4K (not on TMS91xx)
*/
@ -92,13 +90,14 @@ static const rgb_t tms9928a_palette[TMS9928A_PALETTE_SIZE] =
RGB_WHITE
};
tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva )
tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99 )
: device_t( mconfig, type, name, tag, owner, clock ),
device_memory_interface(mconfig, *this),
m_space_config("vram",ENDIANNESS_BIG, 8, 14, 0, NULL, *ADDRESS_MAP_NAME(memmap))
{
m_50hz = is_50hz;
m_reva = is_reva;
m_99 = is_99;
// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap));
}
@ -110,6 +109,7 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *tag
{
m_50hz = false;
m_reva = true;
m_99 = true;
// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap));
}
@ -169,6 +169,15 @@ void tms9928a_device::update_backdrop()
}
void tms9928a_device::update_table_masks()
{
m_colourmask = ( (m_Regs[3] & 0x7f) << 3 ) | 7;
// on 91xx family, the colour table mask doesn't affect the pattern table mask
m_patternmask = ( (m_Regs[4] & 3) << 8 ) | ( m_99 ? (m_colourmask & 0xff) : 0xff );
}
void tms9928a_device::change_register(UINT8 reg, UINT8 val)
{
static const UINT8 Mask[8] =
@ -194,9 +203,8 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
if (val & 2)
{
m_colour = ((m_Regs[3] & 0x80) * 64) & (m_vram_size - 1);
m_colourmask = (m_Regs[3] & 0x7f) * 8 | 7;
m_pattern = ((m_Regs[4] & 4) * 2048) & (m_vram_size - 1);
m_patternmask = ( (m_Regs[4] & 3) << 8 ) | (m_colourmask & 0xff);
update_table_masks();
}
else
{
@ -220,19 +228,18 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
if (m_Regs[0] & 2)
{
m_colour = ((val & 0x80) * 64) & (m_vram_size - 1);
m_colourmask = ( (val & 0x7f) * 8 ) | 7;
update_table_masks();
}
else
{
m_colour = (val * 64) & (m_vram_size - 1);
}
m_patternmask = ( (m_Regs[4] & 3) * 256 ) | (m_colourmask & 255);
break;
case 4:
if (m_Regs[0] & 2)
{
m_pattern = ((val & 4) * 2048) & (m_vram_size - 1);
m_patternmask = ( (val & 3) * 256 ) | 255;
update_table_masks();
}
else
{
@ -664,8 +671,8 @@ void tms9928a_device::device_reset()
m_colour = 0;
m_spritepattern = 0;
m_spriteattribute = 0;
m_colourmask = 0;
m_patternmask = 0;
m_colourmask = 0x3fff;
m_patternmask = 0x3fff;
m_Addr = 0;
m_ReadAhead = 0;
m_INT = 0;

18
src/emu/video/tms9928a.h
View File

@ -89,7 +89,7 @@ class tms9928a_device : public device_t,
public:
// construction/destruction
tms9928a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz = false, bool is_reva = true);
tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz = false, bool is_reva = true, bool is_99 = true);
DECLARE_READ8_MEMBER( vram_read );
DECLARE_WRITE8_MEMBER( vram_write );
@ -117,6 +117,7 @@ private:
void change_register(UINT8 reg, UINT8 val);
void check_interrupt();
void update_backdrop();
void update_table_masks();
static const device_timer_id TIMER_LINE = 0;
@ -140,6 +141,7 @@ private:
devcb_resolved_write_line m_irq_changed;
bool m_50hz;
bool m_reva;
bool m_99;
rgb_t m_palette[16];
/* memory */
@ -160,7 +162,7 @@ class tms9918_device : public tms9928a_device
{
public:
tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9918, "TMS9918", tag, owner, clock, false, false ) { }
: tms9928a_device( mconfig, TMS9918, "TMS9918", tag, owner, clock, false, false, true ) { }
};
@ -168,7 +170,7 @@ class tms9918a_device : public tms9928a_device
{
public:
tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9918A, "TMS9918a", tag, owner, clock, false, true ) { }
: tms9928a_device( mconfig, TMS9918A, "TMS9918A", tag, owner, clock, false, true, true ) { }
};
@ -176,7 +178,7 @@ class tms9118_device : public tms9928a_device
{
public:
tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9118, "TMS9118", tag, owner, clock, false, true ) { }
: tms9928a_device( mconfig, TMS9118, "TMS9118", tag, owner, clock, false, true, false ) { }
};
@ -184,7 +186,7 @@ class tms9128_device : public tms9928a_device
{
public:
tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9128, "TMS9128", tag, owner, clock, false, true ) { }
: tms9928a_device( mconfig, TMS9128, "TMS9128", tag, owner, clock, false, true, false ) { }
};
@ -192,7 +194,7 @@ class tms9929_device : public tms9928a_device
{
public:
tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9929, "TMS9929", tag, owner, clock, true, false ) { }
: tms9928a_device( mconfig, TMS9929, "TMS9929", tag, owner, clock, true, false, true ) { }
};
@ -200,7 +202,7 @@ class tms9929a_device : public tms9928a_device
{
public:
tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true ) { }
: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true, true ) { }
};
@ -208,7 +210,7 @@ class tms9129_device : public tms9928a_device
{
public:
tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms9928a_device( mconfig, TMS9129, "TMS9129", tag, owner, clock, true, true ) { }
: tms9928a_device( mconfig, TMS9129, "TMS9129", tag, owner, clock, true, true, false ) { }
};