mozilla-s390-context.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 15 Nov 2022 15:11:07 +0100
branchfirefox106
changeset 1180 d76083122710
parent 1173 56ecd2ae6e61
child 1181 ba646dddffef
permissions -rw-r--r--
Firefox 106.0.5
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
1180
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
     6
# Parent  263ccc06617bef4b8ef891eec54995190d5d5df3
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
1180
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    12
@@ -163,16 +163,20 @@ using mozilla::DebugOnly;
1173
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    13
 #      define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    14
 #      define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    15
 #    endif
1180
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    16
 #    if defined(__sun__) && defined(__sparc__)
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    17
 #      define PC_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    18
 #      define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS])
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    19
 #      define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP])
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    20
 #    endif
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
+#  if defined(__linux__) && defined(__s390x__)
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
+#    define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
+#    define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
+#  endif
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    25
 #  elif defined(__NetBSD__)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    26
 #    define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    27
 #    define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    28
 #    define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    29
 #    define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    30
 #    define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    31
 #    define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    32
 #    define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
1180
d76083122710 Firefox 106.0.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1173
diff changeset
    33
@@ -405,16 +409,20 @@ struct macos_aarch64_context {
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    34
 #    define PC_sig(p) R32_sig(p)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    35
 #    define SP_sig(p) R01_sig(p)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    36
 #    define FP_sig(p) R01_sig(p)
1173
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    37
 #  elif defined(__loongarch__)
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    38
 #    define PC_sig(p) EPC_sig(p)
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    39
 #    define FP_sig(p) RFP_sig(p)
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    40
 #    define SP_sig(p) RSP_sig(p)
56ecd2ae6e61 Firefox 99(.0.1)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1164
diff changeset
    41
 #    define LR_sig(p) RRA_sig(p)
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    42
+#  elif defined(__s390x__)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    43
+#    define PC_sig(p) PSWa_sig(p)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    44
+#    define SP_sig(p) GR_sig(p, 15)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    45
+#    define FP_sig(p) GR_sig(p, 11)
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    46
 #  endif
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 static void SetContextPC(CONTEXT* context, uint8_t* pc) {
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    49
 #  ifdef PC_sig
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
   *reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    51
 #  else
1123
7fa561e5d7c7 Firefox 74.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    52
   MOZ_CRASH();
1164
bb219fd0d646 Firefox 93.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    53
 #  endif