//===----------------------------------------------------------------------===//
#include "ArchiveInternals.h"
+#include "llvm/Module.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/System/MappedFile.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Process.h"
-#include "llvm/ModuleProvider.h"
+#include "llvm/System/Signals.h"
#include <fstream>
#include <ostream>
#include <iomanip>
// 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) {
+static inline void writeInteger(unsigned num, std::ofstream& ARFile) {
while (1) {
if (num < 0x80) { // done?
ARFile << (unsigned char)num;
// 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) {
+static 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
}
// Create an empty archive.
-Archive*
-Archive::CreateEmpty(const sys::Path& FilePath ) {
- Archive* result = new Archive(FilePath);
+Archive* Archive::CreateEmpty(const sys::Path& FilePath, LLVMContext& C) {
+ Archive* result = new Archive(FilePath, C);
return result;
}
memcpy(hdr.date,buffer,12);
// Get rid of trailing blanks in the name
- std::string mbrPath = mbr.getPath().toString();
+ std::string mbrPath = mbr.getPath().str();
size_t mbrLen = mbrPath.length();
while (mbrLen > 0 && mbrPath[mbrLen-1] == ' ') {
mbrPath.erase(mbrLen-1,1);
mbr->data = 0;
mbr->path = filePath;
const sys::FileStatus *FSInfo = mbr->path.getFileStatus(false, ErrMsg);
- if (FSInfo)
- mbr->info = *FSInfo;
- else
+ if (!FSInfo) {
+ delete mbr;
return true;
+ }
+ mbr->info = *FSInfo;
unsigned flags = 0;
- bool hasSlash = filePath.toString().find('/') != std::string::npos;
+ bool hasSlash = filePath.str().find('/') != std::string::npos;
if (hasSlash)
flags |= ArchiveMember::HasPathFlag;
- if (hasSlash || filePath.toString().length() > 15)
+ if (hasSlash || filePath.str().length() > 15)
flags |= ArchiveMember::HasLongFilenameFlag;
std::string magic;
mbr->path.getMagicNumber(magic,4);
// 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;
+ const char *data = (const char*)member.getData();
+ MemoryBuffer *mFile = 0;
if (!data) {
- mFile = new sys::MappedFile();
- if (mFile->open(member.getPath(), ErrMsg))
- return true;
- if (!(data = (const char*) mFile->map(ErrMsg)))
+ mFile = MemoryBuffer::getFile(member.getPath().c_str(), ErrMsg);
+ if (mFile == 0)
return true;
- fSize = mFile->size();
+ data = mFile->getBufferStart();
+ fSize = mFile->getBufferSize();
}
// Now that we have the data in memory, update the
// symbol table if its a bitcode file.
if (CreateSymbolTable && member.isBitcode()) {
std::vector<std::string> symbols;
- std::string FullMemberName = archPath.toString() + "(" +
- member.getPath().toString()
+ std::string FullMemberName = archPath.str() + "(" + member.getPath().str()
+ ")";
- ModuleProvider* MP =
+ Module* M =
GetBitcodeSymbols((const unsigned char*)data,fSize,
- FullMemberName, symbols, ErrMsg);
+ FullMemberName, Context, symbols, ErrMsg);
// If the bitcode parsed successfully
- if ( MP ) {
+ if ( M ) {
for (std::vector<std::string>::iterator SI = symbols.begin(),
SE = symbols.end(); SI != SE; ++SI) {
}
}
// We don't need this module any more.
- delete MP;
+ delete M;
} else {
- if (mFile != 0) {
- mFile->close();
- delete mFile;
- }
+ delete mFile;
if (ErrMsg)
- *ErrMsg = "Can't parse bitcode member: " + member.getPath().toString()
+ *ErrMsg = "Can't parse bitcode member: " + member.getPath().str()
+ ": " + *ErrMsg;
return true;
}
// Write the long filename if its long
if (writeLongName) {
- ARFile.write(member.getPath().toString().data(),
- member.getPath().toString().length());
+ ARFile.write(member.getPath().str().data(),
+ member.getPath().str().length());
}
// Write the (possibly compressed) member's content to the file.
ARFile << ARFILE_PAD;
// Close the mapped file if it was opened
- if (mFile != 0) {
- mFile->close();
- delete mFile;
- }
+ delete mFile;
return false;
}
// Write the header
ARFile.write((char*)&Hdr, sizeof(Hdr));
+#ifndef NDEBUG
// Save the starting position of the symbol tables data content.
unsigned startpos = ARFile.tellp();
+#endif
// Write out the symbols sequentially
for ( Archive::SymTabType::iterator I = symTab.begin(), E = symTab.end();
ARFile.write(I->first.data(), I->first.length());
}
+#ifndef NDEBUG
// Now that we're done with the symbol table, get the ending file position
unsigned endpos = ARFile.tellp();
+#endif
// Make sure that the amount we wrote is what we pre-computed. This is
// critical for file integrity purposes.
{
// 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 && mapfile->size() > 8) {
+ if (members.empty() && mapfile && mapfile->getBufferSize() > 8) {
if (ErrMsg)
*ErrMsg = "Can't write an archive not opened for writing";
return true;
if (TmpArchive.exists())
TmpArchive.eraseFromDisk();
if (ErrMsg)
- *ErrMsg = "Error opening archive file: " + archPath.toString();
+ *ErrMsg = "Error opening archive file: " + archPath.str();
return true;
}
// 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.
+ sys::Path FinalFilePath = archPath;
// Map in the archive we just wrote.
- sys::MappedFile arch;
- if (arch.open(TmpArchive, ErrMsg))
- return true;
- const char* base;
- if (!(base = (const char*) arch.map(ErrMsg)))
- return true;
+ {
+ OwningPtr<MemoryBuffer> arch(MemoryBuffer::getFile(TmpArchive.c_str()));
+ if (arch == 0) return true;
+ const char* base = arch->getBufferStart();
// 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);
if (TmpArchive.exists())
TmpArchive.eraseFromDisk();
if (ErrMsg)
- *ErrMsg = "Error opening archive file: " + FinalFilePath.toString();
+ *ErrMsg = "Error opening archive file: " + FinalFilePath.str();
return true;
}
// 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);
+ arch->getBufferSize()-sizeof(ARFILE_MAGIC)+1);
// Close up shop
FinalFile.close();
- arch.close();
+ } // free arch.
// Move the final file over top of TmpArchive
if (FinalFilePath.renamePathOnDisk(TmpArchive, ErrMsg))
if (TmpArchive.renamePathOnDisk(archPath, ErrMsg))
return true;
+ // Set correct read and write permissions after temporary file is moved
+ // to final destination path.
+ if (archPath.makeReadableOnDisk(ErrMsg))
+ return true;
+ if (archPath.makeWriteableOnDisk(ErrMsg))
+ return true;
+
return false;
}
projects / oota-llvm.git / blobdiff