[PATCH 87/89] linux-user/openrisc: Move target_pt_regs to signal.c

Richard Henderson posted 89 patches 3 months, 2 weeks ago
Maintainers: Riku Voipio <riku.voipio@iki.fi>, Laurent Vivier <laurent@vivier.eu>, Brian Cain <brian.cain@oss.qualcomm.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
There is a newer version of this series
[PATCH 87/89] linux-user/openrisc: Move target_pt_regs to signal.c
Posted by Richard Henderson 3 months, 2 weeks ago
This structure is part of the openrisc signal frame.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/openrisc/target_syscall.h | 11 -----------
 linux-user/openrisc/signal.c         | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/openrisc/target_syscall.h
index 7fe5b73d3b..c8394e9dcd 100644
--- a/linux-user/openrisc/target_syscall.h
+++ b/linux-user/openrisc/target_syscall.h
@@ -1,17 +1,6 @@
 #ifndef OPENRISC_TARGET_SYSCALL_H
 #define OPENRISC_TARGET_SYSCALL_H
 
-/* Note that in linux/arch/openrisc/include/uapi/asm/ptrace.h,
- * this is called user_regs_struct.  Given that this is what
- * is used within struct sigcontext we need this definition.
- * However, elfload.c wants this name.
- */
-struct target_pt_regs {
-    abi_ulong gpr[32];
-    abi_ulong pc;
-    abi_ulong sr;
-};
-
 #define UNAME_MACHINE "openrisc"
 #define UNAME_MINIMUM_RELEASE "2.6.32"
 
diff --git a/linux-user/openrisc/signal.c b/linux-user/openrisc/signal.c
index cb74a9fe5e..9242d06002 100644
--- a/linux-user/openrisc/signal.c
+++ b/linux-user/openrisc/signal.c
@@ -22,6 +22,18 @@
 #include "signal-common.h"
 #include "linux-user/trace.h"
 
+/*
+ * Note that in linux/arch/openrisc/include/uapi/asm/ptrace.h,
+ * this is called user_regs_struct.  Given that this is what
+ * is used within struct sigcontext we need this definition.
+ * However, elfload.c wants this name.
+ */
+struct target_pt_regs {
+    abi_ulong gpr[32];
+    abi_ulong pc;
+    abi_ulong sr;
+};
+
 typedef struct target_sigcontext {
     struct target_pt_regs regs;
     abi_ulong oldmask;
-- 
2.43.0
Re: [PATCH 87/89] linux-user/openrisc: Move target_pt_regs to signal.c
Posted by Peter Maydell 3 months, 2 weeks ago
On Wed, 30 Jul 2025 at 01:38, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> This structure is part of the openrisc signal frame.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/openrisc/target_syscall.h | 11 -----------
>  linux-user/openrisc/signal.c         | 12 ++++++++++++
>  2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/openrisc/target_syscall.h
> index 7fe5b73d3b..c8394e9dcd 100644
> --- a/linux-user/openrisc/target_syscall.h
> +++ b/linux-user/openrisc/target_syscall.h
> @@ -1,17 +1,6 @@
>  #ifndef OPENRISC_TARGET_SYSCALL_H
>  #define OPENRISC_TARGET_SYSCALL_H
>
> -/* Note that in linux/arch/openrisc/include/uapi/asm/ptrace.h,
> - * this is called user_regs_struct.  Given that this is what
> - * is used within struct sigcontext we need this definition.
> - * However, elfload.c wants this name.
> - */
> -struct target_pt_regs {
> -    abi_ulong gpr[32];
> -    abi_ulong pc;
> -    abi_ulong sr;
> -};
> -
>  #define UNAME_MACHINE "openrisc"
>  #define UNAME_MINIMUM_RELEASE "2.6.32"
>
> diff --git a/linux-user/openrisc/signal.c b/linux-user/openrisc/signal.c
> index cb74a9fe5e..9242d06002 100644
> --- a/linux-user/openrisc/signal.c
> +++ b/linux-user/openrisc/signal.c
> @@ -22,6 +22,18 @@
>  #include "signal-common.h"
>  #include "linux-user/trace.h"
>
> +/*
> + * Note that in linux/arch/openrisc/include/uapi/asm/ptrace.h,
> + * this is called user_regs_struct.  Given that this is what
> + * is used within struct sigcontext we need this definition.
> + * However, elfload.c wants this name.

Is this bit about elfload.c still relevant? (Presumably not as
it won't be able to see the definition now we've moved it.)

> + */
> +struct target_pt_regs {
> +    abi_ulong gpr[32];
> +    abi_ulong pc;
> +    abi_ulong sr;
> +};
> +
>  typedef struct target_sigcontext {
>      struct target_pt_regs regs;
>      abi_ulong oldmask;

Otherwise
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM