X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fcommon_stub.hpp;h=ae672dada8b3943ae59fdb0947827de3f6df03d0;hb=9cce2a2d99b15d1cb51623b29a20ad77074afa70;hp=6bfb57d787e30de51fc5ad8401a5de9e5103aec3;hpb=f1181ec507d05a2f9ff5371b282a26f8d6e1ff7e;p=SXSI%2Fxpathcomp.git

diff --git a/src/common_stub.hpp b/src/common_stub.hpp
index 6bfb57d..ae672da 100644
--- a/src/common_stub.hpp
+++ b/src/common_stub.hpp
@@ -13,9 +13,18 @@ extern "C" {
 #include <caml/bigarray.h>
 }
 #include <typeinfo>
+#include <cstdio>
+#include <cassert>
 
 #define NoAlloc
 
+//Must be used in front of every function that is called from OCaml.
+#if _M_IX86 || __i386
+#define ML_BINDING extern "C" __attribute__ ((force_align_arg_pointer))
+#else
+#define ML_BINDING extern "C"
+#endif
+
 
 void register_custom_(char* name,
 		      size_t size,
@@ -25,6 +34,7 @@ value alloc_custom_(char* name);
 
 template <class X> X& Obj_val(value v)
 {
+  assert(Tag_val(v) == Custom_tag);
   return * (X*) Data_custom_val(v);
 }
 
@@ -55,8 +65,7 @@ sxsi_alloc_custom(void (*finalize)(value) = sxsi_finalize_custom<X>)
 
 void sxsi_raise_msg(const char * msg);
 
-extern "C" value sxsi_cpp_init(value unit);
-
+ML_BINDING value sxsi_cpp_init(value unit);
 
 
 #endif