Adding bindings for memory buffers and module providers. Switching

[oota-llvm.git] / lib / Bitcode / Reader / BitReader.cpp

diff --git a/lib/Bitcode/Reader/BitReader.cpp b/lib/Bitcode/Reader/BitReader.cpp
index c6600887bc4e8df577ba669386e1e9f8255f99e5..c7c38690c5a050939060ce19ed2a35b874f73c98 100644 (file)
--- a/lib/Bitcode/Reader/BitReader.cpp
+++ b/lib/Bitcode/Reader/BitReader.cpp
@@ -14,20 +14,33 @@
 
 using namespace llvm;
 
 
 using namespace llvm;
 

-
-int LLVMReadBitcodeFromFile(const char *Path, LLVMModuleRef *OutModule,
-                            char **OutMessage) {
+/* Builds a module from the bitcode in the specified memory buffer, returning a
+   reference to the module via the OutModule parameter. Returns 0 on success.
+   Optionally returns a human-readable error message via OutMessage. */ 
+int LLVMParseBitcode(LLVMMemoryBufferRef MemBuf,
+                     LLVMModuleRef *OutModule, char **OutMessage) {

   std::string Message;
   
   std::string Message;
   

-  MemoryBuffer *buf = MemoryBuffer::getFile(Path, strlen(Path), &Message);
-  if (!buf) {
-    if (!OutMessage)
+  *OutModule = wrap(ParseBitcodeFile(unwrap(MemBuf), &Message));
+  if (!*OutModule) {
+    if (OutMessage)

       *OutMessage = strdup(Message.c_str());
     return 1;
   }
   
       *OutMessage = strdup(Message.c_str());
     return 1;
   }
   

-  *OutModule = wrap(ParseBitcodeFile(buf, &Message));
-  if (!*OutModule) {
+  return 0;
+}
+
+/* Reads a module from the specified path, returning via the OutModule parameter
+   a module provider which performs lazy deserialization. Returns 0 on success.
+   Optionally returns a human-readable error message via OutMessage. */ 
+int LLVMGetBitcodeModuleProvider(LLVMMemoryBufferRef MemBuf,
+                                 LLVMModuleProviderRef *OutMP,
+                                 char **OutMessage) {
+  std::string Message;
+  
+  *OutMP = wrap(getBitcodeModuleProvider(unwrap(MemBuf), &Message));
+  if (!*OutMP) {

     if (OutMessage)
       *OutMessage = strdup(Message.c_str());
     return 1;
     if (OutMessage)
       *OutMessage = strdup(Message.c_str());
     return 1;


@@ -35,8 +48,3 @@ int LLVMReadBitcodeFromFile(const char *Path, LLVMModuleRef *OutModule,
   
   return 0;
 }
   
   return 0;
 }

-
-void LLVMDisposeBitcodeReaderMessage(char *Message) {
-  if (Message)
-    free(Message);
-}