From 78d9065db0ad87041b519b888f729f820ea49f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Thu, 29 Sep 2016 07:14:30 +0200 Subject: [PATCH] VM: UAP_SET_TOC_POINTER appears to be a noop on all platforms --- vm/os-linux-arm.hpp | 1 - vm/os-linux-ppc.32.hpp | 1 - vm/os-linux-ppc.64.hpp | 1 - vm/os-linux-x86.32.hpp | 1 - vm/os-linux-x86.64.hpp | 1 - vm/os-macosx.hpp | 1 - vm/os-unix.cpp | 1 - 7 files changed, 7 deletions(-) diff --git a/vm/os-linux-arm.hpp b/vm/os-linux-arm.hpp index 330a1f9471a..74bf6d9dd22 100644 --- a/vm/os-linux-arm.hpp +++ b/vm/os-linux-arm.hpp @@ -10,7 +10,6 @@ void flush_icache(cell start, cell len); (((ucontext_t*)ucontext)->uc_mcontext.arm_sp) #define UAP_PROGRAM_COUNTER(ucontext) \ (((ucontext_t*)ucontext)->uc_mcontext.arm_pc) -#define UAP_SET_TOC_POINTER(uap, ptr) (void)0 #define CODE_TO_FUNCTION_POINTER(code) (void)0 #define CODE_TO_FUNCTION_POINTER_CALLBACK(vm, code) (void)0 diff --git a/vm/os-linux-ppc.32.hpp b/vm/os-linux-ppc.32.hpp index 7a9fbabcd38..f09a6fdaeeb 100644 --- a/vm/os-linux-ppc.32.hpp +++ b/vm/os-linux-ppc.32.hpp @@ -6,7 +6,6 @@ namespace factor { ((ucontext_t*)ucontext)->uc_mcontext.uc_regs->gregs[1] #define UAP_PROGRAM_COUNTER(ucontext) \ (((ucontext_t*)ucontext)->uc_mcontext.uc_regs->gregs[32]) -#define UAP_SET_TOC_POINTER(uap, ptr) (void)0 #define CODE_TO_FUNCTION_POINTER(code) (void)0 #define CODE_TO_FUNCTION_POINTER_CALLBACK(vm, code) (void)0 diff --git a/vm/os-linux-ppc.64.hpp b/vm/os-linux-ppc.64.hpp index 325d975f9ec..f1e2d58cf8b 100644 --- a/vm/os-linux-ppc.64.hpp +++ b/vm/os-linux-ppc.64.hpp @@ -6,7 +6,6 @@ namespace factor { ((ucontext_t*)ucontext)->uc_mcontext.gp_regs[1] #define UAP_PROGRAM_COUNTER(ucontext) \ (((ucontext_t*)ucontext)->uc_mcontext.gp_regs[32]) -#define UAP_SET_TOC_POINTER(uap, ptr) (void)0 #define FACTOR_PPC_TOC 1 diff --git a/vm/os-linux-x86.32.hpp b/vm/os-linux-x86.32.hpp index e8f7d645f71..c078c478f42 100644 --- a/vm/os-linux-x86.32.hpp +++ b/vm/os-linux-x86.32.hpp @@ -50,7 +50,6 @@ inline static void uap_clear_fpu_status(void* uap) { (((ucontext_t*)ucontext)->uc_mcontext.gregs[7]) #define UAP_PROGRAM_COUNTER(ucontext) \ (((ucontext_t*)ucontext)->uc_mcontext.gregs[14]) -#define UAP_SET_TOC_POINTER(uap, ptr) (void)0 #define CODE_TO_FUNCTION_POINTER(code) (void)0 #define CODE_TO_FUNCTION_POINTER_CALLBACK(vm, code) (void)0 diff --git a/vm/os-linux-x86.64.hpp b/vm/os-linux-x86.64.hpp index f20c6186692..44f2dfd391f 100644 --- a/vm/os-linux-x86.64.hpp +++ b/vm/os-linux-x86.64.hpp @@ -18,7 +18,6 @@ inline static void uap_clear_fpu_status(void* uap) { (((ucontext_t*)ucontext)->uc_mcontext.gregs[15]) #define UAP_PROGRAM_COUNTER(ucontext) \ (((ucontext_t*)ucontext)->uc_mcontext.gregs[16]) -#define UAP_SET_TOC_POINTER(uap, ptr) (void)0 #define CODE_TO_FUNCTION_POINTER(code) (void)0 #define CODE_TO_FUNCTION_POINTER_CALLBACK(vm, code) (void)0 diff --git a/vm/os-macosx.hpp b/vm/os-macosx.hpp index 6c3d84d1680..83a20541620 100644 --- a/vm/os-macosx.hpp +++ b/vm/os-macosx.hpp @@ -9,7 +9,6 @@ const char* vm_executable_path(); const char* default_image_path(); #define UAP_STACK_POINTER(ucontext) (((ucontext_t*)ucontext)->uc_stack.ss_sp) -#define UAP_SET_TOC_POINTER(uap, ptr) (void)0 #define CODE_TO_FUNCTION_POINTER(code) (void)0 #define CODE_TO_FUNCTION_POINTER_CALLBACK(vm, code) (void)0 diff --git a/vm/os-unix.cpp b/vm/os-unix.cpp index 2e682825df7..7c018eee0db 100644 --- a/vm/os-unix.cpp +++ b/vm/os-unix.cpp @@ -123,7 +123,6 @@ void factor_vm::dispatch_signal(void* uap, void(handler)()) { dispatch_signal_handler((cell*)&UAP_STACK_POINTER(uap), (cell*)&UAP_PROGRAM_COUNTER(uap), (cell)FUNCTION_CODE_POINTER(handler)); - UAP_SET_TOC_POINTER(uap, (cell)FUNCTION_TOC_POINTER(handler)); } void memory_signal_handler(int signal, siginfo_t* siginfo, void* uap) {