core/sourcehook/sh_memory.h
changeset 684 8015336442cb
parent 633 153e2d943cc3
child 733 2365240861a2
     1.1 --- a/core/sourcehook/sh_memory.h	Sun Nov 22 23:54:55 2009 -0600
     1.2 +++ b/core/sourcehook/sh_memory.h	Tue Nov 24 07:19:57 2009 -0600
     1.3 @@ -16,12 +16,12 @@
     1.4  //  Unprotect now sets to readwrite
     1.5  //  The vtable doesn't need to be executable anyway
     1.6  
     1.7 -# if	/********/ defined _WIN32
     1.8 +# if SH_XP == SH_XP_WINAPI
     1.9  #		include <windows.h>
    1.10  #		define SH_MEM_READ 1
    1.11  #		define SH_MEM_WRITE 2
    1.12  #		define SH_MEM_EXEC 4
    1.13 -# elif /******/ defined __linux__
    1.14 +# elif SH_XP == SH_XP_POSIX
    1.15  #		include <sys/mman.h>
    1.16  #		include <stdio.h>
    1.17  #		include <signal.h>
    1.18 @@ -50,9 +50,9 @@
    1.19  {
    1.20  	inline bool SetMemAccess(void *addr, size_t len, int access)
    1.21  	{
    1.22 -# ifdef __linux__
    1.23 +# if SH_XP == SH_XP_POSIX
    1.24  		return mprotect(SH_LALIGN(addr), len + SH_LALDIF(addr), access)==0 ? true : false;
    1.25 -# else
    1.26 +# elif SH_XP == SH_XP_WINAPI
    1.27  		DWORD tmp;
    1.28  		DWORD prot;
    1.29  		switch (access)
    1.30 @@ -71,17 +71,25 @@
    1.31  # endif
    1.32  	}
    1.33  
    1.34 -#ifdef __linux__
    1.35 +#if SH_XP == SH_XP_POSIX
    1.36  	namespace
    1.37  	{
    1.38  		bool g_BadReadCalled;
    1.39  		jmp_buf g_BadReadJmpBuf;
    1.40  
    1.41 +# if SH_SYS == SH_SYS_LINUX
    1.42  		static void BadReadHandler(int sig)
    1.43  		{
    1.44  			if (g_BadReadCalled)
    1.45  				longjmp(g_BadReadJmpBuf, 1);
    1.46  		}
    1.47 +# elif SH_SYS == SH_SYS_APPLE
    1.48 +		static void BadReadHandler(int signal, siginfo_t* my_siginfo, void* my_context)	
    1.49 +		{
    1.50 +			if (g_BadReadCalled)
    1.51 +				longjmp(g_BadReadJmpBuf, 1);
    1.52 +		}
    1.53 +# endif
    1.54  	}
    1.55  #endif
    1.56  
    1.57 @@ -95,7 +103,7 @@
    1.58  	{
    1.59  		bool ModuleInMemory(char *addr, size_t len)
    1.60  		{
    1.61 -#ifdef __linux__
    1.62 +#if SH_SYS == SH_SYS_LINUX
    1.63  			// On linux, first check /proc/self/maps
    1.64  			long lower = reinterpret_cast<long>(addr);
    1.65  			long upper = lower + len;
    1.66 @@ -177,7 +185,31 @@
    1.67  			signal(SIGSEGV, prevHandler);
    1.68  
    1.69  			return false;
    1.70 -#else
    1.71 +#elif SH_SYS == SH_SYS_APPLE
    1.72 +			struct sigaction sa, osa;
    1.73 +			sa.sa_sigaction = BadReadHandler;
    1.74 +			sa.sa_flags = SA_SIGINFO | SA_RESTART;
    1.75 +
    1.76 +			g_BadReadCalled = true;
    1.77 +
    1.78 +			if (setjmp(g_BadReadJmpBuf))
    1.79 +				return false;
    1.80 +
    1.81 +			if (sigaction(SIGBUS, &sa, &osa) == -1)
    1.82 +				return false;
    1.83 +
    1.84 +			volatile const char *p = reinterpret_cast<const char *>(addr);
    1.85 +			char dummy;
    1.86 +
    1.87 +			for (size_t i = 0; i < len; i++)
    1.88 +				dummy = p[i];
    1.89 +
    1.90 +			g_BadReadCalled = false;
    1.91 +
    1.92 +			sigaction(SIGBUS, &osa, NULL);
    1.93 +
    1.94 +			return true;
    1.95 +#elif SH_XP == SH_XP_WINAPI
    1.96  			// On Win32, simply use IsBadReadPtr
    1.97  			return !IsBadReadPtr(addr, len);
    1.98  #endif