[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/24] user-exec: Remove unused code for OSX hosts
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 08/24] user-exec: Remove unused code for OSX hosts |
Date: |
Fri, 24 Jun 2016 12:53:03 +0300 |
From: Peter Maydell <address@hidden>
Since we dropped darwin-user support many years ago, the code in
user-exec to support hosts which define __APPLE__ is unused; delete it.
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
user-exec.c | 47 +----------------------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/user-exec.c b/user-exec.c
index 1e2449e..95f9f97 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -117,14 +117,7 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned
long address,
#if defined(__i386__)
-#if defined(__APPLE__)
-#include <sys/ucontext.h>
-
-#define EIP_sig(context) (*((unsigned long *)&(context)->uc_mcontext->ss.eip))
-#define TRAP_sig(context) ((context)->uc_mcontext->es.trapno)
-#define ERROR_sig(context) ((context)->uc_mcontext->es.err)
-#define MASK_sig(context) ((context)->uc_sigmask)
-#elif defined(__NetBSD__)
+#if defined(__NetBSD__)
#include <ucontext.h>
#define EIP_sig(context) ((context)->uc_mcontext.__gregs[_REG_EIP])
@@ -274,44 +267,6 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#define TRAP_sig(context) ((context)->uc_mcontext.mc_exc)
#endif /* __FreeBSD__|| __FreeBSD_kernel__ */
-#ifdef __APPLE__
-#include <sys/ucontext.h>
-typedef struct ucontext SIGCONTEXT;
-/* All Registers access - only for local access */
-#define REG_sig(reg_name, context) \
- ((context)->uc_mcontext->ss.reg_name)
-#define FLOATREG_sig(reg_name, context) \
- ((context)->uc_mcontext->fs.reg_name)
-#define EXCEPREG_sig(reg_name, context) \
- ((context)->uc_mcontext->es.reg_name)
-#define VECREG_sig(reg_name, context) \
- ((context)->uc_mcontext->vs.reg_name)
-/* Gpr Registers access */
-#define GPR_sig(reg_num, context) REG_sig(r##reg_num, context)
-/* Program counter */
-#define IAR_sig(context) REG_sig(srr0, context)
-/* Machine State Register (Supervisor) */
-#define MSR_sig(context) REG_sig(srr1, context)
-#define CTR_sig(context) REG_sig(ctr, context)
-/* Link register */
-#define XER_sig(context) REG_sig(xer, context)
-/* User's integer exception register */
-#define LR_sig(context) REG_sig(lr, context)
-/* Condition register */
-#define CR_sig(context) REG_sig(cr, context)
-/* Float Registers access */
-#define FLOAT_sig(reg_num, context) \
- FLOATREG_sig(fpregs[reg_num], context)
-#define FPSCR_sig(context) \
- ((double)FLOATREG_sig(fpscr, context))
-/* Exception Registers access */
-/* Fault registers for coredump */
-#define DAR_sig(context) EXCEPREG_sig(dar, context)
-#define DSISR_sig(context) EXCEPREG_sig(dsisr, context)
-/* number of powerpc exception taken */
-#define TRAP_sig(context) EXCEPREG_sig(exception, context)
-#endif /* __APPLE__ */
-
int cpu_signal_handler(int host_signum, void *pinfo,
void *puc)
{
--
2.1.4
- [Qemu-devel] [PULL 00/24] linux-user changes, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 04/24] linux-user: Don't use sigfillset() on uc->uc_sigmask, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 05/24] configure: Don't override ARCH=unknown if enabling TCI, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 02/24] linux-user: Use __get_user() and __put_user() to handle structs in do_fcntl(), riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 01/24] linux-user: Avoid possible misalignment in host_to_target_siginfo(), riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 06/24] configure: Don't allow user-only targets for unknown CPU architectures, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 03/24] linux-user: Use safe_syscall wrapper for fcntl, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 08/24] user-exec: Remove unused code for OSX hosts,
riku . voipio <=
- [Qemu-devel] [PULL 07/24] user-exec: Delete now-unused hppa and m68k cpu_signal_handler() code, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 09/24] linux-user: Create a hostdep.h for each host architecture, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 11/24] linux-user: Support F_GETPIPE_SZ and F_SETPIPE_SZ fcntls, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 10/24] linux-user: Fix wrong type used for argument to rt_sigqueueinfo, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 13/24] linux-user: add socket() strace, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 14/24] linux-user: fix clone() strace, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 15/24] linux-user: update get_thread_area/set_thread_area strace, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 19/24] linux-user: fix x86_64 safe_syscall, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 12/24] linux-user: add socketcall() strace, riku . voipio, 2016/06/24
- [Qemu-devel] [PULL 17/24] linux-user: fd_trans_host_to_target_data() must process only received data, riku . voipio, 2016/06/24