Author: tkreuzer
Date: Sat Jul 5 19:17:16 2014
New Revision: 63689
URL: http://svn.reactos.org/svn/reactos?rev=63689&view=rev
Log:
[PSEH/RTL/CRT]
Some ARM related compilation fixes, plus remove a useless define
Modified:
trunk/reactos/lib/pseh/CMakeLists.txt
trunk/reactos/lib/rtl/exception.c
trunk/reactos/lib/sdk/crt/CMakeLists.txt
trunk/reactos/lib/sdk/crt/string/winesup.c
Modified: trunk/reactos/lib/pseh/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?rev=63689&r1=63688&r2=63689&view=diff
==============================================================================
--- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Sat Jul 5
19:17:16 2014
@@ -33,6 +33,10 @@
list(APPEND ASM_SOURCE
amd64/seh.s
amd64/seh_prolog.s)
+ elseif(ARCH STREQUAL "arm")
+ list(APPEND ASM_SOURCE
+ arm/seh_prolog.s)
+ list(APPEND SOURCE dummy.c)
endif()
list(APPEND SOURCE dummy.c)
Modified: trunk/reactos/lib/rtl/exception.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=63689&r1=63688&r2=63689&view=diff
==============================================================================
--- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Sat Jul 5 19:17:16 2014
@@ -221,8 +221,14 @@
DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8,
pc->R9, pc->R10, pc->R11);
DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12,
pc->R13, pc->R14, pc->R15);
DbgPrint("EFLAGS: %.8x\n", pc->EFlags);
+#elif defined(_M_ARM)
+ DbgPrint("Pc: %lx Lr: %lx Sp: %lx Cpsr: %lx\n", pc->Pc, pc->Lr,
pc->Sp, pc->Cpsr);
+ DbgPrint("R0: %lx R1: %lx R2: %lx R3: %lx\n", pc->R0, pc->R1,
pc->R2, pc->R3);
+ DbgPrint("R4: %lx R5: %lx R6: %lx R7: %lx\n", pc->R4, pc->R5,
pc->R6, pc->R7);
+ DbgPrint("R8: %lx R9: %lx R10: %lx R11: %lx\n", pc->R8, pc->R9,
pc->R10, pc->R11);
+ DbgPrint("R12: %lx \n", pc->R12);
#else
-#warning Unknown architecture
+#pragma message ("Unknown architecture")
#endif
}
Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt?rev=63689&r1=63688&r2=63689&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sat Jul 5
19:17:16 2014
@@ -12,6 +12,11 @@
list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_asm.s)
if(NOT MSVC)
list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s)
+ endif()
+elseif(ARCH STREQUAL "arm")
+ list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s)
+ if(NOT MSVC)
+ list(APPEND CHKSTK_SOURCE except/arm/chkstk_ms.s)
endif()
elseif(ARCH STREQUAL "powerpc")
list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s)
Modified: trunk/reactos/lib/sdk/crt/string/winesup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/winesup.c?rev=63689&r1=63688&r2=63689&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] Sat Jul 5
19:17:16 2014
@@ -99,4 +99,3 @@
else _SET_NUMBER_(float);
}
}
-#undef _SET_NUMBER_
