Skip to contentSkip to conversation

ppc64: Avoid pt_regs struct definition

PATCH In review Khem Raj 4 participants 4 messages Mar 15, 2022 – Mar 17, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v4 1/1 ppc64: Avoid pt_regs struct definition

Remove pt_regs indirection and instead reference gp_regs directly, this makes it portable across musl/glibc

Use PT_* constants defined in asm/ptrace.h

Move the file to ppc64 subdir and leave ppc empty

Fixes
../qemu-6.2.0/linux-user/host/ppc64/../ppc/host-signal.h:16:32: error: incomplete definition of type 'struct pt_regs'

    return uc->uc_mcontext.regs->nip;
           ~~~~~~~~~~~~~~~~~~~~^
Cc Peter Maydell <[email protected]>
Cc Philippe Mathieu-Daudé <[email protected]>
Cc Richard Henderson <[email protected]>

---
v2: Drop ifdef __powerpc__
v3: Access go_regs directly and move the file to ppc64 dir
v4: Use PT_* constants defined in asm/ptrace.h

 linux-user/include/host/ppc/host-signal.h   | 38 -------------------
 linux-user/include/host/ppc64/host-signal.h | 42 ++++++++++++++++++++-
 2 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 linux-user/include/host/ppc/host-signal.h
linux-user/include/host/ppc/host-signal.h deleted +0 -38
deleted file mode 100644
index b80384d135..0000000000
@@ -1,38 +0,0 @@
-/*
- * host-signal.h: signal info dependent on the host architecture
- *
- * Copyright (c) 2003-2005 Fabrice Bellard
- * Copyright (c) 2021 Linaro Limited
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#ifndef PPC_HOST_SIGNAL_H
-#define PPC_HOST_SIGNAL_H
-
-/* The third argument to a SA_SIGINFO handler is ucontext_t. */
-typedef ucontext_t host_sigcontext;
-
-static inline uintptr_t host_signal_pc(host_sigcontext *uc)
-{
-    return uc->uc_mcontext.regs->nip;
-}
-
-static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc)
-{
-    uc->uc_mcontext.regs->nip = pc;
-}
-
-static inline void *host_signal_mask(host_sigcontext *uc)
-{
-    return &uc->uc_sigmask;
-}
-
-static inline bool host_signal_write(siginfo_t *info, host_sigcontext *uc)
-{
-    return uc->uc_mcontext.regs->trap != 0x400
-        && (uc->uc_mcontext.regs->dsisr & 0x02000000);
-}
-
-#endif
linux-user/include/host/ppc64/host-signal.h +41 -1

42 lines not on this page · raw message

Signature · 1 line
2.35.1
Reviewed-by on v4 1/1
#1 lore raw
Quoted 21 lines · Khem Raj

Remove pt_regs indirection and instead reference gp_regs directly, this makes it portable across musl/glibc

Use PT_* constants defined in asm/ptrace.h

Move the file to ppc64 subdir and leave ppc empty

Fixes
../qemu-6.2.0/linux-user/host/ppc64/../ppc/host-signal.h:16:32: error: incomplete definition of type 'struct pt_regs'

     return uc->uc_mcontext.regs->nip;
            ~~~~~~~~~~~~~~~~~~~~^
Cc Peter Maydell<[email protected]>
Cc Philippe Mathieu-Daudé<[email protected]>
Cc Richard Henderson<[email protected]>

---
v2: Drop ifdef __powerpc__
v3: Access go_regs directly and move the file to ppc64 dir
v4: Use PT_* constants defined in asm/ptrace.h

Quoted 4 lines
  linux-user/include/host/ppc/host-signal.h   | 38 -------------------
  linux-user/include/host/ppc64/host-signal.h | 42 ++++++++++++++++++++-
  2 files changed, 41 insertions(+), 39 deletions(-)

delete mode 100644 linux-user/include/host/ppc/host-signal.h

Thanks for your patience.

r~

#2 lore raw
Quoted 23 lines · Richard Henderson
Quoted 21 lines · Khem Raj

Remove pt_regs indirection and instead reference gp_regs directly, this makes it portable across musl/glibc

Use PT_* constants defined in asm/ptrace.h

Move the file to ppc64 subdir and leave ppc empty

Fixes
../qemu-6.2.0/linux-user/host/ppc64/../ppc/host-signal.h:16:32: error: incomplete definition of type 'struct pt_regs'

     return uc->uc_mcontext.regs->nip;
            ~~~~~~~~~~~~~~~~~~~~^
Cc Peter Maydell<[email protected]>
Cc Philippe Mathieu-Daudé<[email protected]>
Cc Richard Henderson<[email protected]>

---
v2: Drop ifdef __powerpc__
v3: Access go_regs directly and move the file to ppc64 dir
v4: Use PT_* constants defined in asm/ptrace.h

Quoted 6 lines
Quoted 4 lines
  linux-user/include/host/ppc/host-signal.h   | 38 -------------------
  linux-user/include/host/ppc64/host-signal.h | 42 ++++++++++++++++++++-
  2 files changed, 41 insertions(+), 39 deletions(-)

delete mode 100644 linux-user/include/host/ppc/host-signal.h

I did a compile-check and confirmed that this builds OK on glibc headers too.

-- PMM

#3 lore raw

Laurent,

Quoted 30 lines · Peter Maydell
Quoted 28 lines · Richard Henderson
Quoted 25 lines · Khem Raj

Remove pt_regs indirection and instead reference gp_regs directly, this makes it portable across musl/glibc

Use PT_* constants defined in asm/ptrace.h

Move the file to ppc64 subdir and leave ppc empty

Fixes
../qemu-6.2.0/linux-user/host/ppc64/../ppc/host-signal.h:16:32: error: incomplete definition of type 'struct pt_regs'

      return uc->uc_mcontext.regs->nip;
             ~~~~~~~~~~~~~~~~~~~~^
Cc Peter Maydell<[email protected]>
Cc Philippe Mathieu-Daudé<[email protected]>
Cc Richard Henderson<[email protected]>

---
v2: Drop ifdef __powerpc__
v3: Access go_regs directly and move the file to ppc64 dir
v4: Use PT_* constants defined in asm/ptrace.h

   linux-user/include/host/ppc/host-signal.h   | 38 -------------------
   linux-user/include/host/ppc64/host-signal.h | 42 ++++++++++++++++++++-
   2 files changed, 41 insertions(+), 39 deletions(-)

delete mode 100644 linux-user/include/host/ppc/host-signal.h

Quoted 4 lines
Quoted 1 line

I did a compile-check and confirmed that this builds OK on glibc headers too.

I can queue this patch for 7.0. I have a few already.

C.