2019-07-09 23:21:11 +02:00
|
|
|
# HG changeset patch
|
|
|
|
# User msirringhaus@suse.de
|
|
|
|
# Date 1558452408 -7200
|
|
|
|
# Tue May 21 17:26:48 2019 +0200
|
|
|
|
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
|
2020-03-12 20:14:24 +01:00
|
|
|
# Parent cb0089687ab899846b8229c3741261d50101340e
|
2019-07-09 23:21:11 +02:00
|
|
|
[mq]: mozilla-s390-context.patch
|
|
|
|
|
2020-03-12 20:14:24 +01:00
|
|
|
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
|
|
|
|
@@ -150,16 +150,20 @@ using mozilla::DebugOnly;
|
|
|
|
# define FP_sig(p) ((p)->uc_mcontext.mc_fp)
|
|
|
|
# define SP_sig(p) ((p)->uc_mcontext.mc_i7)
|
|
|
|
# endif
|
|
|
|
# if defined(__linux__) && (defined(__ppc64__) || defined(__PPC64__) || \
|
|
|
|
defined(__ppc64le__) || defined(__PPC64LE__))
|
2019-07-09 23:21:11 +02:00
|
|
|
# define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
|
|
|
|
# define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
|
|
|
|
# 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])
|
2020-03-12 20:14:24 +01:00
|
|
|
# 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])
|
|
|
|
@@ -381,18 +385,23 @@ struct macos_arm_context {
|
|
|
|
# define FP_sig(p) RFP_sig(p)
|
|
|
|
# define SP_sig(p) RSP_sig(p)
|
|
|
|
# define LR_sig(p) R31_sig(p)
|
|
|
|
#elif defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
|
|
|
|
defined(__PPC64LE__)
|
2019-07-09 23:21:11 +02:00
|
|
|
# define PC_sig(p) R32_sig(p)
|
|
|
|
# define SP_sig(p) R01_sig(p)
|
|
|
|
# define FP_sig(p) R01_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;
|
2020-03-12 20:14:24 +01:00
|
|
|
#else
|
|
|
|
MOZ_CRASH();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|