Skip to contentSkip to conversation

ppc64: Avoid pt_regs struct definition

PATCH Superseded Khem Raj 2 participants 3 messages Mar 14, 2022 – Mar 15, 2022

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v3 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

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

 linux-user/include/host/ppc/host-signal.h   | 38 --------------------
 linux-user/include/host/ppc64/host-signal.h | 39 ++++++++++++++++++++-
 2 files changed, 38 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 +38 -1
index a353c22a90..b46143c2f0 100644
@@ -1 +1,38 @@
-#include "../ppc/host-signal.h"
+/*
+ * 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.gp_regs[32];
+}
+
+static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc)
+{
+    uc->uc_mcontext.gp_regs[32] = 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.gp_regs[40] != 0x400
+        && (uc->uc_mcontext.gp_regs[42] & 0x02000000);
+}
+
+#endif
Signature · 1 line
2.35.1
#1 lore raw
Quoted 10 lines · Khem Raj
linux-user/include/host/ppc64/host-signal.h +10 -0
+static inline uintptr_t host_signal_pc(host_sigcontext *uc)
+{
+    return uc->uc_mcontext.gp_regs[32];
+}
+
+static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc)
+{
+    uc->uc_mcontext.gp_regs[32] = pc;
+}
+

linux-user/include/host/ppc64/host-signal.h line 36

Quoted 10 lines
linux-user/include/host/ppc64/host-signal.h +10 -0
+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.gp_regs[40] != 0x400
+        && (uc->uc_mcontext.gp_regs[42] & 0x02000000);
+}

Oh, dear.

I didn't realize that the symbolic constants are also in <asm/ptrace.h>. We really don't want magic numbers. We'll have to have the include and use PT_NIP, PT_TRAP, PT_DSISR.

r~

author
#2 lore raw
Quoted 25 lines · Richard Henderson
Quoted 10 lines · Khem Raj
linux-user/include/host/ppc64/host-signal.h +10 -0
+static inline uintptr_t host_signal_pc(host_sigcontext *uc)
+{
+    return uc->uc_mcontext.gp_regs[32];
+}
+
+static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc)
+{
+    uc->uc_mcontext.gp_regs[32] = pc;
+}
+

linux-user/include/host/ppc64/host-signal.h line 36

Quoted 10 lines
linux-user/include/host/ppc64/host-signal.h +10 -0
+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.gp_regs[40] != 0x400
+        && (uc->uc_mcontext.gp_regs[42] & 0x02000000);
+}

Oh, dear.

Quoted 3 lines

I didn't realize that the symbolic constants are also in <asm/ptrace.h>. We really don't want magic numbers. We'll have to have the include and use PT_NIP, PT_TRAP, PT_DSISR.

yeah :) removing asm/ptrace.h sounded lucrative but it does make it cryptic. I will send v4 soon.

Quoted 2 lines

r~