jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qemu: replace ppc64 musl patches with a generalized ppc32/64 one

Browse source 
[ci skip]
This commit is contained in:
q66 2019-07-01 20:15:35 +02:00 committed by Jürgen Buchmüller
parent d2dbb22f1d
commit c09bf59505
3 changed files with 60 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
srcpkgs/qemu/patches/musl-ppc.patch Normal file
View file

@ -0,0 +1,60 @@
--- accel/tcg/user-exec.c
+++ accel/tcg/user-exec.c
@@ -286,6 +286,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
*/
#ifdef linux
/* All Registers access - only for local access */
+#if defined(__GLIBC__)
#define REG_sig(reg_name, context) \
((context)->uc_mcontext.regs->reg_name)
/* Gpr Registers access */
@@ -302,6 +303,19 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#define LR_sig(context) REG_sig(link, context)
/* Condition register */
#define CR_sig(context) REG_sig(ccr, context)
+#else /* musl */
+#if defined(_ARCH_PPC64)
+#define REG_sig(reg_num, context) ((context)->uc_mcontext.gp_regs[reg_num])
+#else
+#define REG_sig(reg_num, context) ((context)->uc_mcontext.gregs[reg_num])
+#endif
+#define IAR_sig(context) REG_sig(32, context)
+#define MSR_sig(context) REG_sig(33, context)
+#define CTR_sig(context) REG_sig(35, context)
+#define XER_sig(context) REG_sig(37, context)
+#define LR_sig(context) REG_sig(36, context)
+#define CR_sig(context) REG_sig(38, context)
+#endif
/* Float Registers access */
#define FLOAT_sig(reg_num, context) \
@@ -309,9 +323,15 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#define FPSCR_sig(context) \
(*(int *)((char *)((context)->uc_mcontext.regs + (48 + 32 * 2) * 4)))
/* Exception Registers access */
+#if defined(__GLIBC__)
#define DAR_sig(context) REG_sig(dar, context)
#define DSISR_sig(context) REG_sig(dsisr, context)
#define TRAP_sig(context) REG_sig(trap, context)
+#else /* musl */
+#define DAR_sig(context) REG_sig(41, context)
+#define DSISR_sig(context) REG_sig(42, context)
+#define TRAP_sig(context) REG_sig(40, context)
+#endif
#endif /* linux */
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--- linux-user/host/ppc64/hostdep.h
+++ linux-user/host/ppc64/hostdep.h
@@ -27,7 +27,11 @@ extern char safe_syscall_end[];
static inline void rewind_if_in_safe_syscall(void *puc)
{
ucontext_t *uc = puc;
+#if defined(__GLIBC__)
unsigned long *pcreg = &uc->uc_mcontext.gp_regs[PT_NIP];
+#else /* musl */
+ unsigned long *pcreg = &uc->uc_mcontext.gp_regs[32];
+#endif
if (*pcreg > (uintptr_t)safe_syscall_start
&& *pcreg < (uintptr_t)safe_syscall_end) {

12
srcpkgs/qemu/patches/musl-ppc64-pt_nip.patch
View file

@ -1,12 +0,0 @@
This include is necessary to get PT_NIP on musl.
--- linux-user/host/ppc64/hostdep.h
+++ linux-user/host/ppc64/hostdep.h
@@ -17,6 +17,8 @@
#ifndef __ASSEMBLER__
+#include <asm/ptrace.h>
+
/* These are defined by the safe-syscall.inc.S file */
extern char safe_syscall_start[];
extern char safe_syscall_end[];

16
srcpkgs/qemu/patches/musl-ppc64-pt_regs.patch
View file

@ -1,16 +0,0 @@
On musl, the regs field in uc_mcontext is void * so it is necessary to
cast it. The sys/user.h include is to get access to definition of pt_regs.
--- accel/tcg/user-exec.c
+++ accel/tcg/user-exec.c
@@ -285,9 +285,10 @@ int cpu_signal_handler(int host_signum, void *pinfo,
* From Wine
*/
#ifdef linux
+#include <sys/user.h>
/* All Registers access - only for local access */
#define REG_sig(reg_name, context) \
- ((context)->uc_mcontext.regs->reg_name)
+ (((struct pt_regs *)(context)->uc_mcontext.regs)->reg_name)
/* Gpr Registers access */
#define GPR_sig(reg_num, context) REG_sig(gpr[reg_num], context)
/* Program counter */