From 89f99d7458214b54ecefc82d2f3650a795f40125 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 11 Apr 2015 12:47:29 +0000
Subject: [PATCH] {RTL/ASM] Fix ARM build

svn path=/trunk/; revision=67162
---
 reactos/include/asm/kxarm.h     | 10 +++++-----
 reactos/lib/rtl/arm/debug_asm.S | 28 +++++++++++++++-------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/reactos/include/asm/kxarm.h b/reactos/include/asm/kxarm.h
index 770df4b5050..fce67a80ec1 100644
--- a/reactos/include/asm/kxarm.h
+++ b/reactos/include/asm/kxarm.h
@@ -20,7 +20,7 @@ AreaName    SETS    "|.text|"
 FuncName    SETS    "$Name"
 PrologName  SETS    "$Name":CC:"_Prolog"
 FuncEndName SETS    "$Name":CC:"_end"
-    AREA |.pdata|,ALIGN=2,PDATA
+    //AREA |.pdata|,ALIGN=2,PDATA
     ALIGN 2
     EXPORT $FuncName [FUNC]
 $FuncName
@@ -67,16 +67,16 @@ $FuncEndName
     TRAP_EPILOG $SystemCall
         fixme
     MEND
-    
+
     #define CR 13
     #define LF 10
     #define NUL 0
-    
+
     #define ASCII dcb
-    
+
     MACRO
     UNIMPLEMENTED $Name
-    MEND    
+    MEND
 
 #else
 
diff --git a/reactos/lib/rtl/arm/debug_asm.S b/reactos/lib/rtl/arm/debug_asm.S
index be611c8c0ee..e96825e0b89 100644
--- a/reactos/lib/rtl/arm/debug_asm.S
+++ b/reactos/lib/rtl/arm/debug_asm.S
@@ -6,34 +6,33 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-    .title "ARM Kernel/User NT Debugging and Exception"
-    .include "ntoskrnl/include/internal/arm/kxarm.h"
-    .include "ntoskrnl/include/internal/arm/ksarm.h"
+#include <ksarm.h>
 
     TEXTAREA
+
     NESTED_ENTRY DbgBreakPoint
     PROLOG_END DbgBreakPoint
-    
+
     //
     // Do a breakpoint and return
     //
     bkpt BREAKPOINT_BREAK
     bx lr
     ENTRY_END DbgBreakPoint
-    
+
     NESTED_ENTRY DebugService
     PROLOG_END DebugService
-    
+
     //
     // Do a breakpoint and return
     //
     bkpt BREAKPOINT_PRINT // Could be prompt too, we check this later
     bx lr
     ENTRY_END DebugService
-    
+
     NESTED_ENTRY DebugService2
     PROLOG_END DebugService2
-    
+
     //
     // FIXME-TODO: Do a breakpoint and return
     //
@@ -59,21 +58,24 @@
     str r9, [a1, #CsR9]
     str r10, [a1, #CsR10]
     str r11, [a1, #CsR11]
-    str r12, [a1, #CsR12]    
+    str r12, [a1, #CsR12]
     str sp, [a1, #CsSp]
     str lr, [a1, #CsLr]
-    str pc, [a1, #CsPc]
+//    str pc, [a1, #CsPc] // FIXME: error A2193: this instruction generates unpredictable behavior
     mrs ip, spsr
-    str ip, [a1, #CsPsr]
-    
+    str ip, [a1, #CsCpsr]
+
     //
     // Set flags
     //
     mov ip, #CONTEXT_FULL
     str ip, [a1, #CsContextFlags]
-    
+
     //
     // Return
     //
     bx lr
     ENTRY_END RtlCaptureContext
+
+    END
+/* EOF */