diff options
Diffstat (limited to 'src/devices/cpu/saturn/satops.hxx')
-rw-r--r-- | src/devices/cpu/saturn/satops.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/cpu/saturn/satops.hxx b/src/devices/cpu/saturn/satops.hxx index 8f7420584e3..3d279da8e2f 100644 --- a/src/devices/cpu/saturn/satops.hxx +++ b/src/devices/cpu/saturn/satops.hxx @@ -7,7 +7,7 @@ int saturn_device::READ_OP() { - UINT8 data; + uint8_t data; m_icount-=3; data=m_direct->read_byte(m_pc); saturn_assert(data<0x10); @@ -17,7 +17,7 @@ int saturn_device::READ_OP() int saturn_device::READ_OP_ARG() { - UINT8 data; + uint8_t data; m_icount-=3; data=m_direct->read_byte(m_pc); saturn_assert(data<0x10); @@ -32,9 +32,9 @@ int saturn_device::READ_OP_ARG8() return n0|(n1<<4); } -INT8 saturn_device::READ_OP_DIS8() +int8_t saturn_device::READ_OP_DIS8() { - return (INT8)READ_OP_ARG8(); + return (int8_t)READ_OP_ARG8(); } int saturn_device::READ_OP_ARG12() @@ -61,9 +61,9 @@ int saturn_device::READ_OP_ARG16() return n0|(n1<<4)|(n2<<8)|(n3<<12); } -INT16 saturn_device::READ_OP_DIS16() +int16_t saturn_device::READ_OP_DIS16() { - return (INT16)READ_OP_ARG16(); + return (int16_t)READ_OP_ARG16(); } int saturn_device::READ_OP_ARG20() @@ -76,9 +76,9 @@ int saturn_device::READ_OP_ARG20() return n0|(n1<<4)|(n2<<8)|(n3<<12)|(n4<<16); } -int saturn_device::READ_NIBBLE(UINT32 adr) +int saturn_device::READ_NIBBLE(uint32_t adr) { - UINT8 data; + uint8_t data; m_icount-=3; data=m_program->read_byte(adr&0xfffff); saturn_assert(data<0x10); @@ -86,14 +86,14 @@ int saturn_device::READ_NIBBLE(UINT32 adr) return data; } -int saturn_device::READ_8(UINT32 adr) +int saturn_device::READ_8(uint32_t adr) { int n0=READ_NIBBLE(adr); int n1=READ_NIBBLE(adr+1); return n0|(n1<<4); } -int saturn_device::READ_12(UINT32 adr) +int saturn_device::READ_12(uint32_t adr) { int n0=READ_NIBBLE(adr); int n1=READ_NIBBLE(adr+1); @@ -101,7 +101,7 @@ int saturn_device::READ_12(UINT32 adr) return n0|(n1<<4)|(n2<<8); } -int saturn_device::READ_16(UINT32 adr) +int saturn_device::READ_16(uint32_t adr) { int n0=READ_NIBBLE(adr); int n1=READ_NIBBLE(adr+1); @@ -110,7 +110,7 @@ int saturn_device::READ_16(UINT32 adr) return n0|(n1<<4)|(n2<<8)|(n3<<12); } -int saturn_device::READ_20(UINT32 adr) +int saturn_device::READ_20(uint32_t adr) { int n0=READ_NIBBLE(adr); int n1=READ_NIBBLE(adr+1); @@ -120,7 +120,7 @@ int saturn_device::READ_20(UINT32 adr) return n0|(n1<<4)|(n2<<8)|(n3<<12)|(n4<<16); } -void saturn_device::WRITE_NIBBLE(UINT32 adr, UINT8 nib) +void saturn_device::WRITE_NIBBLE(uint32_t adr, uint8_t nib) { m_icount-=3; saturn_assert(nib<0x10); @@ -186,15 +186,15 @@ void saturn_device::S64_WRITE_A(int r, int v) -UINT32 saturn_device::saturn_pop() +uint32_t saturn_device::saturn_pop() { - UINT32 temp=m_rstk[0]; + uint32_t temp=m_rstk[0]; memmove(m_rstk, m_rstk+1, sizeof(m_rstk)-sizeof(m_rstk[0])); m_rstk[7]=0; return temp; } -void saturn_device::saturn_push(UINT32 adr) +void saturn_device::saturn_push(uint32_t adr) { memmove(m_rstk+1, m_rstk, sizeof(m_rstk)-sizeof(m_rstk[0])); m_rstk[0]=adr; @@ -806,7 +806,7 @@ void saturn_device::saturn_clear(int reg, int begin, int count) void saturn_device::saturn_exchange(int left, int begin, int count, int right) { int i; - UINT8 temp; + uint8_t temp; saturn_assert(left>=0 && left<9); saturn_assert(right>=0 && right<9); saturn_assert(begin>=0 && count>0 && begin+count<=16); @@ -859,7 +859,7 @@ void saturn_device::saturn_add(int reg, int begin, int count, int right) } } -void saturn_device::saturn_add_const(int reg, int begin, int count, UINT8 right) +void saturn_device::saturn_add_const(int reg, int begin, int count, uint8_t right) { int i, t; int base=m_decimal?10:16; |