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 136e1f2c44a3099b3e49a576fa62c8ad77aa431e |
6 # Parent 263ccc06617bef4b8ef891eec54995190d5d5df3 |
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 @@ -157,16 +157,20 @@ using mozilla::DebugOnly; |
12 @@ -163,16 +163,20 @@ using mozilla::DebugOnly; |
13 # define R32_sig(p) ((p)->uc_mcontext.gp_regs[32]) |
|
14 # endif |
|
15 # if defined(__linux__) && defined(__loongarch__) |
|
16 # define EPC_sig(p) ((p)->uc_mcontext.pc) |
|
17 # define RRA_sig(p) ((p)->uc_mcontext.gregs[1]) |
|
18 # define RSP_sig(p) ((p)->uc_mcontext.gregs[3]) |
13 # define RSP_sig(p) ((p)->uc_mcontext.gregs[3]) |
19 # define RFP_sig(p) ((p)->uc_mcontext.gregs[22]) |
14 # define RFP_sig(p) ((p)->uc_mcontext.gregs[22]) |
|
15 # endif |
|
16 # if defined(__sun__) && defined(__sparc__) |
|
17 # define PC_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) |
|
18 # define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS]) |
|
19 # define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP]) |
20 # endif |
20 # endif |
21 +# if defined(__linux__) && defined(__s390x__) |
21 +# if defined(__linux__) && defined(__s390x__) |
22 +# define GR_sig(p,x) ((p)->uc_mcontext.gregs[x]) |
22 +# define GR_sig(p,x) ((p)->uc_mcontext.gregs[x]) |
23 +# define PSWa_sig(p) ((p)->uc_mcontext.psw.addr) |
23 +# define PSWa_sig(p) ((p)->uc_mcontext.psw.addr) |
24 +# endif |
24 +# endif |
28 # define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP]) |
28 # define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP]) |
29 # define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP]) |
29 # define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP]) |
30 # define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP]) |
30 # define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP]) |
31 # define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP]) |
31 # define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP]) |
32 # define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11]) |
32 # define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11]) |
33 @@ -399,16 +403,20 @@ struct macos_aarch64_context { |
33 @@ -405,16 +409,20 @@ struct macos_aarch64_context { |
34 # define PC_sig(p) R32_sig(p) |
34 # define PC_sig(p) R32_sig(p) |
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) |