Fixed tests and include paths in Windows sources

Signed-off-by: Alexandro Sanchez Bach <[email protected]>

Author: AlexAltea

core/include/emulate.h

@@ -31,11 +31,7 @@
 #ifndef HAX_CORE_EMULATE_H_
 #define HAX_CORE_EMULATE_H_
 
-#ifdef HAX_TESTS
-#include <stdint.h>
-#else
 #include "../../include/hax_types.h"
-#endif
 
 #include "emulate_ops.h"
 

include/hax_types.h

@@ -62,6 +62,7 @@
 #endif
 
 /* Detect platform */
+#ifndef HAX_TESTS // Prevent kernel-only exports from reaching userland code
 // MacOS
 #if defined(__MACH__)
 #define HAX_PLATFORM_DARWIN
@@ -73,6 +74,9 @@
 #else
 #error "Unsupported platform"
 #endif
+#else // !HAX_TESTS
+#include <stdint.h>
+#endif // HAX_TESTS
 
 #define HAX_PAGE_SIZE  4096
 #define HAX_PAGE_SHIFT 12

platforms/windows/hax_host_mem.c

@@ -28,9 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/hax_host_mem.h"
-#include "../include/hax.h"
-#include "../core/include/paging.h"
+#include "../../include/hax_host_mem.h"
+#include "../../include/hax.h"
+#include "../../core/include/paging.h"
 
 int hax_pin_user_pages(uint64_t start_uva, uint64_t size, hax_memdesc_user *memdesc)
 {

platforms/windows/hax_win.h

@@ -35,7 +35,7 @@
 #include <Ntifs.h>
 #include <stdarg.h>
 #include "hax_core_interface.h"
-#include "..\hax_interface.h"
+#include "../../include/hax_interface.h"
 #include "hax_types_windows.h"
 #include "hax_entry.h"
 #include "hax_event_win.h"

platforms/windows/hax_wrapper.c

@@ -29,7 +29,7 @@
  */
 
 #include "hax_win.h"
-#include "../core/include/ia32.h"
+#include "../../core/include/ia32.h"
 
 int default_hax_log_level = 3;
 int max_cpus;