From 427a05997dfd74e42f9a9ba99a7deff108aafa67 Mon Sep 17 00:00:00 2001
From: TuxSH <tuxsh@sfr.fr>
Date: Thu, 8 Jun 2017 02:02:49 +0200
Subject: [PATCH] Revert "Refactor fatalExceptionHandlers.s a bit"

This reverts commit 84d736c2eb57dab3c0f2b30005bb2fc95f42fcc2.
---
 .../source/fatalExceptionHandlers.s           | 23 +++++++++----------
 .../source/fatalExceptionHandlersMain.c       |  2 --
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlers.s b/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlers.s
index 46a2184..30a9aec 100644
--- a/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlers.s
+++ b/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlers.s
@@ -78,21 +78,18 @@ _commonHandler:
     cpsid aif
 
     push {r0}
-    ldr r0, =fatalExceptionOccured
+    ldr r0, =_fatalExceptionOccured
     ldr r0, [r0]
     cmp r0, #0
     bne _die_loop
     pop {r0}
 
-    ldr r9, =exceptionStackTop
-    ldr r9, [r9]
-    sub r9, #0x400
-    add r9, #4
+    ldr r9, =_regs
     stmia r9, {r0-r7}
     mov r1, r8
     pop {r8,r9}
 
-    ldr r0, =fatalExceptionOccured
+    ldr r0, =_fatalExceptionOccured
     mov r4, #1
 
     _try_lock:
@@ -111,10 +108,8 @@ _commonHandler:
 
     mrs r2, spsr
     mrs r3, cpsr
-    ldr r6, =exceptionStackTop
-    ldr r6, [r6]
-    sub r6, #(0x400 - 0x20)
-    add r6, #4
+    ldr r6, =_regs
+    add r6, #0x20
 
     ands r4, r2, #0xf       @ get the mode that triggered the exception
     moveq r4, #0xf          @ usr => sys
@@ -171,8 +166,7 @@ _commonHandler:
 
     mov r0, #0
     mcr p15, 0, r0, c7, c10, 5   @ Drain Memory Barrier
-    sub r0, sp, #(0x400 - 0x100)
-    add r0, #4
+    ldr r0, =_regs
     mrc p15, 0, r2, c0, c0, 5    @ CPU ID register
     bl fatalExceptionHandlersMain
 
@@ -250,3 +244,8 @@ dataAbortHandler:
     subs pc, lr, #4
 
     GEN_USUAL_HANDLER _dataAbortNormal, 3, 16
+
+.bss
+.balign 4
+_regs: .skip (4 * 23)
+_fatalExceptionOccured: .word 0
diff --git a/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlersMain.c b/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlersMain.c
index 6da232f..295c898 100644
--- a/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlersMain.c
+++ b/sysmodules/rosalina/kernel_extension/source/fatalExceptionHandlersMain.c
@@ -33,8 +33,6 @@
 #define REG_DUMP_SIZE   4 * 23
 #define CODE_DUMP_SIZE  48
 
-bool fatalExceptionOccured = false;
-
 bool isExceptionFatal(u32 spsr, u32 *regs, u32 index)
 {
     if((spsr & 0x1f) != 0x10) return true;