fix compilation for MSVC32

oandrieu · oandrieu · commit 1a111e1c3be5 · 2017-05-12T18:32:26.000+02:00
GPR#938 broke compilation for MSVC32: the stack probing in the runtime
isn't implemented on Win32 (i386nt.asm), so the enhanced Is_in_code_area
macro should only be used in the Win64-specific part of byterun/win32.c.
diff --git a/byterun/win32.c b/byterun/win32.c
@@ -521,16 +521,6 @@ static void caml_reset_stack (void *faulting_address)
   caml_raise_stack_overflow();
 }
 
-/* Do not use the macro from address_class.h here. */
-#undef Is_in_code_area
-#define Is_in_code_area(pc) \
- ( ((char *)(pc) >= caml_code_area_start && \
-    (char *)(pc) <= caml_code_area_end)     \
-|| ((char *)(pc) >= &caml_system__code_begin && \
-    (char *)(pc) <= &caml_system__code_end)     \
-|| (Classify_addr(pc) & In_code_area) )
-extern char caml_system__code_begin, caml_system__code_end;
-
 
 #ifndef _WIN64
 static LONG CALLBACK
@@ -565,6 +555,17 @@ static LONG CALLBACK
 extern char *caml_exception_pointer;
 extern value *caml_young_ptr;
 
+/* Do not use the macro from address_class.h here. */
+#undef Is_in_code_area
+#define Is_in_code_area(pc) \
+ ( ((char *)(pc) >= caml_code_area_start && \
+    (char *)(pc) <= caml_code_area_end)     \
+|| ((char *)(pc) >= &caml_system__code_begin && \
+    (char *)(pc) <= &caml_system__code_end)     \
+|| (Classify_addr(pc) & In_code_area) )
+extern char caml_system__code_begin, caml_system__code_end;
+
+
 static LONG CALLBACK
     caml_stack_overflow_VEH (EXCEPTION_POINTERS* exn_info)
 {
