6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-19 18:24:00 +00:00
Code Issues Projects Releases Wiki Activity

For PR797:

Browse Source 
Remove exception handling from the bytecode archiver and adjust the llvm-ar
tool to accommodate the new interfaces.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29866 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2006-08-24 23:45:08 +00:00
parent c82b3aab65
commit 0ff2d31766
8 changed files with 156 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Bytecode/Archive/Archive.cpp
View File

@ -61,7 +61,7 @@ ArchiveMember::ArchiveMember(Archive* PAR)
// 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.
void ArchiveMember::replaceWith(const sys::Path& newFile) {
bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) {
assert(newFile.exists() && "Can't replace with a non-existent file");
data = 0;
path = newFile;
@ -110,8 +110,8 @@ void ArchiveMember::replaceWith(const sys::Path& newFile) {
path.getMagicNumber(magic,4);
signature = magic.c_str();
std::string err;
if (path.getFileStatus(info, &err))
throw err;
if (path.getFileStatus(info, ErrMsg))
return true;
}
// Determine what kind of file it is
@ -127,23 +127,27 @@ void ArchiveMember::replaceWith(const sys::Path& newFile) {
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, bool map )
Archive::Archive(const sys::Path& filename)
: archPath(filename), members(), mapfile(0), base(0), symTab(), strtab(),
symTabSize(0), firstFileOffset(0), modules(), foreignST(0)
{
if (map) {
std::string ErrMsg;
mapfile = new sys::MappedFile();
if (mapfile->open(filename, sys::MappedFile::READ_ACCESS, &ErrMsg))
throw ErrMsg;
if (!(base = (char*) mapfile->map(&ErrMsg)))
throw ErrMsg;
}
}
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() {