mozilla-s390-context.patch
branchfirefox99
changeset 1173 56ecd2ae6e61
parent 1164 bb219fd0d646
child 1180 d76083122710
--- a/mozilla-s390-context.patch	Mon Apr 04 10:22:27 2022 +0200
+++ b/mozilla-s390-context.patch	Sun May 01 18:18:56 2022 +0200
@@ -3,20 +3,20 @@
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
-# Parent  60715122a04aad06b33ad7259f1bde19803230da
+# Parent  136e1f2c44a3099b3e49a576fa62c8ad77aa431e
 [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
-@@ -151,16 +151,20 @@ using mozilla::DebugOnly;
- #      define FP_sig(p) ((p)->uc_mcontext.mc_fp)
- #      define SP_sig(p) ((p)->uc_mcontext.mc_i7)
+@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
+ #      define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
  #    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])
+ #    if defined(__linux__) && defined(__loongarch__)
+ #      define EPC_sig(p) ((p)->uc_mcontext.pc)
+ #      define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
+ #      define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
+ #      define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
  #    endif
 +#  if defined(__linux__) && defined(__s390x__)
 +#    define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
@@ -30,15 +30,15 @@
  #    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])
-@@ -371,16 +375,20 @@ struct macos_aarch64_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__)
+@@ -399,16 +403,20 @@ struct macos_aarch64_context {
  #    define PC_sig(p) R32_sig(p)
  #    define SP_sig(p) R01_sig(p)
  #    define FP_sig(p) R01_sig(p)
+ #  elif defined(__loongarch__)
+ #    define PC_sig(p) EPC_sig(p)
+ #    define FP_sig(p) RFP_sig(p)
+ #    define SP_sig(p) RSP_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)