mozilla-s390-context.patch
branchfirefox74
changeset 1123 7fa561e5d7c7
parent 1097 840132a4a9b3
child 1164 bb219fd0d646
--- a/mozilla-s390-context.patch	Sat Mar 07 09:48:10 2020 +0100
+++ b/mozilla-s390-context.patch	Mon Mar 30 21:49:01 2020 +0200
@@ -3,13 +3,18 @@
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
-# Parent  a3cc550d25e3a04d906f516928cbcbe50efd585e
+# Parent  cb0089687ab899846b8229c3741261d50101340e
 [mq]: mozilla-s390-context.patch
 
-diff -r a3cc550d25e3 -r 602e92722e76 js/src/wasm/WasmSignalHandlers.cpp
---- a/js/src/wasm/WasmSignalHandlers.cpp	Tue May 21 17:22:06 2019 +0200
-+++ b/js/src/wasm/WasmSignalHandlers.cpp	Tue May 21 17:26:48 2019 +0200
-@@ -154,6 +154,10 @@
+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__))
  #    define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
  #    define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
  #  endif
@@ -20,7 +25,17 @@
  #elif defined(__NetBSD__)
  #  define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
  #  define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
-@@ -385,8 +389,13 @@
+ #  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__)
  #  define PC_sig(p) R32_sig(p)
  #  define SP_sig(p) R01_sig(p)
  #  define FP_sig(p) R01_sig(p)
@@ -34,3 +49,8 @@
  static void SetContextPC(CONTEXT* context, uint8_t* pc) {
  #ifdef PC_sig
    *reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;
+ #else
+   MOZ_CRASH();
+ #endif
+ }
+