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

linux-common: TARGET_NO_EXCEPTIONS, TARGET_NO_THREADS

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-07-29 00:30:24 +02:00
parent 518c547fb5
commit c8f982b8f5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/linux/common.cpp
View File

@ -27,6 +27,7 @@
#include "hw/sh4/dyna/ngen.h" #include "hw/sh4/dyna/ngen.h"
#if !defined(TARGET_NO_EXCEPTIONS)
bool ngen_Rewrite(unat& addr,unat retadr,unat acc); bool ngen_Rewrite(unat& addr,unat retadr,unat acc);
u32* ngen_readm_fail_v2(u32* ptr,u32* regs,u32 saddr); u32* ngen_readm_fail_v2(u32* ptr,u32* regs,u32 saddr);
bool VramLockedWrite(u8* address); bool VramLockedWrite(u8* address);
@ -96,16 +97,17 @@ void fault_handler (int sn, siginfo_t * si, void *segfault_ctx)
signal(SIGSEGV, SIG_DFL); signal(SIGSEGV, SIG_DFL);
} }
} }
#endif
void install_fault_handler (void) void install_fault_handler (void)
{ {
#if !defined(TARGET_NO_EXCEPTIONS)
struct sigaction act, segv_oact; struct sigaction act, segv_oact;
memset(&act, 0, sizeof(act)); memset(&act, 0, sizeof(act));
act.sa_sigaction = fault_handler; act.sa_sigaction = fault_handler;
sigemptyset(&act.sa_mask); sigemptyset(&act.sa_mask);
act.sa_flags = SA_SIGINFO; act.sa_flags = SA_SIGINFO;
sigaction(SIGSEGV, &act, &segv_oact); sigaction(SIGSEGV, &act, &segv_oact);
#if HOST_OS == OS_DARWIN #if HOST_OS == OS_DARWIN
//this is broken on osx/ios/mach in general //this is broken on osx/ios/mach in general
sigaction(SIGBUS, &act, &segv_oact); sigaction(SIGBUS, &act, &segv_oact);
@ -113,8 +115,10 @@ void install_fault_handler (void)
act.sa_sigaction = sigill_handler; act.sa_sigaction = sigill_handler;
sigaction(SIGILL, &act, &segv_oact); sigaction(SIGILL, &act, &segv_oact);
#endif #endif
#endif
} }
#if !defined(TARGET_NO_THREADS)
//Thread class //Thread class
cThread::cThread(ThreadEntryFP* function,void* prm) cThread::cThread(ThreadEntryFP* function,void* prm)
@ -134,6 +138,7 @@ void cThread::WaitToEnd()
} }
//End thread class //End thread class
#endif
//cResetEvent Calss //cResetEvent Calss
cResetEvent::cResetEvent(bool State,bool Auto) cResetEvent::cResetEvent(bool State,bool Auto)
@ -276,7 +281,7 @@ void enable_runfast()
} }
void linux_fix_personality() { void linux_fix_personality() {
#if !defined(_ANDROID) && !TARGET_OS_IPHONE #if HOST_OS == OS_LINUX && !defined(_ANDROID)
printf("Personality: %08X\n", personality(0xFFFFFFFF)); printf("Personality: %08X\n", personality(0xFFFFFFFF));
personality(~READ_IMPLIES_EXEC & personality(0xFFFFFFFF)); personality(~READ_IMPLIES_EXEC & personality(0xFFFFFFFF));
printf("Updated personality: %08X\n", personality(0xFFFFFFFF)); printf("Updated personality: %08X\n", personality(0xFFFFFFFF));

3
core/stdclass.h
View File

@ -163,6 +163,7 @@ public:
//Windoze code //Windoze code
//Threads //Threads
#if !defined(HOST_NO_THREADS)
typedef void* ThreadEntryFP(void* param); typedef void* ThreadEntryFP(void* param);
typedef void* THREADHANDLE; typedef void* THREADHANDLE;
@ -179,7 +180,7 @@ public :
void Start(); void Start();
void WaitToEnd(); void WaitToEnd();
}; };
#endif
//Wait Events //Wait Events
typedef void* EVENTHANDLE; typedef void* EVENTHANDLE;
class cResetEvent class cResetEvent