summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/tms34010/tms34010.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/tms34010/tms34010.cpp')
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index aecdca5debe..770777b03fb 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -180,34 +180,34 @@ inline void tms340x0_device::RESET_ST()
/* shortcuts for reading opcodes */
inline uint32_t tms340x0_device::ROPCODE()
{
- uint32_t pc = TOBYTE(m_pc);
+ uint32_t pc = m_pc;
m_pc += 2 << 3;
return m_direct->read_word(pc);
}
inline int16_t tms340x0_device::PARAM_WORD()
{
- uint32_t pc = TOBYTE(m_pc);
+ uint32_t pc = m_pc;
m_pc += 2 << 3;
return m_direct->read_word(pc);
}
inline int32_t tms340x0_device::PARAM_LONG()
{
- uint32_t pc = TOBYTE(m_pc);
+ uint32_t pc = m_pc;
m_pc += 4 << 3;
- return (uint16_t)m_direct->read_word(pc) | (m_direct->read_word(pc + 2) << 16);
+ return (uint16_t)m_direct->read_word(pc) | (m_direct->read_word(pc + 16) << 16);
}
inline int16_t tms340x0_device::PARAM_WORD_NO_INC()
{
- return m_direct->read_word(TOBYTE(m_pc));
+ return m_direct->read_word(m_pc);
}
inline int32_t tms340x0_device::PARAM_LONG_NO_INC()
{
- uint32_t pc = TOBYTE(m_pc);
- return (uint16_t)m_direct->read_word(pc) | (m_direct->read_word(pc + 2) << 16);
+ uint32_t pc = m_pc;
+ return (uint16_t)m_direct->read_word(pc) | (m_direct->read_word(pc + 16) << 16);
}
/* read memory byte */
@@ -258,7 +258,7 @@ inline int32_t tms340x0_device::POP()
#define RP(m1,m2) \
/* TODO: Plane masking */ \
- return (TMS34010_RDMEM_WORD(TOBYTE(offset & 0xfffffff0)) >> (offset & m1)) & m2;
+ return (TMS34010_RDMEM_WORD(offset & 0xfffffff0) >> (offset & m1)) & m2;
uint32_t tms340x0_device::read_pixel_1(offs_t offset) { RP(0x0f,0x01) }
uint32_t tms340x0_device::read_pixel_2(offs_t offset) { RP(0x0e,0x03) }
@@ -267,12 +267,12 @@ uint32_t tms340x0_device::read_pixel_8(offs_t offset) { RP(0x08,0xff) }
uint32_t tms340x0_device::read_pixel_16(offs_t offset)
{
/* TODO: Plane masking */
- return TMS34010_RDMEM_WORD(TOBYTE(offset & 0xfffffff0));
+ return TMS34010_RDMEM_WORD(offset & 0xfffffff0);
}
uint32_t tms340x0_device::read_pixel_32(offs_t offset)
{
/* TODO: Plane masking */
- return TMS34010_RDMEM_DWORD(TOBYTE(offset & 0xffffffe0));
+ return TMS34010_RDMEM_DWORD(offset & 0xffffffe0);
}
/* Shift register read */
@@ -293,9 +293,9 @@ uint32_t tms340x0_device::read_pixel_shiftreg(offs_t offset)
/* No Raster Op + No Transparency */
#define WP(m1,m2) \
- uint32_t a = TOBYTE(offset & 0xfffffff0); \
- uint32_t pix = TMS34010_RDMEM_WORD(a); \
- uint32_t shiftcount = offset & m1; \
+ uint32_t a = offset & 0xfffffff0; \
+ uint32_t pix = TMS34010_RDMEM_WORD(a); \
+ uint32_t shiftcount = offset & m1; \
\
/* TODO: plane masking */ \
data &= m2; \
@@ -308,9 +308,9 @@ uint32_t tms340x0_device::read_pixel_shiftreg(offs_t offset)
data &= m2; \
if (data) \
{ \
- uint32_t a = TOBYTE(offset & 0xfffffff0); \
- uint32_t pix = TMS34010_RDMEM_WORD(a); \
- uint32_t shiftcount = offset & m1; \
+ uint32_t a = offset & 0xfffffff0; \
+ uint32_t pix = TMS34010_RDMEM_WORD(a); \
+ uint32_t shiftcount = offset & m1; \
\
/* TODO: plane masking */ \
pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount); \
@@ -318,9 +318,9 @@ uint32_t tms340x0_device::read_pixel_shiftreg(offs_t offset)
}
/* Raster Op + No Transparency */
#define WP_R(m1,m2) \
- uint32_t a = TOBYTE(offset & 0xfffffff0); \
- uint32_t pix = TMS34010_RDMEM_WORD(a); \
- uint32_t shiftcount = offset & m1; \
+ uint32_t a = offset & 0xfffffff0; \
+ uint32_t pix = TMS34010_RDMEM_WORD(a); \
+ uint32_t shiftcount = offset & m1; \
\
/* TODO: plane masking */ \
data = (this->*m_raster_op)(data & m2, (pix >> shiftcount) & m2) & m2; \
@@ -329,9 +329,9 @@ uint32_t tms340x0_device::read_pixel_shiftreg(offs_t offset)
/* Raster Op + Transparency */
#define WP_R_T(m1,m2) \
- uint32_t a = TOBYTE(offset & 0xfffffff0); \
- uint32_t pix = TMS34010_RDMEM_WORD(a); \
- uint32_t shiftcount = offset & m1; \
+ uint32_t a = offset & 0xfffffff0; \
+ uint32_t pix = TMS34010_RDMEM_WORD(a); \
+ uint32_t shiftcount = offset & m1; \
\
/* TODO: plane masking */ \
data = (this->*m_raster_op)(data & m2, (pix >> shiftcount) & m2) & m2; \
@@ -349,12 +349,12 @@ void tms340x0_device::write_pixel_8(offs_t offset, uint32_t data) { WP(0x08, 0xf
void tms340x0_device::write_pixel_16(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
- TMS34010_WRMEM_WORD(TOBYTE(offset & 0xfffffff0), data);
+ TMS34010_WRMEM_WORD(offset & 0xfffffff0, data);
}
void tms340x0_device::write_pixel_32(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
- TMS34010_WRMEM_WORD(TOBYTE(offset & 0xffffffe0), data);
+ TMS34010_WRMEM_WORD(offset & 0xffffffe0, data);
}
/* No Raster Op + Transparency */
@@ -366,13 +366,13 @@ void tms340x0_device::write_pixel_t_16(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
if (data)
- TMS34010_WRMEM_WORD(TOBYTE(offset & 0xfffffff0), data);
+ TMS34010_WRMEM_WORD(offset & 0xfffffff0, data);
}
void tms340x0_device::write_pixel_t_32(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
if (data)
- TMS34010_WRMEM_DWORD(TOBYTE(offset & 0xffffffe0), data);
+ TMS34010_WRMEM_DWORD(offset & 0xffffffe0, data);
}
/* Raster Op + No Transparency */
@@ -383,13 +383,13 @@ void tms340x0_device::write_pixel_r_8(offs_t offset, uint32_t data) { WP_R(0x08,
void tms340x0_device::write_pixel_r_16(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
- uint32_t a = TOBYTE(offset & 0xfffffff0);
+ uint32_t a = offset & 0xfffffff0;
TMS34010_WRMEM_WORD(a, (this->*m_raster_op)(data, TMS34010_RDMEM_WORD(a)));
}
void tms340x0_device::write_pixel_r_32(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
- uint32_t a = TOBYTE(offset & 0xffffffe0);
+ uint32_t a = offset & 0xffffffe0;
TMS34010_WRMEM_DWORD(a, (this->*m_raster_op)(data, TMS34010_RDMEM_DWORD(a)));
}
@@ -401,7 +401,7 @@ void tms340x0_device::write_pixel_r_t_8(offs_t offset, uint32_t data) { WP_R_T(0
void tms340x0_device::write_pixel_r_t_16(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
- uint32_t a = TOBYTE(offset & 0xfffffff0);
+ uint32_t a = offset & 0xfffffff0;
data = (this->*m_raster_op)(data, TMS34010_RDMEM_WORD(a));
if (data)
@@ -410,7 +410,7 @@ void tms340x0_device::write_pixel_r_t_16(offs_t offset, uint32_t data)
void tms340x0_device::write_pixel_r_t_32(offs_t offset, uint32_t data)
{
/* TODO: plane masking */
- uint32_t a = TOBYTE(offset & 0xffffffe0);
+ uint32_t a = offset & 0xffffffe0;
data = (this->*m_raster_op)(data, TMS34010_RDMEM_DWORD(a));
if (data)
@@ -588,7 +588,7 @@ void tms340x0_device::device_start()
m_external_host_access = false;
m_program = &space(AS_PROGRAM);
- m_direct = &m_program->direct();
+ m_direct = m_program->direct<03>();
/* set up the state table */
{
@@ -1512,7 +1512,7 @@ WRITE16_MEMBER( tms340x0_device::host_w )
/* write to the address */
addr = (IOREG(REG_HSTADRH) << 16) | IOREG(REG_HSTADRL);
- TMS34010_WRMEM_WORD(TOBYTE(addr & 0xfffffff0), data);
+ TMS34010_WRMEM_WORD(addr & 0xfffffff0, data);
/* optional postincrement */
if (IOREG(REG_HSTCTLH) & 0x0800)
@@ -1571,7 +1571,7 @@ READ16_MEMBER( tms340x0_device::host_r )
/* read from the address */
addr = (IOREG(REG_HSTADRH) << 16) | IOREG(REG_HSTADRL);
- result = TMS34010_RDMEM_WORD(TOBYTE(addr & 0xfffffff0));
+ result = TMS34010_RDMEM_WORD(addr & 0xfffffff0);
/* optional postincrement (it says preincrement, but data is preloaded, so it
is effectively a postincrement */