On Wed, Nov 17, 2021 at 9:04 AM Richard Henderson <
richard.hender...@linaro.org> wrote:
> From: Warner Losh <i...@bsdimp.com>
>
> Add a new function host_signal_set_pc to set the next pc in an
> mcontext. The caller should ensure this is a valid PC for execution.
>
> Signed-off-by: Warner Losh <i...@bsdimp.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
> Message-Id: <20211113045603.60391-2-...@bsdimp.com>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> linux-user/host/aarch64/host-signal.h | 5 +++++
> linux-user/host/alpha/host-signal.h | 5 +++++
> linux-user/host/arm/host-signal.h | 5 +++++
> linux-user/host/i386/host-signal.h | 5 +++++
> linux-user/host/mips/host-signal.h | 5 +++++
> linux-user/host/ppc/host-signal.h | 5 +++++
> linux-user/host/riscv/host-signal.h | 5 +++++
> linux-user/host/s390/host-signal.h | 5 +++++
> linux-user/host/sparc/host-signal.h | 9 +++++++++
> linux-user/host/x86_64/host-signal.h | 5 +++++
> 10 files changed, 54 insertions(+)
>
Reviewed-by: Warner Losh <i...@bsdimp.com>
I'm unsure on the protocol for this situation (where I wrote the change,
but someone else picked it up), but the change looks good to me....
> diff --git a/linux-user/host/aarch64/host-signal.h
> b/linux-user/host/aarch64/host-signal.h
> index 0c0b08383a..9770b36dc1 100644
> --- a/linux-user/host/aarch64/host-signal.h
> +++ b/linux-user/host/aarch64/host-signal.h
> @@ -35,6 +35,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.pc;
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.pc = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> struct _aarch64_ctx *hdr;
> diff --git a/linux-user/host/alpha/host-signal.h
> b/linux-user/host/alpha/host-signal.h
> index e080be412f..f4c942948a 100644
> --- a/linux-user/host/alpha/host-signal.h
> +++ b/linux-user/host/alpha/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.sc_pc;
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.sc_pc = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> uint32_t *pc = (uint32_t *)host_signal_pc(uc);
> diff --git a/linux-user/host/arm/host-signal.h
> b/linux-user/host/arm/host-signal.h
> index efb165c0c5..6c095773c0 100644
> --- a/linux-user/host/arm/host-signal.h
> +++ b/linux-user/host/arm/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.arm_pc;
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.arm_pc = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> /*
> diff --git a/linux-user/host/i386/host-signal.h
> b/linux-user/host/i386/host-signal.h
> index 4c8eef99ce..abe1ece5c9 100644
> --- a/linux-user/host/i386/host-signal.h
> +++ b/linux-user/host/i386/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.gregs[REG_EIP];
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.gregs[REG_EIP] = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> return uc->uc_mcontext.gregs[REG_TRAPNO] == 0xe
> diff --git a/linux-user/host/mips/host-signal.h
> b/linux-user/host/mips/host-signal.h
> index ef341f7c20..c666ed8c3f 100644
> --- a/linux-user/host/mips/host-signal.h
> +++ b/linux-user/host/mips/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.pc;
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.pc = pc;
> +}
> +
> #if defined(__misp16) || defined(__mips_micromips)
> #error "Unsupported encoding"
> #endif
> diff --git a/linux-user/host/ppc/host-signal.h
> b/linux-user/host/ppc/host-signal.h
> index a491c413dc..1d8e658ff7 100644
> --- a/linux-user/host/ppc/host-signal.h
> +++ b/linux-user/host/ppc/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.regs->nip;
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.regs->nip = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> return uc->uc_mcontext.regs->trap != 0x400
> diff --git a/linux-user/host/riscv/host-signal.h
> b/linux-user/host/riscv/host-signal.h
> index 3b168cb58b..a4f170efb0 100644
> --- a/linux-user/host/riscv/host-signal.h
> +++ b/linux-user/host/riscv/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.__gregs[REG_PC];
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.__gregs[REG_PC] = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> /*
> diff --git a/linux-user/host/s390/host-signal.h
> b/linux-user/host/s390/host-signal.h
> index 26990e4893..a524f2ab00 100644
> --- a/linux-user/host/s390/host-signal.h
> +++ b/linux-user/host/s390/host-signal.h
> @@ -16,6 +16,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.psw.addr;
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.psw.addr = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> uint16_t *pinsn = (uint16_t *)host_signal_pc(uc);
> diff --git a/linux-user/host/sparc/host-signal.h
> b/linux-user/host/sparc/host-signal.h
> index 5e71d33f8e..7342936071 100644
> --- a/linux-user/host/sparc/host-signal.h
> +++ b/linux-user/host/sparc/host-signal.h
> @@ -20,6 +20,15 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> #endif
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> +#ifdef __arch64__
> + uc->uc_mcontext.mc_gregs[MC_PC] = pc;
> +#else
> + uc->uc_mcontext.gregs[REG_PC] = pc;
> +#endif
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> uint32_t insn = *(uint32_t *)host_signal_pc(uc);
> diff --git a/linux-user/host/x86_64/host-signal.h
> b/linux-user/host/x86_64/host-signal.h
> index 883d2fcf65..c71d597eb2 100644
> --- a/linux-user/host/x86_64/host-signal.h
> +++ b/linux-user/host/x86_64/host-signal.h
> @@ -15,6 +15,11 @@ static inline uintptr_t host_signal_pc(ucontext_t *uc)
> return uc->uc_mcontext.gregs[REG_RIP];
> }
>
> +static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
> +{
> + uc->uc_mcontext.gregs[REG_RIP] = pc;
> +}
> +
> static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
> {
> return uc->uc_mcontext.gregs[REG_TRAPNO] == 0xe
> --
> 2.25.1
>
>
