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