1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1558452408 -7200 |
3 # Date 1558452408 -7200 |
4 # Tue May 21 17:26:48 2019 +0200 |
4 # Tue May 21 17:26:48 2019 +0200 |
5 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4 |
5 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4 |
6 # Parent 263ccc06617bef4b8ef891eec54995190d5d5df3 |
6 # Parent 6d6ebdace8a9877fe17c1bd14b80307c258c864f |
7 [mq]: mozilla-s390-context.patch |
7 [mq]: mozilla-s390-context.patch |
8 |
8 |
9 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp |
9 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp |
10 --- a/js/src/wasm/WasmSignalHandlers.cpp |
10 --- a/js/src/wasm/WasmSignalHandlers.cpp |
11 +++ b/js/src/wasm/WasmSignalHandlers.cpp |
11 +++ b/js/src/wasm/WasmSignalHandlers.cpp |
12 @@ -163,16 +163,20 @@ using mozilla::DebugOnly; |
12 @@ -163,16 +163,20 @@ using mozilla::DebugOnly; |
13 # define RSP_sig(p) ((p)->uc_mcontext.gregs[3]) |
13 # define R03_sig(p) ((p)->uc_mcontext.__gregs[3]) |
14 # define RFP_sig(p) ((p)->uc_mcontext.gregs[22]) |
14 # define RFP_sig(p) ((p)->uc_mcontext.__gregs[22]) |
15 # endif |
15 # endif |
16 # if defined(__sun__) && defined(__sparc__) |
16 # if defined(__sun__) && defined(__sparc__) |
17 # define PC_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) |
17 # define PC_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) |
18 # define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS]) |
18 # define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS]) |
19 # define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP]) |
19 # define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP]) |
35 # define SP_sig(p) R01_sig(p) |
35 # define SP_sig(p) R01_sig(p) |
36 # define FP_sig(p) R01_sig(p) |
36 # define FP_sig(p) R01_sig(p) |
37 # elif defined(__loongarch__) |
37 # elif defined(__loongarch__) |
38 # define PC_sig(p) EPC_sig(p) |
38 # define PC_sig(p) EPC_sig(p) |
39 # define FP_sig(p) RFP_sig(p) |
39 # define FP_sig(p) RFP_sig(p) |
40 # define SP_sig(p) RSP_sig(p) |
40 # define SP_sig(p) R03_sig(p) |
41 # define LR_sig(p) RRA_sig(p) |
41 # define LR_sig(p) RRA_sig(p) |
42 +# elif defined(__s390x__) |
42 +# elif defined(__s390x__) |
43 +# define PC_sig(p) PSWa_sig(p) |
43 +# define PC_sig(p) PSWa_sig(p) |
44 +# define SP_sig(p) GR_sig(p, 15) |
44 +# define SP_sig(p) GR_sig(p, 15) |
45 +# define FP_sig(p) GR_sig(p, 11) |
45 +# define FP_sig(p) GR_sig(p, 11) |