34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User msirringhaus@suse.de
|
||
|
|
# Date 1558452408 -7200
|
||
|
|
# Tue May 21 17:26:48 2019 +0200
|
||
|
|
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
|
||
|
|
# Parent 783ceb006fcdabe5ad23bd561362e721c7ed5f8c
|
||
|
|
[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
|
||
|
|
@@ -174,6 +174,10 @@ using mozilla::DebugOnly;
|
||
|
|
# define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS])
|
||
|
|
# define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP])
|
||
|
|
# 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])
|
||
|
|
@@ -416,6 +420,10 @@ struct macos_aarch64_context {
|
||
|
|
# define FP_sig(p) RFP_sig(p)
|
||
|
|
# define SP_sig(p) R03_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)
|
||
|
|
# elif defined(__riscv)
|
||
|
|
# define PC_sig(p) RPC_sig(p)
|
||
|
|
# define FP_sig(p) RFP_sig(p)
|