Author: tkreuzer
Date: Mon Jun 6 19:03:53 2011
New Revision: 52120
URL:
http://svn.reactos.org/svn/reactos?rev=52120&view=rev
Log:
[PSEH]
Fix amd64 build of pseh
Added:
trunk/reactos/lib/pseh/amd64/seh.s (with props)
trunk/reactos/lib/pseh/amd64/seh_prolog.s (with props)
Modified:
trunk/reactos/lib/pseh/CMakeLists.txt
Modified: trunk/reactos/lib/pseh/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re…
==============================================================================
--- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 19:03:53 2011
@@ -19,10 +19,17 @@
else()
- list(APPEND SOURCE
- dummy.c
- i386/seh.s
- i386/seh_prolog.s)
+ if(ARCH MATCHES i386)
+ list(APPEND SOURCE
+ dummy.c
+ i386/seh.s
+ i386/seh_prolog.s)
+ elseif(ARCH MATCHES amd64)
+ list(APPEND SOURCE
+ dummy.c
+ amd64/seh.s
+ amd64/seh_prolog.s)
+ endif()
add_library(pseh ${SOURCE})
add_dependencies(pseh asm)
Added: trunk/reactos/lib/pseh/amd64/seh.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/amd64/seh.s?rev=5…
==============================================================================
--- trunk/reactos/lib/pseh/amd64/seh.s (added)
+++ trunk/reactos/lib/pseh/amd64/seh.s [iso-8859-1] Mon Jun 6 19:03:53 2011
@@ -1,0 +1,52 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS CRT
+ * FILE: lib/pseh/amd64/seh.S
+ * PURPOSE: SEH Support for the CRT
+ * PROGRAMMERS:
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <asm.inc>
+
+#define DISPOSITION_DISMISS 0
+#define DISPOSITION_CONTINUE_SEARCH 1
+#define DISPOSITION_COLLIDED_UNWIND 3
+
+#define EXCEPTION_EXIT_UNWIND 4
+#define EXCEPTION_UNWINDING 2
+
+
+EXTERN RtlUnwind:PROC
+
+/* GLOBALS *******************************************************************/
+
+PUBLIC _global_unwind2
+PUBLIC _local_unwind2
+PUBLIC _abnormal_termination
+PUBLIC _except_handler2
+PUBLIC _except_handler3
+
+/* FUNCTIONS *****************************************************************/
+
+.code
+_unwind_handler:
+ ret
+
+_global_unwind2:
+ ret
+
+_abnormal_termination:
+ ret
+
+_local_unwind2:
+ ret
+
+_except_handler2:
+ ret
+
+_except_handler3:
+ ret
+
+END
Propchange: trunk/reactos/lib/pseh/amd64/seh.s
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/lib/pseh/amd64/seh_prolog.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/amd64/seh_prolog.…
==============================================================================
--- trunk/reactos/lib/pseh/amd64/seh_prolog.s (added)
+++ trunk/reactos/lib/pseh/amd64/seh_prolog.s [iso-8859-1] Mon Jun 6 19:03:53 2011
@@ -1,0 +1,25 @@
+/*
+ * COPYRIGHT: GNU GPL, see COPYING in the top level directory
+ * PROJECT: ReactOS CRT
+ * FILE: lib/pseh/amd64/seh_prolog.S
+ * PURPOSE: SEH Support for MSVC
+ * PROGRAMMERS: Timo Kreuzer
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <asm.inc>
+
+EXTERN _except_handler3:PROC
+
+.code
+
+PUBLIC _SEH_prolog
+_SEH_prolog:
+
+
+PUBLIC _SEH_epilog
+_SEH_epilog:
+ ret
+
+END
Propchange: trunk/reactos/lib/pseh/amd64/seh_prolog.s
------------------------------------------------------------------------------
svn:eol-style = native