Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-06 22:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

{RTL/ASM]

Browse source 
Fix ARM build

svn path=/trunk/; revision=67162
This commit is contained in:
Timo Kreuzer 2015-04-11 12:47:29 +00:00
parent 29552a8cd5
commit 89f99d7458
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/asm/kxarm.h
View file

@ -20,7 +20,7 @@ AreaName SETS "|.text|"
FuncName SETS "$Name" FuncName SETS "$Name"
PrologName SETS "$Name":CC:"_Prolog" PrologName SETS "$Name":CC:"_Prolog"
FuncEndName SETS "$Name":CC:"_end" FuncEndName SETS "$Name":CC:"_end"
AREA |.pdata|,ALIGN=2,PDATA //AREA |.pdata|,ALIGN=2,PDATA
ALIGN 2 ALIGN 2
EXPORT $FuncName [FUNC] EXPORT $FuncName [FUNC]
$FuncName $FuncName

12
reactos/lib/rtl/arm/debug_asm.S
View file

@ -6,11 +6,10 @@
* PROGRAMMERS: ReactOS Portable Systems Group * PROGRAMMERS: ReactOS Portable Systems Group
*/ */
.title "ARM Kernel/User NT Debugging and Exception" #include <ksarm.h>
.include "ntoskrnl/include/internal/arm/kxarm.h"
.include "ntoskrnl/include/internal/arm/ksarm.h"
TEXTAREA TEXTAREA
NESTED_ENTRY DbgBreakPoint NESTED_ENTRY DbgBreakPoint
PROLOG_END DbgBreakPoint PROLOG_END DbgBreakPoint
@ -62,9 +61,9 @@
str r12, [a1, #CsR12] str r12, [a1, #CsR12]
str sp, [a1, #CsSp] str sp, [a1, #CsSp]
str lr, [a1, #CsLr] str lr, [a1, #CsLr]
str pc, [a1, #CsPc] // str pc, [a1, #CsPc] // FIXME: error A2193: this instruction generates unpredictable behavior
mrs ip, spsr mrs ip, spsr
str ip, [a1, #CsPsr] str ip, [a1, #CsCpsr]
// //
// Set flags // Set flags
@ -77,3 +76,6 @@
// //
bx lr bx lr
ENTRY_END RtlCaptureContext ENTRY_END RtlCaptureContext
END
/* EOF */