From d3a744a1ad0381376bec1a4e364697b769c5663d Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 3 Jul 2025 12:00:49 +0300 Subject: [PATCH] [PSEH] Remove x64/ARM asm stubs These are all x86 specific. --- sdk/lib/pseh/CMakeLists.txt | 9 ------ sdk/lib/pseh/amd64/framebased.S | 25 ---------------- sdk/lib/pseh/amd64/seh.s | 52 --------------------------------- sdk/lib/pseh/amd64/seh_prolog.s | 25 ---------------- sdk/lib/pseh/arm/seh_prolog.s | 31 -------------------- 5 files changed, 142 deletions(-) delete mode 100644 sdk/lib/pseh/amd64/framebased.S delete mode 100644 sdk/lib/pseh/amd64/seh.s delete mode 100644 sdk/lib/pseh/amd64/seh_prolog.s delete mode 100644 sdk/lib/pseh/arm/seh_prolog.s diff --git a/sdk/lib/pseh/CMakeLists.txt b/sdk/lib/pseh/CMakeLists.txt index e36a3f5fd87..c9a31646b54 100644 --- a/sdk/lib/pseh/CMakeLists.txt +++ b/sdk/lib/pseh/CMakeLists.txt @@ -3,13 +3,6 @@ if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE i386/seh.s i386/seh_prolog.s) -elseif(ARCH STREQUAL "amd64") - list(APPEND ASM_SOURCE - amd64/seh.s - amd64/seh_prolog.s) -elseif(ARCH STREQUAL "arm") - list(APPEND ASM_SOURCE - arm/seh_prolog.s) endif() if(MSVC OR ((CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (ARCH STREQUAL "amd64"))) @@ -41,8 +34,6 @@ else() i386/framebased.S i386/framebased-gcchack.c i386/framebased-gcchack-asm.S) - elseif(ARCH STREQUAL "amd64") - list(APPEND SOURCE amd64/framebased.S) endif() add_library(pseh ${SOURCE} ${ASM_SOURCE}) diff --git a/sdk/lib/pseh/amd64/framebased.S b/sdk/lib/pseh/amd64/framebased.S deleted file mode 100644 index 401d9227f31..00000000000 --- a/sdk/lib/pseh/amd64/framebased.S +++ /dev/null @@ -1,25 +0,0 @@ - -.text -.intel_syntax noprefix - -.globl _SEHCleanHandlerEnvironment -_SEHCleanHandlerEnvironment: - ret - -.globl _SEHCurrentRegistration -_SEHCurrentRegistration: - ret - -.globl _SEHRegisterFrame -_SEHRegisterFrame: - ret - -.globl _SEHUnregisterFrame -_SEHUnregisterFrame: - ret - -.globl _SEHGlobalUnwind -_SEHGlobalUnwind: - ret - -// EOF diff --git a/sdk/lib/pseh/amd64/seh.s b/sdk/lib/pseh/amd64/seh.s deleted file mode 100644 index 14df30687df..00000000000 --- a/sdk/lib/pseh/amd64/seh.s +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 - -#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 diff --git a/sdk/lib/pseh/amd64/seh_prolog.s b/sdk/lib/pseh/amd64/seh_prolog.s deleted file mode 100644 index d03063534d7..00000000000 --- a/sdk/lib/pseh/amd64/seh_prolog.s +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 - -EXTERN _except_handler3:PROC - -.code - -PUBLIC _SEH_prolog -_SEH_prolog: - - -PUBLIC _SEH_epilog -_SEH_epilog: - ret - -END diff --git a/sdk/lib/pseh/arm/seh_prolog.s b/sdk/lib/pseh/arm/seh_prolog.s deleted file mode 100644 index 0c252ae9164..00000000000 --- a/sdk/lib/pseh/arm/seh_prolog.s +++ /dev/null @@ -1,31 +0,0 @@ -/* - * COPYRIGHT: GNU GPL, see COPYING in the top level directory - * PROJECT: ReactOS CRT - * FILE: lib/pseh/arm/seh_prolog.S - * PURPOSE: SEH Support for MSVC / ARM - * PROGRAMMERS: Timo Kreuzer - */ - -/* INCLUDES ******************************************************************/ - -#include "ksarm.h" - - TEXTAREA - - IMPORT __except_handler - - LEAF_ENTRY _SEH_prolog - - - LEAF_END _SEH_prolog - - - - LEAF_ENTRY _SEH_epilog - - - LEAF_END _SEH_epilog - - - - END