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

Merge pull request #902 from LegendOfDragoon/master 

Fix a few sync errors
This commit is contained in:
zilmar 2016-01-19 08:18:47 +11:00
parent 168f064d18 53baf6d792
commit 43b8f65612
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Config/Project64.rdb
View File

@ -2605,6 +2605,7 @@ RDRAM Size=8
RSP-JumpTableSize=3584 RSP-JumpTableSize=3584
SMM-FUNC=0 SMM-FUNC=0
SMM-PI DMA=0 SMM-PI DMA=0
SMM-Protect=1
SMM-TLB=0 SMM-TLB=0
ViRefresh=1800 ViRefresh=1800
@ -2624,6 +2625,7 @@ RDRAM Size=8
RSP-JumpTableSize=3584 RSP-JumpTableSize=3584
SMM-FUNC=0 SMM-FUNC=0
SMM-PI DMA=0 SMM-PI DMA=0
SMM-Protect=1
SMM-TLB=0 SMM-TLB=0
ViRefresh=2050 ViRefresh=2050
@ -4085,6 +4087,7 @@ Good Name=Nuclear Strike 64 (E) (M2)
Internal Name=NUCLEARSTRIKE64 Internal Name=NUCLEARSTRIKE64
Status=Compatible Status=Compatible
Core Note=high system requirement Core Note=high system requirement
Linking=Off
RDRAM Size=8 RDRAM Size=8
[8F50B845-D729D22F-C:44] [8F50B845-D729D22F-C:44]
@ -4092,6 +4095,7 @@ Good Name=Nuclear Strike 64 (G)
Internal Name=NUCLEARSTRIKE64 Internal Name=NUCLEARSTRIKE64
Status=Compatible Status=Compatible
Core Note=high system requirement Core Note=high system requirement
Linking=Off
RDRAM Size=8 RDRAM Size=8
[4998DDBB-F7B7AEBC-C:45] [4998DDBB-F7B7AEBC-C:45]
@ -4099,6 +4103,7 @@ Good Name=Nuclear Strike 64 (U)
Internal Name=NUCLEARSTRIKE64 Internal Name=NUCLEARSTRIKE64
Status=Compatible Status=Compatible
Core Note=high system requirement Core Note=high system requirement
Linking=Off
RDRAM Size=8 RDRAM Size=8
[D83BB920-CC406416-C:4A] [D83BB920-CC406416-C:4A]

2
Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
View File

@ -4876,7 +4876,7 @@ void CRecompilerOps::SPECIAL_DADDU()
if (IsConst(source2)) if (IsConst(source2))
{ {
AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd), GetMipsRegLo(source2)); AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd), GetMipsRegLo(source2));
AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd), GetMipsRegHi(source2)); AdcConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd), GetMipsRegHi(source2));
} }
else if (IsMapped(source2)) else if (IsMapped(source2))
{ {