ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

68000: fix bug with ADDQ.W/SUBQ.W operating on address registers

This commit is contained in:
beirich 2011-10-12 02:20:03 +00:00
parent 04b93b5b8b
commit 7cedd71729
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
BizHawk.Emulation/CPUs/68000/Instructions/IntegerMath.cs
View File

@ -239,17 +239,22 @@ namespace BizHawk.Emulation.CPUs.M68000
}
case 1: // word
{
short value = PeekValueW(mode, reg);
int result = value + data;
int uresult = (ushort)value + data;
if (mode != 1)
if (mode == 1)
{
int value = PeekValueL(mode, reg);
WriteValueL(mode, reg, value+data);
}
else
{
short value = PeekValueW(mode, reg);
int result = value + data;
int uresult = (ushort)value + data;
N = (result & 0x8000) != 0;
Z = result == 0;
V = result > short.MaxValue || result < short.MinValue;
C = X = (uresult & 0x10000) != 0;
WriteValueW(mode, reg, (short)result);
}
WriteValueW(mode, reg, (short)result);
if (mode <= 1) PendingCycles -= 4;
else PendingCycles -= 8 + EACyclesBW[mode, reg];
return;
@ -565,17 +570,22 @@ namespace BizHawk.Emulation.CPUs.M68000
}
case 1: // word
{
short value = PeekValueW(mode, reg);
int result = value - data;
int uresult = (ushort)value - data;
if (mode != 1)
if (mode == 1)
{
int value = PeekValueL(mode, reg);
WriteValueL(mode, reg, value - data);
}
else
{
short value = PeekValueW(mode, reg);
int result = value - data;
int uresult = (ushort)value - data;
N = (result & 0x8000) != 0;
Z = result == 0;
V = result > short.MaxValue || result < short.MinValue;
C = X = (uresult & 0x10000) != 0;
WriteValueW(mode, reg, (short)result);
}
WriteValueW(mode, reg, (short)result);
if (mode <= 1) PendingCycles -= 4;
else PendingCycles -= 8 + EACyclesBW[mode, reg];
return;