[LLVMdev] [llvm-commits] [PATCH][Compiler-rt] Windows implementation of mmap functionality in clear_cache_test and enable_execute_stack_test

[Ruben Van Boxem]

---------- Forwarded message ----------
From: Ruben Van Boxem <vanboxem.ruben at gmail.com>
Date: 2012/1/7
Subject: Re: [llvm-commits] [PATCH][Compiler-rt] Windows implementation of
mmap functionality in clear_cache_test and enable_execute_stack_test
To: Anton Korobeynikov <anton at korobeynikov.info>


2012/1/7 Anton Korobeynikov <anton at korobeynikov.info>

> Hello Ruben
>
> > Please apply at your leisure! Thanks!
> Will you please fix the code to use the same coding style as
> everything else around?
>

I see I missed some curly braces. I also modified spacing a tiny bit. If
you mean anything else, I cannot see what's out of style.

Thanks for the prompt response,

Ruben
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20120107/be5d1002/attachment.html>
-------------- next part --------------
Index: test/Unit/clear_cache_test.c
===================================================================
--- test/Unit/clear_cache_test.c	(revision 147731)
+++ test/Unit/clear_cache_test.c	(working copy)
@@ -11,11 +11,20 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+#if defined(_WIN32)
+#include <windows.h>
+void __clear_cache(void* start, void* end)
+{
+    if( !FlushInstructionCache(GetCurrentProcess(), start, end-start) )
+        exit(1);
+}
+#else
 #include <sys/mman.h>
+extern void __clear_cache(void* start, void* end);
+#endif
 
 
 
-extern void __clear_cache(void* start, void* end);
 
 typedef int (*pfunc)(void);
 
@@ -38,7 +47,15 @@
     // make executable the page containing execution_buffer 
     char* start = (char*)((uintptr_t)execution_buffer & (-4095));
     char* end = (char*)((uintptr_t)(&execution_buffer[128+4096]) & (-4095));
+#if defined(_WIN32)
+    DWORD dummy_oldProt;
+    MEMORY_BASIC_INFORMATION b;
+    if ( !VirtualQuery(start, &b, sizeof(b)) )
+        return 1;
+    if ( !VirtualProtect(b.BaseAddress, b.RegionSize, PAGE_EXECUTE_READWRITE, &b.Protect) )
+#else
     if ( mprotect(start, end-start, PROT_READ|PROT_WRITE|PROT_EXEC) != 0 )
+#endif
         return 1;
 
     // verify you can copy and execute a function
Index: test/Unit/enable_execute_stack_test.c
===================================================================
--- test/Unit/enable_execute_stack_test.c	(revision 147731)
+++ test/Unit/enable_execute_stack_test.c	(working copy)
@@ -11,12 +11,27 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+#if defined(_WIN32)
+#include <windows.h>
+void __clear_cache(void* start, void* end)
+{
+    if( !FlushInstructionCache(GetCurrentProcess(), start, end-start) )
+        exit(1);
+}
+void __enable_execute_stack(void *addr)
+{
+    MEMORY_BASIC_INFORMATION b;
+
+    if ( !VirtualQuery(addr, &b, sizeof(b)) )
+        exit(1);
+    if( !VirtualProtect(b.BaseAddress, b.RegionSize, PAGE_EXECUTE_READWRITE, &b.Protect) )
+        exit(1);
+}
+#else
 #include <sys/mman.h>
-
-
-
 extern void __clear_cache(void* start, void* end);
 extern void __enable_execute_stack(void* addr);
+#endif
 
 typedef int (*pfunc)(void);
 
Index: lib/int_endianness.h
===================================================================
--- lib/int_endianness.h	(revision 147731)
+++ lib/int_endianness.h	(working copy)
@@ -80,6 +80,13 @@
 
 #endif /* GNU/Linux */
 
+#if defined(_WIN32)
+
+#define _YUGA_LITTLE_ENDIAN 1
+#define _YUGA_BIG_ENDIAN    0
+
+#endif /* Windows */
+
 /* . */
 
 #if !defined(_YUGA_LITTLE_ENDIAN) || !defined(_YUGA_BIG_ENDIAN)