ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a context definition for OpenBSD amd64.

This commit is contained in:
Anthony J. Bentley 2016-07-17 19:03:47 -06:00
parent 6e6b113a7e
commit b0f4a2b959
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Core/MachineContext.h
View File

@ -116,6 +116,30 @@ typedef mcontext_t SContext;
#else #else
#error No context definition for architecture #error No context definition for architecture
#endif #endif
#elif defined(__OpenBSD__)
#include <signal.h>
typedef ucontext_t SContext;
#if _M_X86_64
#define CTX_RAX sc_rax
#define CTX_RBX sc_rbx
#define CTX_RCX sc_rcx
#define CTX_RDX sc_rdx
#define CTX_RDI sc_rdi
#define CTX_RSI sc_rsi
#define CTX_RBP sc_rbp
#define CTX_RSP sc_rsp
#define CTX_R8 sc_r8
#define CTX_R9 sc_r9
#define CTX_R10 sc_r10
#define CTX_R11 sc_r11
#define CTX_R12 sc_r12
#define CTX_R13 sc_r13
#define CTX_R14 sc_r14
#define CTX_R15 sc_r15
#define CTX_RIP sc_rip
#else
#error No context definition for architecture
#endif
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
#include <ucontext.h> #include <ucontext.h>
typedef mcontext_t SContext; typedef mcontext_t SContext;

6
Source/Core/Core/MemTools.cpp
View File

@ -248,8 +248,12 @@ static void sigsegv_handler(int sig, siginfo_t* info, void* raw_context)
} }
uintptr_t bad_address = (uintptr_t)info->si_addr; uintptr_t bad_address = (uintptr_t)info->si_addr;
// Get all the information we can out of the context. // Get all the information we can out of the context.
#ifdef __OpenBSD__
ucontext_t* ctx = context;
#else
mcontext_t* ctx = &context->uc_mcontext; mcontext_t* ctx = &context->uc_mcontext;
#endif
// assume it's not a write // assume it's not a write
if (!JitInterface::HandleFault(bad_address, if (!JitInterface::HandleFault(bad_address,
#ifdef __APPLE__ #ifdef __APPLE__