|
 |
83ba88 |
# HG changeset patch
|
|
|
83ba88 |
# User msirringhaus@suse.de
|
|
|
83ba88 |
# Date 1558452408 -7200
|
|
|
83ba88 |
# Tue May 21 17:26:48 2019 +0200
|
|
|
83ba88 |
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
|
|
|
83ba88 |
# Parent a3cc550d25e3a04d906f516928cbcbe50efd585e
|
|
|
83ba88 |
[mq]: mozilla-s390-context.patch
|
|
|
83ba88 |
|
|
|
83ba88 |
diff -r a3cc550d25e3 -r 602e92722e76 js/src/wasm/WasmSignalHandlers.cpp
|
|
|
83ba88 |
--- a/js/src/wasm/WasmSignalHandlers.cpp Tue May 21 17:22:06 2019 +0200
|
|
|
83ba88 |
+++ b/js/src/wasm/WasmSignalHandlers.cpp Tue May 21 17:26:48 2019 +0200
|
|
|
83ba88 |
@@ -154,6 +154,10 @@
|
|
|
83ba88 |
# define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
|
|
|
83ba88 |
# define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
|
|
|
83ba88 |
# endif
|
|
|
83ba88 |
+# if defined(__linux__) && defined(__s390x__)
|
|
|
83ba88 |
+# define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
|
|
|
83ba88 |
+# define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
|
|
|
83ba88 |
+# endif
|
|
|
83ba88 |
#elif defined(__NetBSD__)
|
|
|
83ba88 |
# define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
|
|
|
83ba88 |
# define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
|
|
|
83ba88 |
@@ -385,8 +389,13 @@
|
|
|
83ba88 |
# define PC_sig(p) R32_sig(p)
|
|
|
83ba88 |
# define SP_sig(p) R01_sig(p)
|
|
|
83ba88 |
# define FP_sig(p) R01_sig(p)
|
|
|
83ba88 |
+#elif defined(__s390x__)
|
|
|
83ba88 |
+# define PC_sig(p) PSWa_sig(p)
|
|
|
83ba88 |
+# define SP_sig(p) GR_sig(p, 15)
|
|
|
83ba88 |
+# define FP_sig(p) GR_sig(p, 11)
|
|
|
83ba88 |
#endif
|
|
|
83ba88 |
|
|
|
83ba88 |
+
|
|
|
83ba88 |
static void SetContextPC(CONTEXT* context, uint8_t* pc) {
|
|
|
83ba88 |
#ifdef PC_sig
|
|
|
83ba88 |
*reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;
|