Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed JIT crashing on some kernel config options (like FC2 >= 2.6.6)

Browse Source
This commit is contained in:
David Anderson 2004-10-29 20:34:58 +00:00
parent 47d1881c29
commit 826893d8d2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
amxmodx/amx.cpp
View File

@ -60,6 +60,9 @@
#include <windows.h> #include <windows.h>
#endif #endif
extern int errno;
int errno;
// this file does not include amxmodx.h, so we have to include the memory manager here // this file does not include amxmodx.h, so we have to include the memory manager here
#ifdef MEMORY_TEST #ifdef MEMORY_TEST
#include "mmgr/mmgr.h" #include "mmgr/mmgr.h"
@ -1114,12 +1117,18 @@ int AMXAPI amx_Init(AMX *amx,void *program)
#if defined __BORLANDC__ || defined __WATCOMC__ #if defined __BORLANDC__ || defined __WATCOMC__
#pragma argsused #pragma argsused
#endif #endif
int memoryFullAccess( void* addr, int len ) { return 1; } int memoryFullAccess( void* addr, int len )
{
return mprotect(addr, len, PROT_READ|PROT_WRITE|PROT_EXEC);
}
#if defined __BORLANDC__ || defined __WATCOMC__ #if defined __BORLANDC__ || defined __WATCOMC__
#pragma argsused #pragma argsused
#endif #endif
int memorySetAccess( void* addr, int len, int access ) { return 1; } int memorySetAccess( void* addr, int len, int access )
{
return mprotect(addr, len, PROT_READ|PROT_EXEC);
}
#endif /* #if defined __WIN32 __ */ #endif /* #if defined __WIN32 __ */
@ -1128,8 +1137,12 @@ int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code)
int mac, res; int mac, res;
AMX_HEADER *hdr; AMX_HEADER *hdr;
mac = memoryFullAccess( (void*)asm_runJIT, 20000 ); mac = memoryFullAccess( (void *)((int)((void*)asm_runJIT)-(int)((void*)asm_runJIT)%sysconf(_SC_PAGESIZE)), 20000 );
if ( ! mac ) #ifdef __linux__
if ( mac )
#else
if ( !mac )
#endif
return AMX_ERR_INIT_JIT; return AMX_ERR_INIT_JIT;
/* copy the prefix */ /* copy the prefix */
@ -3408,7 +3421,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
if (alt==0) if (alt==0)
ABORT(amx,AMX_ERR_DIVIDE); ABORT(amx,AMX_ERR_DIVIDE);
/* divide must always round down; this is a bit /* divide must always round down; this is a bit
* involved to do in a machine-independent way.
*/ */
offs=(pri % alt + alt) % alt; /* true modulus */ offs=(pri % alt + alt) % alt; /* true modulus */
pri=(pri - offs) / alt; /* division result */ pri=(pri - offs) / alt; /* division result */