OSX: Fix previous merge
This commit is contained in:
parent
9942bfc86e
commit
46c0d545ec
|
@ -292,7 +292,7 @@ void enable_runfast()
|
|||
}
|
||||
|
||||
void linux_fix_personality() {
|
||||
#if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_OS_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN)
|
||||
#if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && HOST_OS != OS_DARWIN
|
||||
printf("Personality: %08X\n", personality(0xFFFFFFFF));
|
||||
personality(~READ_IMPLIES_EXEC & personality(0xFFFFFFFF));
|
||||
printf("Updated personality: %08X\n", personality(0xFFFFFFFF));
|
||||
|
|
|
@ -77,8 +77,10 @@ void context_segfault(rei_host_context_t* reictx, void* segfault_ctx, bool to_se
|
|||
bicopy(reictx->pc, MCTX(.__gregs[_REG_RIP]), to_segfault);
|
||||
#elif HOST_OS == OS_LINUX
|
||||
bicopy(reictx->pc, MCTX(.gregs[REG_RIP]), to_segfault);
|
||||
#else
|
||||
#error HOST_OS
|
||||
#elif HOST_OS == OS_DARWIN
|
||||
bicopy(reictx->pc, MCTX(->__ss.__rip), to_segfault);
|
||||
#else
|
||||
#error HOST_OS
|
||||
#endif
|
||||
#elif HOST_CPU == CPU_MIPS
|
||||
bicopy(reictx->pc, MCTX(.pc), to_segfault);
|
||||
|
|
|
@ -81,11 +81,6 @@ class EmuGLView: NSOpenGLView, NSWindowDelegate {
|
|||
self.window!.delegate = self
|
||||
}
|
||||
|
||||
override func viewDidMoveToWindow() {
|
||||
super.viewDidMoveToWindow()
|
||||
self.window!.delegate = self
|
||||
}
|
||||
|
||||
func windowWillClose(_ notification: Notification) {
|
||||
emu_dc_stop()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue