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