LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix (work around) Nintendo own HM bug, GG Ninty

Browse Source
This commit is contained in:
TuxSH 2017-06-05 20:28:33 +02:00
parent dda11206db
commit 26dd61e4e6
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysmodules/rosalina/kernel_extension/include/fatalExceptionHandlers.h
View File

@ -28,10 +28,9 @@
#include "types.h" #include "types.h"
bool isExceptionFatal(u32 spsr); bool isExceptionFatal(u32 spsr, u32 *regs, u32 index);
bool isDataAbortExceptionRangeControlled(u32 spsr, u32 addr); bool isDataAbortExceptionRangeControlled(u32 spsr, u32 addr);
void FIQHandler(void); void FIQHandler(void);
void undefinedInstructionHandler(void); void undefinedInstructionHandler(void);
void prefetchAbortHandler(void); void prefetchAbortHandler(void);

2
sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlers.s
View File

@ -47,6 +47,8 @@
push {r0-r12, lr} push {r0-r12, lr}
mrs r0, spsr mrs r0, spsr
mov r1, sp
mov r2, #\index
bl isExceptionFatal bl isExceptionFatal
cmp r0, #0 cmp r0, #0
pop {r0-r12, lr} pop {r0-r12, lr}

6
sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlersMain.c
View File

@ -33,7 +33,7 @@
#define REG_DUMP_SIZE 4 * 23 #define REG_DUMP_SIZE 4 * 23
#define CODE_DUMP_SIZE 48 #define CODE_DUMP_SIZE 48
bool isExceptionFatal(u32 spsr) bool isExceptionFatal(u32 spsr, u32 *regs, u32 index)
{ {
if((spsr & 0x1f) != 0x10) return true; if((spsr & 0x1f) != 0x10) return true;
@ -51,6 +51,10 @@ bool isExceptionFatal(u32 spsr)
thread = KPROCESS_GET_RVALUE(currentProcess, mainThread); thread = KPROCESS_GET_RVALUE(currentProcess, mainThread);
if(thread != NULL && thread->threadLocalStorage != NULL && *((vu32 *)thread->threadLocalStorage + 0x10) != 0) if(thread != NULL && thread->threadLocalStorage != NULL && *((vu32 *)thread->threadLocalStorage + 0x10) != 0)
return false; return false;
if(index == 3 && strcmp(codeSetOfProcess(currentProcess)->processName, "menu") == 0 && // workaround a Home Menu bug leading to a dabort
regs[0] == 0x3FFF && regs[2] == 0 && regs[5] == 2 && regs[7] == 1)
return false;
} }
return true; return true;