//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
#include "ArchiveInternals.h"
+#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/ModuleProvider.h"
#include "llvm/Module.h"
-#include "llvm/Bytecode/Reader.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Process.h"
+#include <memory>
+#include <cstring>
using namespace llvm;
// getMemberSize - compute the actual physical size of the file member as seen
path.getMagicNumber(magic,4);
signature = magic.c_str();
std::string err;
- const sys::FileStatus *FSinfo =
- sys::PathWithStatus(path).getFileStatus(false, ErrMsg);
+ const sys::FileStatus *FSinfo = path.getFileStatus(false, ErrMsg);
if (FSinfo)
info = *FSinfo;
else
// Determine what kind of file it is
switch (sys::IdentifyFileType(signature,4)) {
- case sys::Bytecode_FileType:
- flags |= BytecodeFlag;
- break;
- case sys::CompressedBytecode_FileType:
- flags |= CompressedBytecodeFlag;
- flags &= ~CompressedFlag;
- break;
default:
- flags &= ~(BytecodeFlag|CompressedBytecodeFlag);
+ flags &= ~BitcodeFlag;
break;
}
return false;
// Archive constructor - this is the only constructor that gets used for the
// Archive class. Everything else (default,copy) is deprecated. This just
// initializes and maps the file into memory, if requested.
-Archive::Archive(const sys::Path& filename, BCDecompressor_t *BCDC)
+Archive::Archive(const sys::Path& filename)
: archPath(filename), members(), mapfile(0), base(0), symTab(), strtab(),
- symTabSize(0), firstFileOffset(0), modules(), foreignST(0),
- Decompressor(BCDC) {
+ symTabSize(0), firstFileOffset(0), modules(), foreignST(0) {
}
bool
-Archive::mapToMemory(std::string* ErrMsg)
-{
- mapfile = new sys::MappedFile();
- if (mapfile->open(archPath, sys::MappedFile::READ_ACCESS, ErrMsg))
- return true;
- if (!(base = (char*) mapfile->map(ErrMsg)))
+Archive::mapToMemory(std::string* ErrMsg) {
+ mapfile = MemoryBuffer::getFile(archPath.c_str(), ErrMsg);
+ if (mapfile == 0)
return true;
+ base = mapfile->getBufferStart();
return false;
}
void Archive::cleanUpMemory() {
// Shutdown the file mapping
- if (mapfile) {
- mapfile->close();
- delete mapfile;
-
- mapfile = 0;
- base = 0;
- }
+ delete mapfile;
+ mapfile = 0;
+ base = 0;
// Forget the entire symbol table
symTab.clear();
if (!GI->getName().empty())
symbols.push_back(GI->getName());
- // Loop over functions.
+ // Loop over functions
for (Module::iterator FI = M->begin(), FE = M->end(); FI != FE; ++FI)
if (!FI->isDeclaration() && !FI->hasInternalLinkage())
if (!FI->getName().empty())
symbols.push_back(FI->getName());
+
+ // Loop over aliases
+ for (Module::alias_iterator AI = M->alias_begin(), AE = M->alias_end();
+ AI != AE; ++AI) {
+ if (AI->hasName())
+ symbols.push_back(AI->getName());
+ }
}
-// Get just the externally visible defined symbols from the bytecode
-bool llvm::GetBytecodeSymbols(const sys::Path& fName,
- std::vector<std::string>& symbols,
- BCDecompressor_t *BCDC,
- std::string* ErrMsg) {
- ModuleProvider *MP = getBytecodeModuleProvider(fName.toString(), BCDC,ErrMsg);
+// Get just the externally visible defined symbols from the bitcode
+bool llvm::GetBitcodeSymbols(const sys::Path& fName,
+ std::vector<std::string>& symbols,
+ std::string* ErrMsg) {
+ std::auto_ptr<MemoryBuffer> Buffer(
+ MemoryBuffer::getFileOrSTDIN(fName.c_str()));
+ if (!Buffer.get()) {
+ if (ErrMsg) *ErrMsg = "Could not open file '" + fName.toString() + "'";
+ return true;
+ }
+
+ ModuleProvider *MP = getBitcodeModuleProvider(Buffer.get(), ErrMsg);
if (!MP)
return true;
}
ModuleProvider*
-llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length,
- const std::string& ModuleID,
- std::vector<std::string>& symbols,
- BCDecompressor_t *BCDC,
- std::string* ErrMsg) {
+llvm::GetBitcodeSymbols(const unsigned char *BufPtr, unsigned Length,
+ const std::string& ModuleID,
+ std::vector<std::string>& symbols,
+ std::string* ErrMsg) {
// Get the module provider
- ModuleProvider* MP =
- getBytecodeBufferModuleProvider(Buffer, Length, ModuleID, BCDC, ErrMsg, 0);
+ MemoryBuffer *Buffer =MemoryBuffer::getNewMemBuffer(Length, ModuleID.c_str());
+ memcpy((char*)Buffer->getBufferStart(), BufPtr, Length);
+
+ ModuleProvider *MP = getBitcodeModuleProvider(Buffer, ErrMsg);
if (!MP)
return 0;