From: Sir Richard <sir_richard@svn.reactos.org>
Date: Wed, 24 Nov 2010 18:56:35 +0000 (+0000)
Subject: [NTOS]: Seems like cpsr_c doesn't work in this case? Need to investigate. Put an... 
X-Git-Tag: backups/ros-branch-0_3_13@51035~414
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5f47e1ddd0ee29547985abb268e8d0ee2ca0df18

[NTOS]: Seems like cpsr_c doesn't work in this case? Need to investigate. Put an infinite loop in the entrypoint on ARM.

svn path=/trunk/; revision=49786
---

diff --git a/reactos/ntoskrnl/ke/arm/boot.s b/reactos/ntoskrnl/ke/arm/boot.s
index eff065cacbc..5bce7356a16 100644
--- a/reactos/ntoskrnl/ke/arm/boot.s
+++ b/reactos/ntoskrnl/ke/arm/boot.s
@@ -15,7 +15,10 @@
     PROLOG_END KiSystemStartup
     
     /* Put us in FIQ mode, set IRQ stack */
-    msr cpsr_c, #CPSR_FIQ_MODE
+    b .
+    mrs r3, cpsr
+    orr r3, r1, #CPSR_FIQ_MODE
+    msr cpsr, r3
     ldr sp, [a1, #LpbInterruptStack]
     
     /* Repeat for IRQ mode */