From d29a7d2ad9fa2d8c9815fe602c7f4647735d549d Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Thu, 27 Jan 2011 19:10:36 +0100
Subject: Making the faults returnable; eventually, this may serve as a full
 exception / interrupt handler.

---
 arch/arm/lpc17xx/startup.s | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'arch/arm')

diff --git a/arch/arm/lpc17xx/startup.s b/arch/arm/lpc17xx/startup.s
index e7c5311..2f79741 100644
--- a/arch/arm/lpc17xx/startup.s
+++ b/arch/arm/lpc17xx/startup.s
@@ -148,7 +148,12 @@ general_handler:
     MOV     R1, SP
     SUB     R1, #32
     PUSH    {R4-R11}
-    B       general_C_handler
+    MOV     R4, LR
+    BL      general_C_handler
+    AND     R0, #7
+    ORR     LR, R4, R0
+    POP     {R4-R11}
+    BX      LR
 
 /* Reset Handler */
 
-- 
cgit v1.2.3