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

Division and sqrt now take the right time before completing. 

This seems to fix the teleport bug in SM64DS.
This commit is contained in:
luigi__ 2008-12-26 16:29:36 +00:00
parent 56ba7941a1
commit 99edea516b
3 changed files with 1826 additions and 1768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
desmume/src/MMU.cpp
View File

@ -727,8 +727,13 @@ void execsqrt() {
break;
}
}
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2B4, ret);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2B0, cnt & 0x7FFF);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2B4, 0);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2B0, cnt | 0x8000);
MMU.sqrtCycles = (nds.cycles + 26);
MMU.sqrtResult = ret;
MMU.sqrtCnt = (cnt & 0x7FFF);
MMU.sqrtRunning = TRUE;
}
template<u32 proc>
@ -741,15 +746,18 @@ void execdiv() {
case 0:
num = (s64) (s32) T1ReadLong(MMU.MMU_MEM[proc][0x40], 0x290);
den = (s64) (s32) T1ReadLong(MMU.MMU_MEM[proc][0x40], 0x298);
MMU.divCycles = (nds.cycles + 34);
break;
case 3: //gbatek says this is same as mode 1
case 1:
num = (s64) T1ReadQuad(MMU.MMU_MEM[proc][0x40], 0x290);
den = (s64) (s32) T1ReadLong(MMU.MMU_MEM[proc][0x40], 0x298);
MMU.divCycles = (nds.cycles + 68);
break;
case 2:
num = (s64) T1ReadQuad(MMU.MMU_MEM[proc][0x40], 0x290);
den = (s64) T1ReadQuad(MMU.MMU_MEM[proc][0x40], 0x298);
MMU.divCycles = (nds.cycles + 68);
break;
}
@ -771,11 +779,16 @@ void execdiv() {
(u32)(den>>32), (u32)den,
(u32)(res>>32), (u32)res);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2A0, (u32) res);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2A4, (u32) (res >> 32));
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2A8, (u32) mod);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2AC, (u32) (mod >> 32));
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x280, cnt);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2A0, 0);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2A4, 0);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2A8, 0);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x2AC, 0);
T1WriteLong(MMU.MMU_MEM[proc][0x40], 0x280, ((cnt & 0xBFFF) | 0x8000));
MMU.divResult = res;
MMU.divMod = mod;
MMU.divCnt = (cnt & 0x7FFF);
MMU.divRunning = TRUE;
}
void FASTCALL MMU_doDMA(u32 proc, u32 num)

11
desmume/src/MMU.h
View File

@ -103,6 +103,17 @@ struct MMU_struct {
s32 DMACycle[2][4];
u32 DMACrt[2][4];
BOOL DMAing[2][4];
BOOL divRunning;
s64 divResult;
s64 divMod;
u32 divCnt;
s32 divCycles;
BOOL sqrtRunning;
u32 sqrtResult;
u32 sqrtCnt;
s32 sqrtCycles;
memory_chip_t fw;
memory_chip_t bupmem;

3556
desmume/src/NDSSystem.cpp
View File

File diff suppressed because it is too large Load Diff