Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 18:08:04 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #6860 from ElectricMagic/cp1610_SDBD

Browse Source 
Ensure SDBD operations set correct condition flags.
This commit is contained in:
R. Belmont 2020-06-25 19:42:48 -04:00 committed by GitHub
commit 5c5f0beb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/cpu/cp1610/cp1610.cpp
View File

@ -196,11 +196,11 @@ void cp1610_cpu_device::cp1610_comr(int n)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_negr(int n) void cp1610_cpu_device::cp1610_negr(int n)
{ {
uint32_t temp; uint16_t temp;
CLR_SZOC; CLR_SZOC;
temp = (m_r[n] ^ 0xffff) + 1; temp = (m_r[n] ^ 0xffff) + 1;
SET_COV(0,temp,1); SET_COV(0,temp,1);
m_r[n] = temp&0xffff; m_r[n] = temp;
SET_SZ(m_r[n]); SET_SZ(m_r[n]);
m_icount -= 6; m_icount -= 6;
} }
@ -1643,13 +1643,12 @@ void cp1610_cpu_device::cp1610_sdbd_addi(int d)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_sdbd_subat(int r, int d) void cp1610_cpu_device::cp1610_sdbd_subat(int r, int d)
{ {
uint32_t temp; uint16_t temp;
CLR_SZOC; CLR_SZOC;
temp = cp1610_readmem16(m_r[r]) & 0xff; temp = cp1610_readmem16(m_r[r]) & 0xff;
temp |= (cp1610_readmem16(m_r[r]) << 8); temp |= (cp1610_readmem16(m_r[r]) << 8);
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
m_r[d] += temp; m_r[d] += temp;
SET_SZ(m_r[d]); SET_SZ(m_r[d]);
m_icount -= 14; m_icount -= 14;
@ -1661,7 +1660,7 @@ void cp1610_cpu_device::cp1610_sdbd_subat(int r, int d)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_sdbd_subat_i(int r, int d) void cp1610_cpu_device::cp1610_sdbd_subat_i(int r, int d)
{ {
uint32_t temp; uint16_t temp;
CLR_SZOC; CLR_SZOC;
temp = cp1610_readmem16(m_r[r]) & 0xff; temp = cp1610_readmem16(m_r[r]) & 0xff;
m_r[r]++; m_r[r]++;
@ -1669,7 +1668,6 @@ void cp1610_cpu_device::cp1610_sdbd_subat_i(int r, int d)
m_r[r]++; m_r[r]++;
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
m_r[d] += temp; m_r[d] += temp;
SET_SZ(m_r[d]); SET_SZ(m_r[d]);
m_icount -= 14; m_icount -= 14;
@ -1681,7 +1679,7 @@ void cp1610_cpu_device::cp1610_sdbd_subat_i(int r, int d)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_sdbd_subat_d(int r, int d) void cp1610_cpu_device::cp1610_sdbd_subat_d(int r, int d)
{ {
uint32_t temp; uint16_t temp;
CLR_SZOC; CLR_SZOC;
m_r[r]--; m_r[r]--;
temp = cp1610_readmem16(m_r[r]) & 0xff; temp = cp1610_readmem16(m_r[r]) & 0xff;
@ -1689,7 +1687,6 @@ void cp1610_cpu_device::cp1610_sdbd_subat_d(int r, int d)
temp |= (cp1610_readmem16(m_r[r]) << 8); temp |= (cp1610_readmem16(m_r[r]) << 8);
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
m_r[d] += temp; m_r[d] += temp;
SET_SZ(m_r[d]); SET_SZ(m_r[d]);
m_icount -= 17; m_icount -= 17;
@ -1702,7 +1699,7 @@ void cp1610_cpu_device::cp1610_sdbd_subat_d(int r, int d)
void cp1610_cpu_device::cp1610_sdbd_subi(int d) void cp1610_cpu_device::cp1610_sdbd_subi(int d)
{ {
uint16_t addr; uint16_t addr;
uint32_t temp; uint16_t temp;
CLR_SZOC; CLR_SZOC;
addr = cp1610_readop(m_r[7]) & 0xff; addr = cp1610_readop(m_r[7]) & 0xff;
m_r[7]++; m_r[7]++;
@ -1711,7 +1708,6 @@ void cp1610_cpu_device::cp1610_sdbd_subi(int d)
temp = addr; temp = addr;
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
m_r[d] += temp; m_r[d] += temp;
SET_SZ(m_r[d]); SET_SZ(m_r[d]);
m_icount -= 14; m_icount -= 14;
@ -1723,14 +1719,13 @@ void cp1610_cpu_device::cp1610_sdbd_subi(int d)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_sdbd_cmpat(int r, int d) void cp1610_cpu_device::cp1610_sdbd_cmpat(int r, int d)
{ {
uint32_t temp; uint16_t temp;
uint16_t temp2; uint16_t temp2;
CLR_SZOC; CLR_SZOC;
temp = cp1610_readmem16(m_r[r]) & 0xff; temp = cp1610_readmem16(m_r[r]) & 0xff;
temp |= (cp1610_readmem16(m_r[r]) << 8); temp |= (cp1610_readmem16(m_r[r]) << 8);
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
temp2 = m_r[d] + temp; temp2 = m_r[d] + temp;
SET_SZ(temp2); SET_SZ(temp2);
m_icount -= 14; m_icount -= 14;
@ -1742,7 +1737,7 @@ void cp1610_cpu_device::cp1610_sdbd_cmpat(int r, int d)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_sdbd_cmpat_i(int r, int d) void cp1610_cpu_device::cp1610_sdbd_cmpat_i(int r, int d)
{ {
uint32_t temp; uint16_t temp;
uint16_t temp2; uint16_t temp2;
CLR_SZOC; CLR_SZOC;
temp = cp1610_readmem16(m_r[r]) & 0xff; temp = cp1610_readmem16(m_r[r]) & 0xff;
@ -1751,7 +1746,6 @@ void cp1610_cpu_device::cp1610_sdbd_cmpat_i(int r, int d)
m_r[r]++; m_r[r]++;
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
temp2 = m_r[d] + temp; temp2 = m_r[d] + temp;
SET_SZ(temp2); SET_SZ(temp2);
m_icount -= 14; m_icount -= 14;
@ -1763,7 +1757,7 @@ void cp1610_cpu_device::cp1610_sdbd_cmpat_i(int r, int d)
***************************************************/ ***************************************************/
void cp1610_cpu_device::cp1610_sdbd_cmpat_d(int r, int d) void cp1610_cpu_device::cp1610_sdbd_cmpat_d(int r, int d)
{ {
uint32_t temp; uint16_t temp;
uint16_t temp2; uint16_t temp2;
CLR_SZOC; CLR_SZOC;
m_r[r]--; m_r[r]--;
@ -1772,7 +1766,6 @@ void cp1610_cpu_device::cp1610_sdbd_cmpat_d(int r, int d)
temp |= (cp1610_readmem16(m_r[r]) << 8); temp |= (cp1610_readmem16(m_r[r]) << 8);
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
temp2 = m_r[d] + temp; temp2 = m_r[d] + temp;
SET_SZ(temp2); SET_SZ(temp2);
m_icount -= 17; m_icount -= 17;
@ -1785,7 +1778,7 @@ void cp1610_cpu_device::cp1610_sdbd_cmpat_d(int r, int d)
void cp1610_cpu_device::cp1610_sdbd_cmpi(int d) void cp1610_cpu_device::cp1610_sdbd_cmpi(int d)
{ {
uint16_t addr; uint16_t addr;
uint32_t temp; uint16_t temp;
uint16_t temp2; uint16_t temp2;
CLR_SZOC; CLR_SZOC;
addr = cp1610_readop(m_r[7]) & 0xff; addr = cp1610_readop(m_r[7]) & 0xff;
@ -1795,7 +1788,6 @@ void cp1610_cpu_device::cp1610_sdbd_cmpi(int d)
temp = addr; temp = addr;
temp = (temp ^ 0xffff) + 1; temp = (temp ^ 0xffff) + 1;
SET_COV(m_r[d],temp,1); SET_COV(m_r[d],temp,1);
temp &= 0xffff;
temp2 = m_r[d] + temp; temp2 = m_r[d] + temp;
SET_SZ(temp2); SET_SZ(temp2);
m_icount -= 14; m_icount -= 14;