X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FArchive%2FArchiveReader.cpp;h=eef6fe0b1c1d7fa0696f1f6de7470c713a22f2d2;hb=3699261d3f49d65cee6a645c849c41cdca51a01f;hp=82ff9edc8ae427b9688ab2409b24578e46a230bf;hpb=cd5561a56e1521c7dc18744dcd371d255b580fdf;p=oota-llvm.git diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index 82ff9edc8ae..eef6fe0b1c1 100644 --- a/lib/Archive/ArchiveReader.cpp +++ b/lib/Archive/ArchiveReader.cpp @@ -2,23 +2,25 @@ // // 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. // //===----------------------------------------------------------------------===// // -// Builds up standard unix archive files (.a) containing LLVM bytecode. +// Builds up standard unix archive files (.a) containing LLVM bitcode. // //===----------------------------------------------------------------------===// #include "ArchiveInternals.h" -#include "llvm/Bytecode/Reader.h" +#include "llvm/Bitcode/ReaderWriter.h" +#include "llvm/Support/MemoryBuffer.h" +#include "llvm/Module.h" +#include #include - using namespace llvm; /// Read a variable-bit-rate encoded unsigned integer -inline unsigned readInteger(const char*&At, const char*End){ +static inline unsigned readInteger(const char*&At, const char*End) { unsigned Shift = 0; unsigned Result = 0; @@ -108,7 +110,7 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) // it will accept them. If the name starts with #1/ and the remainder is // digits, then those digits specify the length of the name that is // stored immediately following the header. The special name - // __LLVM_SYM_TAB__ identifies the symbol table for LLVM bytecode. + // __LLVM_SYM_TAB__ identifies the symbol table for LLVM bitcode. // Anything else is a regular, short filename that is terminated with // a '/' and blanks. @@ -118,7 +120,8 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) if (Hdr->name[1] == '1' && Hdr->name[2] == '/') { if (isdigit(Hdr->name[3])) { unsigned len = atoi(&Hdr->name[3]); - pathname.assign(At, len); + const char *nulp = (const char *)memchr(At, '\0', len); + pathname.assign(At, nulp != 0 ? (uintptr_t)(nulp - At) : len); At += len; MemberSize -= len; flags |= ArchiveMember::HasLongFilenameFlag; @@ -203,18 +206,13 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) break; } - // Determine if this is a bytecode file + // Determine if this is a bitcode file switch (sys::IdentifyFileType(At, 4)) { - case sys::BytecodeFileType: - flags |= ArchiveMember::BytecodeFlag; - break; - case sys::CompressedBytecodeFileType: - flags |= ArchiveMember::CompressedBytecodeFlag; - flags &= ~ArchiveMember::CompressedFlag; + case sys::Bitcode_FileType: + flags |= ArchiveMember::BitcodeFlag; break; default: - flags &= ~(ArchiveMember::BytecodeFlag| - ArchiveMember::CompressedBytecodeFlag); + flags &= ~ArchiveMember::BitcodeFlag; break; } @@ -222,8 +220,6 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) ArchiveMember* member = new ArchiveMember(this); // Fill in fields of the ArchiveMember - member->next = 0; - member->prev = 0; member->parent = this; member->path.set(pathname); member->info.fileSize = MemberSize; @@ -242,7 +238,7 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) bool Archive::checkSignature(std::string* error) { // Check the magic string at file's header - if (mapfile->size() < 8 || memcmp(base, ARFILE_MAGIC, 8)) { + if (mapfile->getBufferSize() < 8 || memcmp(base, ARFILE_MAGIC, 8)) { if (error) *error = "invalid signature for an archive file"; return false; @@ -260,7 +256,7 @@ Archive::loadArchive(std::string* error) { members.clear(); symTab.clear(); const char *At = base; - const char *End = base + mapfile->size(); + const char *End = mapfile->getBufferEnd(); if (!checkSignature(error)) return false; @@ -332,9 +328,9 @@ Archive::loadArchive(std::string* error) { // Open and completely load the archive file. Archive* -Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) -{ - std::auto_ptr result ( new Archive(file)); +Archive::OpenAndLoad(const sys::Path& file, LLVMContext& C, + std::string* ErrorMessage) { + std::auto_ptr result ( new Archive(file, C)); if (result->mapToMemory(ErrorMessage)) return 0; if (!result->loadArchive(ErrorMessage)) @@ -342,16 +338,21 @@ Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) return result.release(); } -// Get all the bytecode modules from the archive +// Get all the bitcode modules from the archive bool -Archive::getAllModules(std::vector& Modules, std::string* ErrMessage) { +Archive::getAllModules(std::vector& Modules, + std::string* ErrMessage) { for (iterator I=begin(), E=end(); I != E; ++I) { - if (I->isBytecode() || I->isCompressedBytecode()) { - std::string FullMemberName = archPath.toString() + - "(" + I->getPath().toString() + ")"; - Module* M = ParseBytecodeBuffer((const unsigned char*)I->getData(), - I->getSize(), FullMemberName, ErrMessage); + if (I->isBitcode()) { + std::string FullMemberName = archPath.str() + + "(" + I->getPath().str() + ")"; + MemoryBuffer *Buffer = + MemoryBuffer::getMemBufferCopy(StringRef(I->getData(), I->getSize()), + FullMemberName.c_str()); + + Module *M = ParseBitcodeFile(Buffer, Context, ErrMessage); + delete Buffer; if (!M) return true; @@ -369,7 +370,7 @@ Archive::loadSymbolTable(std::string* ErrorMsg) { members.clear(); symTab.clear(); const char *At = base; - const char *End = base + mapfile->size(); + const char *End = mapfile->getBufferEnd(); // Make sure we're dealing with an archive if (!checkSignature(ErrorMsg)) @@ -441,9 +442,10 @@ Archive::loadSymbolTable(std::string* ErrorMsg) { } // Open the archive and load just the symbol tables -Archive* -Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) { - std::auto_ptr result ( new Archive(file) ); +Archive* Archive::OpenAndLoadSymbols(const sys::Path& file, + LLVMContext& C, + std::string* ErrorMessage) { + std::auto_ptr result ( new Archive(file, C) ); if (result->mapToMemory(ErrorMessage)) return 0; if (!result->loadSymbolTable(ErrorMessage)) @@ -451,9 +453,9 @@ Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) { return result.release(); } -// Look up one symbol in the symbol table and return a ModuleProvider for the -// module that defines that symbol. -ModuleProvider* +// Look up one symbol in the symbol table and return the module that defines +// that symbol. +Module* Archive::findModuleDefiningSymbol(const std::string& symbol, std::string* ErrMsg) { SymTabType::iterator SI = symTab.find(symbol); @@ -477,31 +479,33 @@ Archive::findModuleDefiningSymbol(const std::string& symbol, // Module hasn't been loaded yet, we need to load it const char* modptr = base + fileOffset; - ArchiveMember* mbr = parseMemberHeader(modptr, base + mapfile->size(),ErrMsg); + ArchiveMember* mbr = parseMemberHeader(modptr, mapfile->getBufferEnd(), + ErrMsg); if (!mbr) return 0; - // Now, load the bytecode module to get the ModuleProvider - std::string FullMemberName = archPath.toString() + "(" + - mbr->getPath().toString() + ")"; - ModuleProvider* mp = getBytecodeBufferModuleProvider( - (const unsigned char*) mbr->getData(), mbr->getSize(), - FullMemberName, ErrMsg, 0); - if (!mp) + // Now, load the bitcode module to get the Module. + std::string FullMemberName = archPath.str() + "(" + + mbr->getPath().str() + ")"; + MemoryBuffer *Buffer = + MemoryBuffer::getMemBufferCopy(StringRef(mbr->getData(), mbr->getSize()), + FullMemberName.c_str()); + + Module *m = getLazyBitcodeModule(Buffer, Context, ErrMsg); + if (!m) return 0; - modules.insert(std::make_pair(fileOffset, std::make_pair(mp, mbr))); + modules.insert(std::make_pair(fileOffset, std::make_pair(m, mbr))); - return mp; + return m; } // Look up multiple symbols in the symbol table and return a set of -// ModuleProviders that define those symbols. +// Modules that define those symbols. bool Archive::findModulesDefiningSymbols(std::set& symbols, - std::set& result, - std::string* error) -{ + std::set& result, + std::string* error) { if (!mapfile || !base) { if (error) *error = "Empty archive invalid for finding modules defining symbols"; @@ -515,8 +519,8 @@ Archive::findModulesDefiningSymbols(std::set& symbols, // below. // Get a pointer to the first file - const char* At = ((const char*)base) + firstFileOffset; - const char* End = ((const char*)base) + mapfile->size(); + const char* At = base + firstFileOffset; + const char* End = mapfile->getBufferEnd(); while ( At < End) { // Compute the offset to be put in the symbol table @@ -528,27 +532,28 @@ Archive::findModulesDefiningSymbols(std::set& symbols, return false; // If it contains symbols - if (mbr->isBytecode() || mbr->isCompressedBytecode()) { + if (mbr->isBitcode()) { // Get the symbols std::vector symbols; - std::string FullMemberName = archPath.toString() + "(" + - mbr->getPath().toString() + ")"; - ModuleProvider* MP = GetBytecodeSymbols((const unsigned char*)At, - mbr->getSize(), FullMemberName, symbols, error); + std::string FullMemberName = archPath.str() + "(" + + mbr->getPath().str() + ")"; + Module* M = + GetBitcodeSymbols(At, mbr->getSize(), FullMemberName, Context, + symbols, error); - if (MP) { + if (M) { // Insert the module's symbols into the symbol table for (std::vector::iterator I = symbols.begin(), E=symbols.end(); I != E; ++I ) { symTab.insert(std::make_pair(*I, offset)); } - // Insert the ModuleProvider and the ArchiveMember into the table of + // Insert the Module and the ArchiveMember into the table of // modules. - modules.insert(std::make_pair(offset, std::make_pair(MP, mbr))); + modules.insert(std::make_pair(offset, std::make_pair(M, mbr))); } else { if (error) - *error = "Can't parse bytecode member: " + - mbr->getPath().toString() + ": " + *error; + *error = "Can't parse bitcode member: " + + mbr->getPath().str() + ": " + *error; delete mbr; return false; } @@ -567,11 +572,11 @@ Archive::findModulesDefiningSymbols(std::set& symbols, for (std::set::iterator I=symbols.begin(), E=symbols.end(); I != E;) { // See if this symbol exists - ModuleProvider* mp = findModuleDefiningSymbol(*I,error); - if (mp) { - // The symbol exists, insert the ModuleProvider into our result, - // duplicates wil be ignored - result.insert(mp); + Module* m = findModuleDefiningSymbol(*I,error); + if (m) { + // The symbol exists, insert the Module into our result, duplicates will + // be ignored. + result.insert(m); // Remove the symbol now that its been resolved, being careful to // post-increment the iterator. @@ -583,10 +588,10 @@ Archive::findModulesDefiningSymbols(std::set& symbols, return true; } -bool Archive::isBytecodeArchive() { +bool Archive::isBitcodeArchive() { // Make sure the symTab has been loaded. In most cases this should have been // done when the archive was constructed, but still, this is just in case. - if (!symTab.size()) + if (symTab.empty()) if (!loadSymbolTable(0)) return false; @@ -594,25 +599,29 @@ bool Archive::isBytecodeArchive() { // if it has a size if (symTab.size()) return true; - //We still can't be sure it isn't a bytecode archive + // We still can't be sure it isn't a bitcode archive if (!loadArchive(0)) return false; std::vector Modules; std::string ErrorMessage; - // Scan the archive, trying to load a bytecode member. We only load one to + // Scan the archive, trying to load a bitcode member. We only load one to // see if this works. for (iterator I = begin(), E = end(); I != E; ++I) { - if (!I->isBytecode() && !I->isCompressedBytecode()) + if (!I->isBitcode()) continue; std::string FullMemberName = - archPath.toString() + "(" + I->getPath().toString() + ")"; - Module* M = ParseBytecodeBuffer((const unsigned char*)I->getData(), - I->getSize(), FullMemberName); + archPath.str() + "(" + I->getPath().str() + ")"; + + MemoryBuffer *Buffer = + MemoryBuffer::getMemBufferCopy(StringRef(I->getData(), I->getSize()), + FullMemberName.c_str()); + Module *M = ParseBitcodeFile(Buffer, Context); + delete Buffer; if (!M) - return false; // Couldn't parse bytecode, not a bytecode archive. + return false; // Couldn't parse bitcode, not a bitcode archive. delete M; return true; }