54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
# HG changeset patch
|
|
# User msirringhaus@suse.de
|
|
# Date 1558452408 -7200
|
|
# Tue May 21 17:26:48 2019 +0200
|
|
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
|
|
# Parent 136e1f2c44a3099b3e49a576fa62c8ad77aa431e
|
|
[mq]: mozilla-s390-context.patch
|
|
|
|
diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
|
|
--- a/js/src/wasm/WasmSignalHandlers.cpp
|
|
+++ b/js/src/wasm/WasmSignalHandlers.cpp
|
|
@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
|
|
# define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
|
|
# endif
|
|
# if defined(__linux__) && defined(__loongarch__)
|
|
# define EPC_sig(p) ((p)->uc_mcontext.pc)
|
|
# define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
|
|
# define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
|
|
# define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
|
|
# endif
|
|
+# if defined(__linux__) && defined(__s390x__)
|
|
+# define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
|
|
+# define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
|
|
+# endif
|
|
# elif defined(__NetBSD__)
|
|
# define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
|
|
# define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
|
|
# define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP])
|
|
# define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP])
|
|
# define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
|
|
# define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
|
|
# define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
|
|
@@ -399,16 +403,20 @@ struct macos_aarch64_context {
|
|
# define PC_sig(p) R32_sig(p)
|
|
# define SP_sig(p) R01_sig(p)
|
|
# define FP_sig(p) R01_sig(p)
|
|
# elif defined(__loongarch__)
|
|
# define PC_sig(p) EPC_sig(p)
|
|
# define FP_sig(p) RFP_sig(p)
|
|
# define SP_sig(p) RSP_sig(p)
|
|
# define LR_sig(p) RRA_sig(p)
|
|
+# elif defined(__s390x__)
|
|
+# define PC_sig(p) PSWa_sig(p)
|
|
+# define SP_sig(p) GR_sig(p, 15)
|
|
+# define FP_sig(p) GR_sig(p, 11)
|
|
# endif
|
|
|
|
static void SetContextPC(CONTEXT* context, uint8_t* pc) {
|
|
# ifdef PC_sig
|
|
*reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;
|
|
# else
|
|
MOZ_CRASH();
|
|
# endif
|