openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

BSD user: add support for OpenBSD/amd64 host 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7066 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2009-04-10 13:00:29 +00:00
parent d39bb24a0a
commit d397abbdbe
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cpu-exec.c
View File

@ -1207,14 +1207,20 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#elif defined(__x86_64__) #elif defined(__x86_64__)
#ifdef __NetBSD__ #ifdef __NetBSD__
#define REG_ERR _REG_ERR #define PC_sig(context) _UC_MACHINE_PC(context)
#define REG_TRAPNO _REG_TRAPNO #define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR])
#define QEMU_UC_MCONTEXT_GREGS(uc, reg) (uc)->uc_mcontext.__gregs[(reg)] #define MASK_sig(context) ((context)->uc_sigmask)
#define QEMU_UC_MACHINE_PC(uc) _UC_MACHINE_PC(uc) #elif defined(__OpenBSD__)
#define PC_sig(context) ((context)->sc_rip)
#define TRAP_sig(context) ((context)->sc_trapno)
#define ERROR_sig(context) ((context)->sc_err)
#define MASK_sig(context) ((context)->sc_mask)
#else #else
#define QEMU_UC_MCONTEXT_GREGS(uc, reg) (uc)->uc_mcontext.gregs[(reg)] #define PC_sig(context) ((context)->uc_mcontext.gregs[REG_RIP])
#define QEMU_UC_MACHINE_PC(uc) QEMU_UC_MCONTEXT_GREGS(uc, REG_RIP) #define TRAP_sig(context) ((context)->uc_mcontext.gregs[REG_TRAPNO])
#define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR])
#define MASK_sig(context) ((context)->uc_sigmask)
#endif #endif
int cpu_signal_handler(int host_signum, void *pinfo, int cpu_signal_handler(int host_signum, void *pinfo,
@ -1224,15 +1230,17 @@ int cpu_signal_handler(int host_signum, void *pinfo,
unsigned long pc; unsigned long pc;
#ifdef __NetBSD__ #ifdef __NetBSD__
ucontext_t *uc = puc; ucontext_t *uc = puc;
#elif defined(__OpenBSD__)
struct sigcontext *uc = puc;
#else #else
struct ucontext *uc = puc; struct ucontext *uc = puc;
#endif #endif
pc = QEMU_UC_MACHINE_PC(uc); pc = PC_sig(uc);
return handle_cpu_signal(pc, (unsigned long)info->si_addr, return handle_cpu_signal(pc, (unsigned long)info->si_addr,
QEMU_UC_MCONTEXT_GREGS(uc, REG_TRAPNO) == 0xe ? TRAP_sig(uc) == 0xe ?
(QEMU_UC_MCONTEXT_GREGS(uc, REG_ERR) >> 1) & 1 : 0, (ERROR_sig(uc) >> 1) & 1 : 0,
&uc->uc_sigmask, puc); &MASK_sig(uc), puc);
} }
#elif defined(_ARCH_PPC) #elif defined(_ARCH_PPC)