summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-03-04 19:04:50 +0000
committerTim Angus <tim@ngus.net>2006-03-04 19:04:50 +0000
commit5da3420e72083d142352529acc11e1518ff153ba (patch)
tree7a8449dbe9989eebec47673e1c714e2f9cd4238a /src
parent509b49968e696c7d01ebfe47eeef13acad8b6a32 (diff)
* Merged ioq3-r620
- NX stuff
Diffstat (limited to 'src')
-rw-r--r--src/qcommon/vm.c3
-rw-r--r--src/qcommon/vm_x86.c48
-rw-r--r--src/qcommon/vm_x86_64.c48
3 files changed, 49 insertions, 50 deletions
diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c
index 27f30f09..0235ffea 100644
--- a/src/qcommon/vm.c
+++ b/src/qcommon/vm.c
@@ -616,6 +616,9 @@ VM_Free
*/
void VM_Free( vm_t *vm ) {
+ if(vm->destroy)
+ vm->destroy(vm);
+
if ( vm->dllHandle ) {
Sys_UnloadDll( vm->dllHandle );
Com_Memset( vm, 0, sizeof( *vm ) );
diff --git a/src/qcommon/vm_x86.c b/src/qcommon/vm_x86.c
index 348cd01e..2115cf50 100644
--- a/src/qcommon/vm_x86.c
+++ b/src/qcommon/vm_x86.c
@@ -32,6 +32,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <sys/mman.h> // for PROT_ stuff
#endif
+/* need this on NX enabled systems (i386 with PAE kernel or
+ * noexec32=on x86_64) */
+#ifdef __linux__
+#define VM_X86_MMAP
+#endif
+
+static void VM_Destroy_Compiled(vm_t* self);
+
/*
eax scratch
@@ -1070,34 +1078,40 @@ void VM_Compile( vm_t *vm, vmHeader_t *header ) {
// copy to an exact size buffer on the hunk
vm->codeLength = compiledOfs;
- vm->codeBase = Hunk_Alloc( compiledOfs, h_low );
+#ifdef VM_X86_MMAP
+ vm->codeBase = mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
+ if(vm->codeBase == (void*)-1)
+ Com_Error(ERR_DROP, "VM_CompileX86: can't mmap memory");
+#else
+ vm->codeBase = malloc(compiledOfs);
+#endif
+
Com_Memcpy( vm->codeBase, buf, compiledOfs );
+
+#ifdef VM_X86_MMAP
+ if(mprotect(vm->codeBase, compiledOfs, PROT_READ|PROT_EXEC))
+ Com_Error(ERR_DROP, "VM_CompileX86: mprotect failed");
+#endif
+
Z_Free( buf );
Z_Free( jused );
Com_Printf( "VM file %s compiled to %i bytes of code\n", vm->name, compiledOfs );
+ vm->destroy = VM_Destroy_Compiled;
+
// offset all the instruction pointers for the new location
for ( i = 0 ; i < header->instructionCount ; i++ ) {
vm->instructionPointers[i] += (int)vm->codeBase;
}
+}
-#if 0 // ndef _WIN32
- // Must make the newly generated code executable
- {
- int r;
- unsigned long addr;
- int psize = getpagesize();
-
- addr = ((int)vm->codeBase & ~(psize-1)) - psize;
-
- r = mprotect((char*)addr, vm->codeLength + (int)vm->codeBase - addr + psize,
- PROT_READ | PROT_WRITE | PROT_EXEC );
-
- if (r < 0)
- Com_Error( ERR_FATAL, "mprotect failed to change PROT_EXEC" );
- }
+void VM_Destroy_Compiled(vm_t* self)
+{
+#ifdef VM_X86_MMAP
+ munmap(self->codeBase, self->codeLength);
+#else
+ free(self->codeBase);
#endif
-
}
/*
diff --git a/src/qcommon/vm_x86_64.c b/src/qcommon/vm_x86_64.c
index 23f87c30..822c3e1d 100644
--- a/src/qcommon/vm_x86_64.c
+++ b/src/qcommon/vm_x86_64.c
@@ -40,6 +40,8 @@ static FILE* qdasmout;
#define Dfprintf(args...)
#endif
+static void VM_Destroy_Compiled(vm_t* self);
+
/*
eax scratch
@@ -309,10 +311,8 @@ out:
static int doas(char* in, char* out, unsigned char** compiledcode)
{
- char* buf;
- char* mem;
- size_t size = -1, allocsize;
- int ps;
+ unsigned char* mem;
+ size_t size = -1;
pid_t pid;
Com_Printf("running assembler < %s > %s\n", in, out);
@@ -359,42 +359,16 @@ static int doas(char* in, char* out, unsigned char** compiledcode)
Com_Printf("done\n");
- mem = mmapfile(out, &size);
+ mem = (unsigned char*)mmapfile(out, &size);
if(!mem)
{
Com_Printf(S_COLOR_RED "can't mmap object file %s: %s\n", out, strerror(errno));
return -1;
}
- ps = sysconf(_SC_PAGE_SIZE);
- if(ps == -1)
- {
- Com_Printf(S_COLOR_RED "can't determine page size: %s\n", strerror(errno));
- return -1;
- }
-
- --ps;
+ *compiledcode = mem;
- allocsize = (size+ps)&~ps;
- buf = Hunk_Alloc(allocsize, h_high);
-
- buf = (void*)(((unsigned long)buf+ps)&~ps);
-
- memcpy(buf, mem, size);
-
- munmap(mem, 0);
-
- if((*compiledcode = (unsigned char*)buf))
- {
- // need to be able to exec code
- if(mprotect(buf, allocsize, PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
- {
- Com_Error(ERR_FATAL, "mprotect failed on %p+%x: %s\n", buf, allocsize, strerror(errno));
- }
- return size;
- }
-
- return -1;
+ return size;
}
static void block_copy_vm(unsigned dest, unsigned src, unsigned count)
@@ -898,6 +872,8 @@ void VM_Compile( vm_t *vm, vmHeader_t *header ) {
vm->codeBase = compiledcode; // remember to skip ELF header!
vm->codeLength = compiledsize;
+
+ vm->destroy = VM_Destroy_Compiled;
entryPoint = getentrypoint(vm);
@@ -931,6 +907,12 @@ out:
}
}
+
+void VM_Destroy_Compiled(vm_t* self)
+{
+ munmap(self->codeBase, self->codeLength);
+}
+
/*
==============
VM_CallCompiled