X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FArchive%2FArchiveReader.cpp;h=b07e884b654796f0e01c72104eabaf917193d15d;hb=e07715cfba5528dfa368b25d484602ca2b0e1892;hp=c38389e2d7c08ef8753546051aaf8e8af72653df;hpb=c1d5624d71f7534cfc1bd51b76ead9cea99d3e8d;p=oota-llvm.git diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index c38389e2d7c..b07e884b654 100644 --- a/lib/Archive/ArchiveReader.cpp +++ b/lib/Archive/ArchiveReader.cpp @@ -2,12 +2,12 @@ // // 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. // //===----------------------------------------------------------------------===// @@ -15,11 +15,12 @@ #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; @@ -109,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. @@ -204,19 +205,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::Bitcode_FileType: - case sys::Bytecode_FileType: - flags |= ArchiveMember::BytecodeFlag; - break; - case sys::CompressedBytecode_FileType: - flags |= ArchiveMember::CompressedBytecodeFlag; - flags &= ~ArchiveMember::CompressedFlag; + flags |= ArchiveMember::BitcodeFlag; break; default: - flags &= ~(ArchiveMember::BytecodeFlag| - ArchiveMember::CompressedBytecodeFlag); + flags &= ~ArchiveMember::BitcodeFlag; break; } @@ -224,8 +219,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; @@ -244,7 +237,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; @@ -262,7 +255,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; @@ -344,12 +337,12 @@ 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) { for (iterator I=begin(), E=end(); I != E; ++I) { - if (I->isBytecode() || I->isCompressedBytecode()) { + if (I->isBitcode()) { std::string FullMemberName = archPath.toString() + "(" + I->getPath().toString() + ")"; MemoryBuffer *Buffer = @@ -375,7 +368,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)) @@ -483,11 +476,12 @@ 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 + // Now, load the bitcode module to get the ModuleProvider std::string FullMemberName = archPath.toString() + "(" + mbr->getPath().toString() + ")"; MemoryBuffer *Buffer =MemoryBuffer::getNewMemBuffer(mbr->getSize(), @@ -522,8 +516,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 @@ -535,14 +529,14 @@ 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); + GetBitcodeSymbols((const unsigned char*)At, mbr->getSize(), + FullMemberName, symbols, error); if (MP) { // Insert the module's symbols into the symbol table @@ -555,7 +549,7 @@ Archive::findModulesDefiningSymbols(std::set& symbols, modules.insert(std::make_pair(offset, std::make_pair(MP, mbr))); } else { if (error) - *error = "Can't parse bytecode member: " + + *error = "Can't parse bitcode member: " + mbr->getPath().toString() + ": " + *error; delete mbr; return false; @@ -591,10 +585,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; @@ -602,17 +596,17 @@ 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 = @@ -624,7 +618,7 @@ bool Archive::isBytecodeArchive() { Module *M = ParseBitcodeFile(Buffer); 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; }