mozilla-s390-context.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Fri, 22 Mar 2024 10:02:25 +0100
branchfirefox123
changeset 1201 3a2c95022db2
parent 1190 2a24a948b5cf
permissions -rw-r--r--
Firefox 123.0.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User msirringhaus@suse.de
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Date 1558452408 -7200
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
#      Tue May 21 17:26:48 2019 +0200
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
1190
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
     6
# Parent  783ceb006fcdabe5ad23bd561362e721c7ed5f8c
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
[mq]: mozilla-s390-context.patch
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
1123
7fa561e5d7c7 Firefox 74.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
     9
diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
7fa561e5d7c7 Firefox 74.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    10
--- a/js/src/wasm/WasmSignalHandlers.cpp
7fa561e5d7c7 Firefox 74.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    11
+++ b/js/src/wasm/WasmSignalHandlers.cpp
1190
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    12
@@ -174,6 +174,10 @@ using mozilla::DebugOnly;
1180
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    13
 #      define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS])
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    14
 #      define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP])
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    15
 #    endif
1190
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    16
+#    if defined(__linux__) && defined(__s390x__)
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    17
+#      define GR_sig(p, x) ((p)->uc_mcontext.gregs[x])
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    18
+#      define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    19
+#    endif
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    20
 #  elif defined(__NetBSD__)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    21
 #    define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    22
 #    define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
1190
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    23
@@ -416,6 +420,10 @@ struct macos_aarch64_context {
1173
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    24
 #    define FP_sig(p) RFP_sig(p)
1181
ba646dddffef 107.0.1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1180
diff changeset
    25
 #    define SP_sig(p) R03_sig(p)
1173
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    26
 #    define LR_sig(p) RRA_sig(p)
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    27
+#  elif defined(__s390x__)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    28
+#    define PC_sig(p) PSWa_sig(p)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    29
+#    define SP_sig(p) GR_sig(p, 15)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    30
+#    define FP_sig(p) GR_sig(p, 11)
1190
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    31
 #  elif defined(__riscv)
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    32
 #    define PC_sig(p) RPC_sig(p)
2a24a948b5cf Firefox 115.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1181
diff changeset
    33
 #    define FP_sig(p) RFP_sig(p)