[OCaml] Drop support for 3.12.1 and earlier.

[oota-llvm.git] / bindings / ocaml / bitreader / bitreader_ocaml.c

diff --git a/bindings/ocaml/bitreader/bitreader_ocaml.c b/bindings/ocaml/bitreader/bitreader_ocaml.c
index a3f873c8d882e97ad932dc0ef9864f5525576a56..eab3e1ae30e4b7c6504bd255d088c2a1820e0f94 100644 (file)
--- a/bindings/ocaml/bitreader/bitreader_ocaml.c
+++ b/bindings/ocaml/bitreader/bitreader_ocaml.c
@@ -16,17 +16,7 @@
 #include "caml/alloc.h"
 #include "caml/fail.h"
 #include "caml/memory.h"
 #include "caml/alloc.h"
 #include "caml/fail.h"
 #include "caml/memory.h"

-
-
-/* Can't use the recommended caml_named_value mechanism for backwards
-   compatibility reasons. This is largely equivalent. */
-static value llvm_bitreader_error_exn;
-
-CAMLprim value llvm_register_bitreader_exns(value Error) {
-  llvm_bitreader_error_exn = Field(Error, 0);
-  register_global_root(&llvm_bitreader_error_exn);
-  return Val_unit;
-}
+#include "caml/callback.h"

 
 static void llvm_raise(value Prototype, char *Message) {
   CAMLparam1(Prototype);
 
 static void llvm_raise(value Prototype, char *Message) {
   CAMLparam1(Prototype);


@@ -36,38 +26,29 @@ static void llvm_raise(value Prototype, char *Message) {
   LLVMDisposeMessage(Message);
 
   raise_with_arg(Prototype, CamlMessage);
   LLVMDisposeMessage(Message);
 
   raise_with_arg(Prototype, CamlMessage);

-  abort(); /* NOTREACHED */
-#ifdef CAMLnoreturn
-  CAMLnoreturn; /* Silences warnings, but is missing in some versions. */
-#endif
+  CAMLnoreturn;

 }
 
 }
 

-
-/*===-- Modules -----------------------------------------------------------===*/
+/*===-- BitReader --------------------------------------------------------===*/

 
 /* Llvm.llcontext -> Llvm.llmemorybuffer -> Llvm.llmodule */
 
 /* Llvm.llcontext -> Llvm.llmemorybuffer -> Llvm.llmodule */

-CAMLprim value llvm_get_module(LLVMContextRef C, LLVMMemoryBufferRef MemBuf) {
-  CAMLparam0();
-  CAMLlocal2(Variant, MessageVal);
+CAMLprim LLVMModuleRef llvm_get_module(LLVMContextRef C, LLVMMemoryBufferRef MemBuf) {
+  LLVMModuleRef M;

   char *Message;
 
   char *Message;
 

-  LLVMModuleRef M;

   if (LLVMGetBitcodeModuleInContext(C, MemBuf, &M, &Message))
   if (LLVMGetBitcodeModuleInContext(C, MemBuf, &M, &Message))

-    llvm_raise(llvm_bitreader_error_exn, Message);
+    llvm_raise(*caml_named_value("Llvm_bitreader.Error"), Message);

 
 

-  CAMLreturn((value) M);
+  return M;

 }
 
 /* Llvm.llcontext -> Llvm.llmemorybuffer -> Llvm.llmodule */
 }
 
 /* Llvm.llcontext -> Llvm.llmemorybuffer -> Llvm.llmodule */

-CAMLprim value llvm_parse_bitcode(LLVMContextRef C,
-                                  LLVMMemoryBufferRef MemBuf) {
-  CAMLparam0();
-  CAMLlocal2(Variant, MessageVal);
+CAMLprim LLVMModuleRef llvm_parse_bitcode(LLVMContextRef C, LLVMMemoryBufferRef MemBuf) {

   LLVMModuleRef M;
   char *Message;
 
   if (LLVMParseBitcodeInContext(C, MemBuf, &M, &Message))
   LLVMModuleRef M;
   char *Message;
 
   if (LLVMParseBitcodeInContext(C, MemBuf, &M, &Message))

-    llvm_raise(llvm_bitreader_error_exn, Message);
+    llvm_raise(*caml_named_value("Llvm_bitreader.Error"), Message);

 
 

-  CAMLreturn((value) M);
+  return M;

 }
 }