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

Added the ARM7 GetBootProcs SWI. It fixes the firmware freeze when trying to do anything.

This commit is contained in:
luigi__ 2009-03-10 20:05:40 +00:00
parent 5f617ca6ef
commit e974a64498
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desmume/src/bios.cpp
View File

@ -338,6 +338,8 @@ TEMPLATE static u32 copy()
u32 dst = cpu->R[1]; u32 dst = cpu->R[1];
u32 cnt = cpu->R[2]; u32 cnt = cpu->R[2];
//INFO("swi copy from %08X to %08X, cnt=%08X\n", src, dst, cnt);
switch(BIT26(cnt)) switch(BIT26(cnt))
{ {
case 0: case 0:
@ -408,6 +410,8 @@ TEMPLATE static u32 fastCopy()
u32 dst = cpu->R[1] & 0xFFFFFFFC; u32 dst = cpu->R[1] & 0xFFFFFFFC;
u32 cnt = cpu->R[2]; u32 cnt = cpu->R[2];
//INFO("swi fastcopy from %08X to %08X, cnt=%08X\n", src, dst, cnt);
switch(BIT24(cnt)) switch(BIT24(cnt))
{ {
case 0: case 0:
@ -448,6 +452,8 @@ TEMPLATE static u32 LZ77UnCompVram()
u32 header = _MMU_read32(cpu->proc_ID,source); u32 header = _MMU_read32(cpu->proc_ID,source);
source += 4; source += 4;
//INFO("swi lz77uncompvram\n");
if(((source & 0xe000000) == 0) || if(((source & 0xe000000) == 0) ||
((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0) ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
return 0; return 0;
@ -536,6 +542,8 @@ TEMPLATE static u32 LZ77UnCompWram()
u32 header = _MMU_read32(cpu->proc_ID, source); u32 header = _MMU_read32(cpu->proc_ID, source);
source += 4; source += 4;
//INFO("swi lz77uncompwram\n");
if(((source & 0xe000000) == 0) || if(((source & 0xe000000) == 0) ||
((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0) ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
return 0; return 0;
@ -595,6 +603,8 @@ TEMPLATE static u32 RLUnCompVram()
u32 header = _MMU_read32(cpu->proc_ID, source); u32 header = _MMU_read32(cpu->proc_ID, source);
source += 4; source += 4;
//INFO("swi rluncompvram\n");
if(((source & 0xe000000) == 0) || if(((source & 0xe000000) == 0) ||
((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0) ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
return 0; return 0;
@ -658,6 +668,8 @@ TEMPLATE static u32 RLUnCompWram()
u32 header = _MMU_read32(cpu->proc_ID, source); u32 header = _MMU_read32(cpu->proc_ID, source);
source += 4; source += 4;
//INFO("swi rluncompwram\n");
if(((source & 0xe000000) == 0) || if(((source & 0xe000000) == 0) ||
((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0) ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
return 0; return 0;
@ -703,6 +715,8 @@ TEMPLATE static u32 UnCompHuffman()
header = _MMU_read08(cpu->proc_ID, source); header = _MMU_read08(cpu->proc_ID, source);
source += 4; source += 4;
//INFO("swi uncomphuffman\n");
if(((source & 0xe000000) == 0) || if(((source & 0xe000000) == 0) ||
((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0) ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
return 0; return 0;
@ -843,6 +857,8 @@ TEMPLATE static u32 BitUnPack()
dest = cpu->R[1]; dest = cpu->R[1];
header = cpu->R[2]; header = cpu->R[2];
//INFO("swi bitunpack\n");
len = _MMU_read16(cpu->proc_ID, header); len = _MMU_read16(cpu->proc_ID, header);
// check address // check address
bits = _MMU_read08(cpu->proc_ID, header+2); bits = _MMU_read08(cpu->proc_ID, header+2);
@ -898,6 +914,8 @@ TEMPLATE static u32 Diff8bitUnFilterWram()
header = _MMU_read08(cpu->proc_ID, source); header = _MMU_read08(cpu->proc_ID, source);
source += 4; source += 4;
//INFO("swi diff8bitunfilterwram\n");
if(((source & 0xe000000) == 0) || if(((source & 0xe000000) == 0) ||
(( (source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)) (( (source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0))
return 0; return 0;
@ -926,6 +944,8 @@ TEMPLATE static u32 Diff16bitUnFilter()
source = cpu->R[0]; source = cpu->R[0];
dest = cpu->R[1]; dest = cpu->R[1];
//INFO("swi diff16bitunfilter\n");
header = _MMU_read08(cpu->proc_ID, source); header = _MMU_read08(cpu->proc_ID, source);
source += 4; source += 4;
@ -1022,6 +1042,14 @@ TEMPLATE static u32 SoundBias()
return cpu->R[1]; return cpu->R[1];
} }
TEMPLATE static u32 getBootProcs()
{
cpu->R[0] = 0x00000A2E;
cpu->R[1] = 0x00002C3C;
cpu->R[3] = 0x000005FF;
return 1;
}
u32 (* ARM9_swi_tab[32])()={ u32 (* ARM9_swi_tab[32])()={
bios_nop<ARMCPU_ARM9>, // 0x00 bios_nop<ARMCPU_ARM9>, // 0x00
bios_nop<ARMCPU_ARM9>, // 0x01 bios_nop<ARMCPU_ARM9>, // 0x01
@ -1065,7 +1093,7 @@ u32 (* ARM7_swi_tab[32])()={
intrWaitARM<ARMCPU_ARM7>, // 0x04 intrWaitARM<ARMCPU_ARM7>, // 0x04
waitVBlankARM<ARMCPU_ARM7>, // 0x05 waitVBlankARM<ARMCPU_ARM7>, // 0x05
wait4IRQ<ARMCPU_ARM7>, // 0x06 wait4IRQ<ARMCPU_ARM7>, // 0x06
sleep<ARMCPU_ARM7>, // 0x07 sleep<ARMCPU_ARM7>, // 0x07
SoundBias<ARMCPU_ARM7>, // 0x08 SoundBias<ARMCPU_ARM7>, // 0x08
divide<ARMCPU_ARM7>, // 0x09 divide<ARMCPU_ARM7>, // 0x09
bios_nop<ARMCPU_ARM7>, // 0x0A bios_nop<ARMCPU_ARM7>, // 0x0A
@ -1087,7 +1115,7 @@ u32 (* ARM7_swi_tab[32])()={
getSineTab<ARMCPU_ARM7>, // 0x1A getSineTab<ARMCPU_ARM7>, // 0x1A
getPitchTab<ARMCPU_ARM7>, // 0x1B getPitchTab<ARMCPU_ARM7>, // 0x1B
getVolumeTab<ARMCPU_ARM7>, // 0x1C getVolumeTab<ARMCPU_ARM7>, // 0x1C
bios_nop<ARMCPU_ARM7>, // 0x1D getBootProcs<ARMCPU_ARM7>, // 0x1D
bios_nop<ARMCPU_ARM7>, // 0x1E bios_nop<ARMCPU_ARM7>, // 0x1E
setHaltCR<ARMCPU_ARM7>, // 0x1F setHaltCR<ARMCPU_ARM7>, // 0x1F
}; };