diff --git a/lib/Bytecode/Archive/Archive.cpp b/lib/Bytecode/Archive/Archive.cpp deleted file mode 100644 index 6fabc5c862f..00000000000 --- a/lib/Bytecode/Archive/Archive.cpp +++ /dev/null @@ -1,271 +0,0 @@ -//===-- Archive.cpp - Generic LLVM archive functions ------------*- C++ -*-===// -// -// 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 contains the implementation of the Archive and ArchiveMember -// classes that is common to both reading and writing archives.. -// -//===----------------------------------------------------------------------===// - -#include "ArchiveInternals.h" -#include "llvm/Bitcode/ReaderWriter.h" -#include "llvm/ModuleProvider.h" -#include "llvm/Module.h" -#include "llvm/Support/MemoryBuffer.h" -#include "llvm/System/Process.h" -using namespace llvm; - -// getMemberSize - compute the actual physical size of the file member as seen -// on disk. This isn't the size of member's payload. Use getSize() for that. -unsigned -ArchiveMember::getMemberSize() const { - // Basically its the file size plus the header size - unsigned result = info.fileSize + sizeof(ArchiveMemberHeader); - - // If it has a long filename, include the name length - if (hasLongFilename()) - result += path.toString().length() + 1; - - // If its now odd lengthed, include the padding byte - if (result % 2 != 0 ) - result++; - - return result; -} - -// This default constructor is only use by the ilist when it creates its -// sentry node. We give it specific static values to make it stand out a bit. -ArchiveMember::ArchiveMember() - : next(0), prev(0), parent(0), path("--invalid--"), flags(0), data(0) -{ - info.user = sys::Process::GetCurrentUserId(); - info.group = sys::Process::GetCurrentGroupId(); - info.mode = 0777; - info.fileSize = 0; - info.modTime = sys::TimeValue::now(); -} - -// This is the constructor that the Archive class uses when it is building or -// reading an archive. It just defaults a few things and ensures the parent is -// set for the iplist. The Archive class fills in the ArchiveMember's data. -// This is required because correctly setting the data may depend on other -// things in the Archive. -ArchiveMember::ArchiveMember(Archive* PAR) - : next(0), prev(0), parent(PAR), path(), flags(0), data(0) -{ -} - -// This method allows an ArchiveMember to be replaced with the data for a -// different file, presumably as an update to the member. It also makes sure -// the flags are reset correctly. -bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) { - if (!newFile.exists()) { - if (ErrMsg) - *ErrMsg = "Can not replace an archive member with a non-existent file"; - return true; - } - - data = 0; - path = newFile; - - // SVR4 symbol tables have an empty name - if (path.toString() == ARFILE_SVR4_SYMTAB_NAME) - flags |= SVR4SymbolTableFlag; - else - flags &= ~SVR4SymbolTableFlag; - - // BSD4.4 symbol tables have a special name - if (path.toString() == ARFILE_BSD4_SYMTAB_NAME) - flags |= BSD4SymbolTableFlag; - else - flags &= ~BSD4SymbolTableFlag; - - // LLVM symbol tables have a very specific name - if (path.toString() == ARFILE_LLVM_SYMTAB_NAME) - flags |= LLVMSymbolTableFlag; - else - flags &= ~LLVMSymbolTableFlag; - - // String table name - if (path.toString() == ARFILE_STRTAB_NAME) - flags |= StringTableFlag; - else - flags &= ~StringTableFlag; - - // If it has a slash then it has a path - bool hasSlash = path.toString().find('/') != std::string::npos; - if (hasSlash) - flags |= HasPathFlag; - else - flags &= ~HasPathFlag; - - // If it has a slash or its over 15 chars then its a long filename format - if (hasSlash || path.toString().length() > 15) - flags |= HasLongFilenameFlag; - else - flags &= ~HasLongFilenameFlag; - - // Get the signature and status info - const char* signature = (const char*) data; - std::string magic; - if (!signature) { - path.getMagicNumber(magic,4); - signature = magic.c_str(); - std::string err; - const sys::FileStatus *FSinfo = path.getFileStatus(false, ErrMsg); - if (FSinfo) - info = *FSinfo; - else - return true; - } - - // 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); - 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) - : archPath(filename), members(), mapfile(0), base(0), symTab(), strtab(), - 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))) - return true; - return false; -} - -void Archive::cleanUpMemory() { - // Shutdown the file mapping - if (mapfile) { - mapfile->close(); - delete mapfile; - - mapfile = 0; - base = 0; - } - - // Forget the entire symbol table - symTab.clear(); - symTabSize = 0; - - firstFileOffset = 0; - - // Free the foreign symbol table member - if (foreignST) { - delete foreignST; - foreignST = 0; - } - - // Delete any ModuleProviders and ArchiveMember's we've allocated as a result - // of symbol table searches. - for (ModuleMap::iterator I=modules.begin(), E=modules.end(); I != E; ++I ) { - delete I->second.first; - delete I->second.second; - } -} - -// Archive destructor - just clean up memory -Archive::~Archive() { - cleanUpMemory(); -} - - - -static void getSymbols(Module*M, std::vector& symbols) { - // Loop over global variables - for (Module::global_iterator GI = M->global_begin(), GE=M->global_end(); GI != GE; ++GI) - if (!GI->isDeclaration() && !GI->hasInternalLinkage()) - if (!GI->getName().empty()) - symbols.push_back(GI->getName()); - - // 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()); -} - -// Get just the externally visible defined symbols from the bytecode -bool llvm::GetBytecodeSymbols(const sys::Path& fName, - std::vector& symbols, - std::string* ErrMsg) { - std::auto_ptr Buffer( - MemoryBuffer::getFileOrSTDIN(&fName.toString()[0], - fName.toString().size())); - if (!Buffer.get()) { - if (ErrMsg) *ErrMsg = "Could not open file '" + fName.toString() + "'"; - return true; - } - - ModuleProvider *MP = getBitcodeModuleProvider(Buffer.get(), ErrMsg); - if (!MP) - return true; - - // Get the module from the provider - Module* M = MP->materializeModule(); - if (M == 0) { - delete MP; - return true; - } - - // Get the symbols - getSymbols(M, symbols); - - // Done with the module. - delete MP; - return true; -} - -ModuleProvider* -llvm::GetBytecodeSymbols(const unsigned char *BufPtr, unsigned Length, - const std::string& ModuleID, - std::vector& symbols, - std::string* ErrMsg) { - // Get the module provider - MemoryBuffer *Buffer =MemoryBuffer::getNewMemBuffer(Length, ModuleID.c_str()); - memcpy((char*)Buffer->getBufferStart(), BufPtr, Length); - - ModuleProvider *MP = getBitcodeModuleProvider(Buffer, ErrMsg); - if (!MP) - return 0; - - // Get the module from the provider - Module* M = MP->materializeModule(); - if (M == 0) { - delete MP; - return 0; - } - - // Get the symbols - getSymbols(M, symbols); - - // Done with the module. Note that ModuleProvider will delete the - // Module when it is deleted. Also note that its the caller's responsibility - // to delete the ModuleProvider. - return MP; -} diff --git a/lib/Bytecode/Archive/ArchiveInternals.h b/lib/Bytecode/Archive/ArchiveInternals.h deleted file mode 100644 index 4642f7a30ab..00000000000 --- a/lib/Bytecode/Archive/ArchiveInternals.h +++ /dev/null @@ -1,83 +0,0 @@ -//===-- lib/Bytecode/ArchiveInternals.h -------------------------*- C++ -*-===// -// -// 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. -// -//===----------------------------------------------------------------------===// -// -// Internal implementation header for LLVM Archive files. -// -//===----------------------------------------------------------------------===// - -#ifndef LIB_BYTECODE_ARCHIVEINTERNALS_H -#define LIB_BYTECODE_ARCHIVEINTERNALS_H - -#include "llvm/Bitcode/Archive.h" -#include "llvm/System/TimeValue.h" -#include "llvm/ADT/StringExtras.h" - -#define ARFILE_MAGIC "!\n" ///< magic string -#define ARFILE_MAGIC_LEN (sizeof(ARFILE_MAGIC)-1) ///< length of magic string -#define ARFILE_SVR4_SYMTAB_NAME "/ " ///< SVR4 symtab entry name -#define ARFILE_LLVM_SYMTAB_NAME "#_LLVM_SYM_TAB_#" ///< LLVM symtab entry name -#define ARFILE_BSD4_SYMTAB_NAME "__.SYMDEF SORTED" ///< BSD4 symtab entry name -#define ARFILE_STRTAB_NAME "// " ///< Name of string table -#define ARFILE_PAD "\n" ///< inter-file align padding -#define ARFILE_MEMBER_MAGIC "`\n" ///< fmag field magic # - -namespace llvm { - - /// The ArchiveMemberHeader structure is used internally for bytecode - /// archives. - /// The header precedes each file member in the archive. This structure is - /// defined using character arrays for direct and correct interpretation - /// regardless of the endianess of the machine that produced it. - /// @brief Archive File Member Header - class ArchiveMemberHeader { - /// @name Data - /// @{ - public: - char name[16]; ///< Name of the file member. - char date[12]; ///< File date, decimal seconds since Epoch - char uid[6]; ///< user id in ASCII decimal - char gid[6]; ///< group id in ASCII decimal - char mode[8]; ///< file mode in ASCII octal - char size[10]; ///< file size in ASCII decimal - char fmag[2]; ///< Always contains ARFILE_MAGIC_TERMINATOR - - /// @} - /// @name Methods - /// @{ - public: - void init() { - memset(name,' ',16); - memset(date,' ',12); - memset(uid,' ',6); - memset(gid,' ',6); - memset(mode,' ',8); - memset(size,' ',10); - fmag[0] = '`'; - fmag[1] = '\n'; - } - - bool checkSignature() { - return 0 == memcmp(fmag, ARFILE_MEMBER_MAGIC,2); - } - }; - - // Get just the externally visible defined symbols from the bytecode - bool GetBytecodeSymbols(const sys::Path& fName, - std::vector& symbols, - std::string* ErrMsg); - - ModuleProvider* GetBytecodeSymbols(const unsigned char*Buffer,unsigned Length, - const std::string& ModuleID, - std::vector& symbols, - std::string* ErrMsg); -} - -#endif - -// vim: sw=2 ai diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp deleted file mode 100644 index c38389e2d7c..00000000000 --- a/lib/Bytecode/Archive/ArchiveReader.cpp +++ /dev/null @@ -1,633 +0,0 @@ -//===-- ArchiveReader.cpp - Read LLVM archive files -------------*- C++ -*-===// -// -// 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. -// -//===----------------------------------------------------------------------===// -// -// Builds up standard unix archive files (.a) containing LLVM bytecode. -// -//===----------------------------------------------------------------------===// - -#include "ArchiveInternals.h" -#include "llvm/Bitcode/ReaderWriter.h" -#include "llvm/Support/MemoryBuffer.h" -#include "llvm/Module.h" -#include -using namespace llvm; - -/// Read a variable-bit-rate encoded unsigned integer -inline unsigned readInteger(const char*&At, const char*End){ - unsigned Shift = 0; - unsigned Result = 0; - - do { - if (At == End) - return Result; - Result |= (unsigned)((*At++) & 0x7F) << Shift; - Shift += 7; - } while (At[-1] & 0x80); - return Result; -} - -// Completely parse the Archive's symbol table and populate symTab member var. -bool -Archive::parseSymbolTable(const void* data, unsigned size, std::string* error) { - const char* At = (const char*) data; - const char* End = At + size; - while (At < End) { - unsigned offset = readInteger(At, End); - if (At == End) { - if (error) - *error = "Ran out of data reading vbr_uint for symtab offset!"; - return false; - } - unsigned length = readInteger(At, End); - if (At == End) { - if (error) - *error = "Ran out of data reading vbr_uint for symtab length!"; - return false; - } - if (At + length > End) { - if (error) - *error = "Malformed symbol table: length not consistent with size"; - return false; - } - // we don't care if it can't be inserted (duplicate entry) - symTab.insert(std::make_pair(std::string(At, length), offset)); - At += length; - } - symTabSize = size; - return true; -} - -// This member parses an ArchiveMemberHeader that is presumed to be pointed to -// by At. The At pointer is updated to the byte just after the header, which -// can be variable in size. -ArchiveMember* -Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) -{ - if (At + sizeof(ArchiveMemberHeader) >= End) { - if (error) - *error = "Unexpected end of file"; - return 0; - } - - // Cast archive member header - ArchiveMemberHeader* Hdr = (ArchiveMemberHeader*)At; - At += sizeof(ArchiveMemberHeader); - - // Extract the size and determine if the file is - // compressed or not (negative length). - int flags = 0; - int MemberSize = atoi(Hdr->size); - if (MemberSize < 0) { - flags |= ArchiveMember::CompressedFlag; - MemberSize = -MemberSize; - } - - // Check the size of the member for sanity - if (At + MemberSize > End) { - if (error) - *error = "invalid member length in archive file"; - return 0; - } - - // Check the member signature - if (!Hdr->checkSignature()) { - if (error) - *error = "invalid file member signature"; - return 0; - } - - // Convert and check the member name - // The empty name ( '/' and 15 blanks) is for a foreign (non-LLVM) symbol - // table. The special name "//" and 14 blanks is for a string table, used - // for long file names. This library doesn't generate either of those but - // 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. - // Anything else is a regular, short filename that is terminated with - // a '/' and blanks. - - std::string pathname; - switch (Hdr->name[0]) { - case '#': - if (Hdr->name[1] == '1' && Hdr->name[2] == '/') { - if (isdigit(Hdr->name[3])) { - unsigned len = atoi(&Hdr->name[3]); - pathname.assign(At, len); - At += len; - MemberSize -= len; - flags |= ArchiveMember::HasLongFilenameFlag; - } else { - if (error) - *error = "invalid long filename"; - return 0; - } - } else if (Hdr->name[1] == '_' && - (0 == memcmp(Hdr->name, ARFILE_LLVM_SYMTAB_NAME, 16))) { - // The member is using a long file name (>15 chars) format. - // This format is standard for 4.4BSD and Mac OSX operating - // systems. LLVM uses it similarly. In this format, the - // remainder of the name field (after #1/) specifies the - // length of the file name which occupy the first bytes of - // the member's data. The pathname already has the #1/ stripped. - pathname.assign(ARFILE_LLVM_SYMTAB_NAME); - flags |= ArchiveMember::LLVMSymbolTableFlag; - } - break; - case '/': - if (Hdr->name[1]== '/') { - if (0 == memcmp(Hdr->name, ARFILE_STRTAB_NAME, 16)) { - pathname.assign(ARFILE_STRTAB_NAME); - flags |= ArchiveMember::StringTableFlag; - } else { - if (error) - *error = "invalid string table name"; - return 0; - } - } else if (Hdr->name[1] == ' ') { - if (0 == memcmp(Hdr->name, ARFILE_SVR4_SYMTAB_NAME, 16)) { - pathname.assign(ARFILE_SVR4_SYMTAB_NAME); - flags |= ArchiveMember::SVR4SymbolTableFlag; - } else { - if (error) - *error = "invalid SVR4 symbol table name"; - return 0; - } - } else if (isdigit(Hdr->name[1])) { - unsigned index = atoi(&Hdr->name[1]); - if (index < strtab.length()) { - const char* namep = strtab.c_str() + index; - const char* endp = strtab.c_str() + strtab.length(); - const char* p = namep; - const char* last_p = p; - while (p < endp) { - if (*p == '\n' && *last_p == '/') { - pathname.assign(namep, last_p - namep); - flags |= ArchiveMember::HasLongFilenameFlag; - break; - } - last_p = p; - p++; - } - if (p >= endp) { - if (error) - *error = "missing name termiantor in string table"; - return 0; - } - } else { - if (error) - *error = "name index beyond string table"; - return 0; - } - } - break; - case '_': - if (Hdr->name[1] == '_' && - (0 == memcmp(Hdr->name, ARFILE_BSD4_SYMTAB_NAME, 16))) { - pathname.assign(ARFILE_BSD4_SYMTAB_NAME); - flags |= ArchiveMember::BSD4SymbolTableFlag; - break; - } - /* FALL THROUGH */ - - default: - char* slash = (char*) memchr(Hdr->name, '/', 16); - if (slash == 0) - slash = Hdr->name + 16; - pathname.assign(Hdr->name, slash - Hdr->name); - break; - } - - // Determine if this is a bytecode 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; - break; - default: - flags &= ~(ArchiveMember::BytecodeFlag| - ArchiveMember::CompressedBytecodeFlag); - break; - } - - // Instantiate the ArchiveMember to be filled - 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; - member->info.modTime.fromEpochTime(atoi(Hdr->date)); - unsigned int mode; - sscanf(Hdr->mode, "%o", &mode); - member->info.mode = mode; - member->info.user = atoi(Hdr->uid); - member->info.group = atoi(Hdr->gid); - member->flags = flags; - member->data = At; - - return member; -} - -bool -Archive::checkSignature(std::string* error) { - // Check the magic string at file's header - if (mapfile->size() < 8 || memcmp(base, ARFILE_MAGIC, 8)) { - if (error) - *error = "invalid signature for an archive file"; - return false; - } - return true; -} - -// This function loads the entire archive and fully populates its ilist with -// the members of the archive file. This is typically used in preparation for -// editing the contents of the archive. -bool -Archive::loadArchive(std::string* error) { - - // Set up parsing - members.clear(); - symTab.clear(); - const char *At = base; - const char *End = base + mapfile->size(); - - if (!checkSignature(error)) - return false; - - At += 8; // Skip the magic string. - - bool seenSymbolTable = false; - bool foundFirstFile = false; - while (At < End) { - // parse the member header - const char* Save = At; - ArchiveMember* mbr = parseMemberHeader(At, End, error); - if (!mbr) - return false; - - // check if this is the foreign symbol table - if (mbr->isSVR4SymbolTable() || mbr->isBSD4SymbolTable()) { - // We just save this but don't do anything special - // with it. It doesn't count as the "first file". - if (foreignST) { - // What? Multiple foreign symbol tables? Just chuck it - // and retain the last one found. - delete foreignST; - } - foreignST = mbr; - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - } else if (mbr->isStringTable()) { - // Simply suck the entire string table into a string - // variable. This will be used to get the names of the - // members that use the "/ddd" format for their names - // (SVR4 style long names). - strtab.assign(At, mbr->getSize()); - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - delete mbr; - } else if (mbr->isLLVMSymbolTable()) { - // This is the LLVM symbol table for the archive. If we've seen it - // already, its an error. Otherwise, parse the symbol table and move on. - if (seenSymbolTable) { - if (error) - *error = "invalid archive: multiple symbol tables"; - return false; - } - if (!parseSymbolTable(mbr->getData(), mbr->getSize(), error)) - return false; - seenSymbolTable = true; - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - delete mbr; // We don't need this member in the list of members. - } else { - // This is just a regular file. If its the first one, save its offset. - // Otherwise just push it on the list and move on to the next file. - if (!foundFirstFile) { - firstFileOffset = Save - base; - foundFirstFile = true; - } - members.push_back(mbr); - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - } - } - return true; -} - -// Open and completely load the archive file. -Archive* -Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) -{ - std::auto_ptr result ( new Archive(file)); - if (result->mapToMemory(ErrorMessage)) - return 0; - if (!result->loadArchive(ErrorMessage)) - return 0; - return result.release(); -} - -// Get all the bytecode 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()) { - std::string FullMemberName = archPath.toString() + - "(" + I->getPath().toString() + ")"; - MemoryBuffer *Buffer = - MemoryBuffer::getNewMemBuffer(I->getSize(), FullMemberName.c_str()); - memcpy((char*)Buffer->getBufferStart(), I->getData(), I->getSize()); - - Module *M = ParseBitcodeFile(Buffer, ErrMessage); - delete Buffer; - if (!M) - return true; - - Modules.push_back(M); - } - } - return false; -} - -// Load just the symbol table from the archive file -bool -Archive::loadSymbolTable(std::string* ErrorMsg) { - - // Set up parsing - members.clear(); - symTab.clear(); - const char *At = base; - const char *End = base + mapfile->size(); - - // Make sure we're dealing with an archive - if (!checkSignature(ErrorMsg)) - return false; - - At += 8; // Skip signature - - // Parse the first file member header - const char* FirstFile = At; - ArchiveMember* mbr = parseMemberHeader(At, End, ErrorMsg); - if (!mbr) - return false; - - if (mbr->isSVR4SymbolTable() || mbr->isBSD4SymbolTable()) { - // Skip the foreign symbol table, we don't do anything with it - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - delete mbr; - - // Read the next one - FirstFile = At; - mbr = parseMemberHeader(At, End, ErrorMsg); - if (!mbr) { - delete mbr; - return false; - } - } - - if (mbr->isStringTable()) { - // Process the string table entry - strtab.assign((const char*)mbr->getData(), mbr->getSize()); - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - delete mbr; - // Get the next one - FirstFile = At; - mbr = parseMemberHeader(At, End, ErrorMsg); - if (!mbr) { - delete mbr; - return false; - } - } - - // See if its the symbol table - if (mbr->isLLVMSymbolTable()) { - if (!parseSymbolTable(mbr->getData(), mbr->getSize(), ErrorMsg)) { - delete mbr; - return false; - } - - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - delete mbr; - // Can't be any more symtab headers so just advance - FirstFile = At; - } else { - // There's no symbol table in the file. We have to rebuild it from scratch - // because the intent of this method is to get the symbol table loaded so - // it can be searched efficiently. - // Add the member to the members list - members.push_back(mbr); - } - - firstFileOffset = FirstFile - base; - return true; -} - -// 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) ); - if (result->mapToMemory(ErrorMessage)) - return 0; - if (!result->loadSymbolTable(ErrorMessage)) - return 0; - return result.release(); -} - -// Look up one symbol in the symbol table and return a ModuleProvider for the -// module that defines that symbol. -ModuleProvider* -Archive::findModuleDefiningSymbol(const std::string& symbol, - std::string* ErrMsg) { - SymTabType::iterator SI = symTab.find(symbol); - if (SI == symTab.end()) - return 0; - - // The symbol table was previously constructed assuming that the members were - // written without the symbol table header. Because VBR encoding is used, the - // values could not be adjusted to account for the offset of the symbol table - // because that could affect the size of the symbol table due to VBR encoding. - // We now have to account for this by adjusting the offset by the size of the - // symbol table and its header. - unsigned fileOffset = - SI->second + // offset in symbol-table-less file - firstFileOffset; // add offset to first "real" file in archive - - // See if the module is already loaded - ModuleMap::iterator MI = modules.find(fileOffset); - if (MI != modules.end()) - return MI->second.first; - - // Module hasn't been loaded yet, we need to load it - const char* modptr = base + fileOffset; - ArchiveMember* mbr = parseMemberHeader(modptr, base + mapfile->size(),ErrMsg); - if (!mbr) - return 0; - - // Now, load the bytecode module to get the ModuleProvider - std::string FullMemberName = archPath.toString() + "(" + - mbr->getPath().toString() + ")"; - MemoryBuffer *Buffer =MemoryBuffer::getNewMemBuffer(mbr->getSize(), - FullMemberName.c_str()); - memcpy((char*)Buffer->getBufferStart(), mbr->getData(), mbr->getSize()); - - ModuleProvider *mp = getBitcodeModuleProvider(Buffer, ErrMsg); - if (!mp) - return 0; - - modules.insert(std::make_pair(fileOffset, std::make_pair(mp, mbr))); - - return mp; -} - -// Look up multiple symbols in the symbol table and return a set of -// ModuleProviders that define those symbols. -bool -Archive::findModulesDefiningSymbols(std::set& symbols, - std::set& result, - std::string* error) { - if (!mapfile || !base) { - if (error) - *error = "Empty archive invalid for finding modules defining symbols"; - return false; - } - - if (symTab.empty()) { - // We don't have a symbol table, so we must build it now but lets also - // make sure that we populate the modules table as we do this to ensure - // that we don't load them twice when findModuleDefiningSymbol is called - // below. - - // Get a pointer to the first file - const char* At = ((const char*)base) + firstFileOffset; - const char* End = ((const char*)base) + mapfile->size(); - - while ( At < End) { - // Compute the offset to be put in the symbol table - unsigned offset = At - base - firstFileOffset; - - // Parse the file's header - ArchiveMember* mbr = parseMemberHeader(At, End, error); - if (!mbr) - return false; - - // If it contains symbols - if (mbr->isBytecode() || mbr->isCompressedBytecode()) { - // 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); - - if (MP) { - // 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 - // modules. - modules.insert(std::make_pair(offset, std::make_pair(MP, mbr))); - } else { - if (error) - *error = "Can't parse bytecode member: " + - mbr->getPath().toString() + ": " + *error; - delete mbr; - return false; - } - } - - // Go to the next file location - At += mbr->getSize(); - if ((intptr_t(At) & 1) == 1) - At++; - } - } - - // At this point we have a valid symbol table (one way or another) so we - // just use it to quickly find the symbols requested. - - 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); - - // Remove the symbol now that its been resolved, being careful to - // post-increment the iterator. - symbols.erase(I++); - } else { - ++I; - } - } - return true; -} - -bool Archive::isBytecodeArchive() { - // 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 (!loadSymbolTable(0)) - return false; - - // Now that we know it's been loaded, return true - // if it has a size - if (symTab.size()) return true; - - //We still can't be sure it isn't a bytecode 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 - // see if this works. - for (iterator I = begin(), E = end(); I != E; ++I) { - if (!I->isBytecode() && !I->isCompressedBytecode()) - continue; - - std::string FullMemberName = - archPath.toString() + "(" + I->getPath().toString() + ")"; - - MemoryBuffer *Buffer = - MemoryBuffer::getNewMemBuffer(I->getSize(), FullMemberName.c_str()); - memcpy((char*)Buffer->getBufferStart(), I->getData(), I->getSize()); - Module *M = ParseBitcodeFile(Buffer); - delete Buffer; - if (!M) - return false; // Couldn't parse bytecode, not a bytecode archive. - delete M; - return true; - } - - return false; -} diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp deleted file mode 100644 index 051d31fce95..00000000000 --- a/lib/Bytecode/Archive/ArchiveWriter.cpp +++ /dev/null @@ -1,482 +0,0 @@ -//===-- ArchiveWriter.cpp - Write LLVM archive files ----------------------===// -// -// 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. -// -//===----------------------------------------------------------------------===// -// -// Builds up an LLVM archive file (.a) containing LLVM bytecode. -// -//===----------------------------------------------------------------------===// - -#include "ArchiveInternals.h" -#include "llvm/Bitcode/ReaderWriter.h" -#include "llvm/System/Signals.h" -#include "llvm/System/Process.h" -#include "llvm/ModuleProvider.h" -#include -#include -#include -using namespace llvm; - -// Write an integer using variable bit rate encoding. This saves a few bytes -// per entry in the symbol table. -inline void writeInteger(unsigned num, std::ofstream& ARFile) { - while (1) { - if (num < 0x80) { // done? - ARFile << (unsigned char)num; - return; - } - - // Nope, we are bigger than a character, output the next 7 bits and set the - // high bit to say that there is more coming... - ARFile << (unsigned char)(0x80 | ((unsigned char)num & 0x7F)); - num >>= 7; // Shift out 7 bits now... - } -} - -// Compute how many bytes are taken by a given VBR encoded value. This is needed -// to pre-compute the size of the symbol table. -inline unsigned numVbrBytes(unsigned num) { - - // Note that the following nested ifs are somewhat equivalent to a binary - // search. We split it in half by comparing against 2^14 first. This allows - // most reasonable values to be done in 2 comparisons instead of 1 for - // small ones and four for large ones. We expect this to access file offsets - // in the 2^10 to 2^24 range and symbol lengths in the 2^0 to 2^8 range, - // so this approach is reasonable. - if (num < 1<<14) - if (num < 1<<7) - return 1; - else - return 2; - if (num < 1<<21) - return 3; - - if (num < 1<<28) - return 4; - return 5; // anything >= 2^28 takes 5 bytes -} - -// Create an empty archive. -Archive* -Archive::CreateEmpty(const sys::Path& FilePath ) { - Archive* result = new Archive(FilePath); - return result; -} - -// Fill the ArchiveMemberHeader with the information from a member. If -// TruncateNames is true, names are flattened to 15 chars or less. The sz field -// is provided here instead of coming from the mbr because the member might be -// stored compressed and the compressed size is not the ArchiveMember's size. -// Furthermore compressed files have negative size fields to identify them as -// compressed. -bool -Archive::fillHeader(const ArchiveMember &mbr, ArchiveMemberHeader& hdr, - int sz, bool TruncateNames) const { - - // Set the permissions mode, uid and gid - hdr.init(); - char buffer[32]; - sprintf(buffer, "%-8o", mbr.getMode()); - memcpy(hdr.mode,buffer,8); - sprintf(buffer, "%-6u", mbr.getUser()); - memcpy(hdr.uid,buffer,6); - sprintf(buffer, "%-6u", mbr.getGroup()); - memcpy(hdr.gid,buffer,6); - - // Set the last modification date - uint64_t secondsSinceEpoch = mbr.getModTime().toEpochTime(); - sprintf(buffer,"%-12u", unsigned(secondsSinceEpoch)); - memcpy(hdr.date,buffer,12); - - // Get rid of trailing blanks in the name - std::string mbrPath = mbr.getPath().toString(); - size_t mbrLen = mbrPath.length(); - while (mbrLen > 0 && mbrPath[mbrLen-1] == ' ') { - mbrPath.erase(mbrLen-1,1); - mbrLen--; - } - - // Set the name field in one of its various flavors. - bool writeLongName = false; - if (mbr.isStringTable()) { - memcpy(hdr.name,ARFILE_STRTAB_NAME,16); - } else if (mbr.isSVR4SymbolTable()) { - memcpy(hdr.name,ARFILE_SVR4_SYMTAB_NAME,16); - } else if (mbr.isBSD4SymbolTable()) { - memcpy(hdr.name,ARFILE_BSD4_SYMTAB_NAME,16); - } else if (mbr.isLLVMSymbolTable()) { - memcpy(hdr.name,ARFILE_LLVM_SYMTAB_NAME,16); - } else if (TruncateNames) { - const char* nm = mbrPath.c_str(); - unsigned len = mbrPath.length(); - size_t slashpos = mbrPath.rfind('/'); - if (slashpos != std::string::npos) { - nm += slashpos + 1; - len -= slashpos +1; - } - if (len > 15) - len = 15; - memcpy(hdr.name,nm,len); - hdr.name[len] = '/'; - } else if (mbrPath.length() < 16 && mbrPath.find('/') == std::string::npos) { - memcpy(hdr.name,mbrPath.c_str(),mbrPath.length()); - hdr.name[mbrPath.length()] = '/'; - } else { - std::string nm = "#1/"; - nm += utostr(mbrPath.length()); - memcpy(hdr.name,nm.data(),nm.length()); - if (sz < 0) - sz -= mbrPath.length(); - else - sz += mbrPath.length(); - writeLongName = true; - } - - // Set the size field - if (sz < 0) { - buffer[0] = '-'; - sprintf(&buffer[1],"%-9u",(unsigned)-sz); - } else { - sprintf(buffer, "%-10u", (unsigned)sz); - } - memcpy(hdr.size,buffer,10); - - return writeLongName; -} - -// Insert a file into the archive before some other member. This also takes care -// of extracting the necessary flags and information from the file. -bool -Archive::addFileBefore(const sys::Path& filePath, iterator where, - std::string* ErrMsg) { - if (!filePath.exists()) { - if (ErrMsg) - *ErrMsg = "Can not add a non-existent file to archive"; - return true; - } - - ArchiveMember* mbr = new ArchiveMember(this); - - mbr->data = 0; - mbr->path = filePath; - const sys::FileStatus *FSInfo = mbr->path.getFileStatus(false, ErrMsg); - if (FSInfo) - mbr->info = *FSInfo; - else - return true; - - unsigned flags = 0; - bool hasSlash = filePath.toString().find('/') != std::string::npos; - if (hasSlash) - flags |= ArchiveMember::HasPathFlag; - if (hasSlash || filePath.toString().length() > 15) - flags |= ArchiveMember::HasLongFilenameFlag; - std::string magic; - mbr->path.getMagicNumber(magic,4); - switch (sys::IdentifyFileType(magic.c_str(),4)) { - case sys::Bitcode_FileType: - case sys::Bytecode_FileType: - flags |= ArchiveMember::BytecodeFlag; - break; - case sys::CompressedBytecode_FileType: - flags |= ArchiveMember::CompressedBytecodeFlag; - break; - default: - break; - } - mbr->flags = flags; - members.insert(where,mbr); - return false; -} - -// Write one member out to the file. -bool -Archive::writeMember( - const ArchiveMember& member, - std::ofstream& ARFile, - bool CreateSymbolTable, - bool TruncateNames, - bool ShouldCompress, - std::string* ErrMsg -) { - - unsigned filepos = ARFile.tellp(); - filepos -= 8; - - // Get the data and its size either from the - // member's in-memory data or directly from the file. - size_t fSize = member.getSize(); - const char* data = (const char*)member.getData(); - sys::MappedFile* mFile = 0; - if (!data) { - mFile = new sys::MappedFile(); - if (mFile->open(member.getPath(), sys::MappedFile::READ_ACCESS, ErrMsg)) - return true; - if (!(data = (const char*) mFile->map(ErrMsg))) - return true; - fSize = mFile->size(); - } - - // Now that we have the data in memory, update the - // symbol table if its a bytecode file. - if (CreateSymbolTable && - (member.isBytecode() || member.isCompressedBytecode())) { - std::vector symbols; - std::string FullMemberName = archPath.toString() + "(" + - member.getPath().toString() - + ")"; - ModuleProvider* MP = - GetBytecodeSymbols((const unsigned char*)data,fSize, - FullMemberName, symbols, ErrMsg); - - // If the bytecode parsed successfully - if ( MP ) { - for (std::vector::iterator SI = symbols.begin(), - SE = symbols.end(); SI != SE; ++SI) { - - std::pair Res = - symTab.insert(std::make_pair(*SI,filepos)); - - if (Res.second) { - symTabSize += SI->length() + - numVbrBytes(SI->length()) + - numVbrBytes(filepos); - } - } - // We don't need this module any more. - delete MP; - } else { - if (mFile != 0) { - mFile->close(); - delete mFile; - } - if (ErrMsg) - *ErrMsg = "Can't parse bytecode member: " + member.getPath().toString() - + ": " + *ErrMsg; - return true; - } - } - - int hdrSize = fSize; - - // Compute the fields of the header - ArchiveMemberHeader Hdr; - bool writeLongName = fillHeader(member,Hdr,hdrSize,TruncateNames); - - // Write header to archive file - ARFile.write((char*)&Hdr, sizeof(Hdr)); - - // Write the long filename if its long - if (writeLongName) { - ARFile.write(member.getPath().toString().data(), - member.getPath().toString().length()); - } - - // Write the (possibly compressed) member's content to the file. - ARFile.write(data,fSize); - - // Make sure the member is an even length - if ((ARFile.tellp() & 1) == 1) - ARFile << ARFILE_PAD; - - // Close the mapped file if it was opened - if (mFile != 0) { - mFile->close(); - delete mFile; - } - return false; -} - -// Write out the LLVM symbol table as an archive member to the file. -void -Archive::writeSymbolTable(std::ofstream& ARFile) { - - // Construct the symbol table's header - ArchiveMemberHeader Hdr; - Hdr.init(); - memcpy(Hdr.name,ARFILE_LLVM_SYMTAB_NAME,16); - uint64_t secondsSinceEpoch = sys::TimeValue::now().toEpochTime(); - char buffer[32]; - sprintf(buffer, "%-8o", 0644); - memcpy(Hdr.mode,buffer,8); - sprintf(buffer, "%-6u", sys::Process::GetCurrentUserId()); - memcpy(Hdr.uid,buffer,6); - sprintf(buffer, "%-6u", sys::Process::GetCurrentGroupId()); - memcpy(Hdr.gid,buffer,6); - sprintf(buffer,"%-12u", unsigned(secondsSinceEpoch)); - memcpy(Hdr.date,buffer,12); - sprintf(buffer,"%-10u",symTabSize); - memcpy(Hdr.size,buffer,10); - - // Write the header - ARFile.write((char*)&Hdr, sizeof(Hdr)); - - // Save the starting position of the symbol tables data content. - unsigned startpos = ARFile.tellp(); - - // Write out the symbols sequentially - for ( Archive::SymTabType::iterator I = symTab.begin(), E = symTab.end(); - I != E; ++I) - { - // Write out the file index - writeInteger(I->second, ARFile); - // Write out the length of the symbol - writeInteger(I->first.length(), ARFile); - // Write out the symbol - ARFile.write(I->first.data(), I->first.length()); - } - - // Now that we're done with the symbol table, get the ending file position - unsigned endpos = ARFile.tellp(); - - // Make sure that the amount we wrote is what we pre-computed. This is - // critical for file integrity purposes. - assert(endpos - startpos == symTabSize && "Invalid symTabSize computation"); - - // Make sure the symbol table is even sized - if (symTabSize % 2 != 0 ) - ARFile << ARFILE_PAD; -} - -// Write the entire archive to the file specified when the archive was created. -// This writes to a temporary file first. Options are for creating a symbol -// table, flattening the file names (no directories, 15 chars max) and -// compressing each archive member. -bool -Archive::writeToDisk(bool CreateSymbolTable, bool TruncateNames, bool Compress, - std::string* ErrMsg) -{ - // Make sure they haven't opened up the file, not loaded it, - // but are now trying to write it which would wipe out the file. - if (members.empty() && mapfile->size() > 8) { - if (ErrMsg) - *ErrMsg = "Can't write an archive not opened for writing"; - return true; - } - - // Create a temporary file to store the archive in - sys::Path TmpArchive = archPath; - if (TmpArchive.createTemporaryFileOnDisk(ErrMsg)) - return true; - - // Make sure the temporary gets removed if we crash - sys::RemoveFileOnSignal(TmpArchive); - - // Create archive file for output. - std::ios::openmode io_mode = std::ios::out | std::ios::trunc | - std::ios::binary; - std::ofstream ArchiveFile(TmpArchive.c_str(), io_mode); - - // Check for errors opening or creating archive file. - if (!ArchiveFile.is_open() || ArchiveFile.bad()) { - if (TmpArchive.exists()) - TmpArchive.eraseFromDisk(); - if (ErrMsg) - *ErrMsg = "Error opening archive file: " + archPath.toString(); - return true; - } - - // If we're creating a symbol table, reset it now - if (CreateSymbolTable) { - symTabSize = 0; - symTab.clear(); - } - - // Write magic string to archive. - ArchiveFile << ARFILE_MAGIC; - - // Loop over all member files, and write them out. Note that this also - // builds the symbol table, symTab. - for (MembersList::iterator I = begin(), E = end(); I != E; ++I) { - if (writeMember(*I, ArchiveFile, CreateSymbolTable, - TruncateNames, Compress, ErrMsg)) { - if (TmpArchive.exists()) - TmpArchive.eraseFromDisk(); - ArchiveFile.close(); - return true; - } - } - - // Close archive file. - ArchiveFile.close(); - - // Write the symbol table - if (CreateSymbolTable) { - // At this point we have written a file that is a legal archive but it - // doesn't have a symbol table in it. To aid in faster reading and to - // ensure compatibility with other archivers we need to put the symbol - // table first in the file. Unfortunately, this means mapping the file - // we just wrote back in and copying it to the destination file. - - // Map in the archive we just wrote. - sys::MappedFile arch; - if (arch.open(TmpArchive, sys::MappedFile::READ_ACCESS, ErrMsg)) - return true; - const char* base; - if (!(base = (const char*) arch.map(ErrMsg))) - return true; - - // Open another temporary file in order to avoid invalidating the - // mmapped data - sys::Path FinalFilePath = archPath; - if (FinalFilePath.createTemporaryFileOnDisk(ErrMsg)) - return true; - sys::RemoveFileOnSignal(FinalFilePath); - - std::ofstream FinalFile(FinalFilePath.c_str(), io_mode); - if (!FinalFile.is_open() || FinalFile.bad()) { - if (TmpArchive.exists()) - TmpArchive.eraseFromDisk(); - if (ErrMsg) - *ErrMsg = "Error opening archive file: " + FinalFilePath.toString(); - return true; - } - - // Write the file magic number - FinalFile << ARFILE_MAGIC; - - // If there is a foreign symbol table, put it into the file now. Most - // ar(1) implementations require the symbol table to be first but llvm-ar - // can deal with it being after a foreign symbol table. This ensures - // compatibility with other ar(1) implementations as well as allowing the - // archive to store both native .o and LLVM .bc files, both indexed. - if (foreignST) { - if (writeMember(*foreignST, FinalFile, false, false, false, ErrMsg)) { - FinalFile.close(); - if (TmpArchive.exists()) - TmpArchive.eraseFromDisk(); - return true; - } - } - - // Put out the LLVM symbol table now. - writeSymbolTable(FinalFile); - - // Copy the temporary file contents being sure to skip the file's magic - // number. - FinalFile.write(base + sizeof(ARFILE_MAGIC)-1, - arch.size()-sizeof(ARFILE_MAGIC)+1); - - // Close up shop - FinalFile.close(); - arch.close(); - - // Move the final file over top of TmpArchive - if (FinalFilePath.renamePathOnDisk(TmpArchive, ErrMsg)) - return true; - } - - // Before we replace the actual archive, we need to forget all the - // members, since they point to data in that old archive. We need to do - // this because we cannot replace an open file on Windows. - cleanUpMemory(); - - if (TmpArchive.renamePathOnDisk(archPath, ErrMsg)) - return true; - - return false; -} diff --git a/lib/Bytecode/Archive/Makefile b/lib/Bytecode/Archive/Makefile deleted file mode 100644 index 0ecf38b93f0..00000000000 --- a/lib/Bytecode/Archive/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -##===- lib/Bytecode/Archive/Makefile -----------------------*- Makefile -*-===## -# -# 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. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../../.. -LIBRARYNAME = LLVMArchive - -# We only want an archive so only those modules actually used by a tool are -# included. -BUILD_ARCHIVE := 1 - -include $(LEVEL)/Makefile.common