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

Construct MachOObject in MachOObjectFile's constructor.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178988 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-04-07 16:58:48 +00:00
parent 2c6f997290
commit 6f1f33915a
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Object/MachO.h
View File

@ -126,7 +126,7 @@ typedef MachOObject::LoadCommandInfo LoadCommandInfo;
class MachOObjectFile : public ObjectFile { class MachOObjectFile : public ObjectFile {
public: public:
MachOObjectFile(MemoryBuffer *Object, MachOObject *MOO, error_code &ec); MachOObjectFile(MemoryBuffer *Object, error_code &ec);
virtual symbol_iterator begin_symbols() const; virtual symbol_iterator begin_symbols() const;
virtual symbol_iterator end_symbols() const; virtual symbol_iterator end_symbols() const;

36
lib/Object/MachOObjectFile.cpp
View File

@ -27,10 +27,23 @@ using namespace object;
namespace llvm { namespace llvm {
namespace object { namespace object {
MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, MachOObject *MOO, MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, error_code &ec)
error_code &ec) : ObjectFile(Binary::ID_MachO, Object) {
: ObjectFile(Binary::ID_MachO, Object), // MachOObject takes ownership of the Buffer we passed to it, and
MachOObj(MOO) { // MachOObjectFile does, too, so we need to make sure they don't get the
// same object. A MemoryBuffer is cheap (it's just a reference to memory,
// not a copy of the memory itself), so just make a new copy here for
// the MachOObjectFile.
MemoryBuffer *NewBuffer =
MemoryBuffer::getMemBuffer(Object->getBuffer(),
Object->getBufferIdentifier(), false);
std::string ErrorStr;
MachOObj.reset(MachOObject::LoadFromBuffer(NewBuffer, &ErrorStr));
if (!MachOObj) {
ec = object_error::parse_failed;
return;
}
DataRefImpl DRI; DataRefImpl DRI;
moveToNextSection(DRI); moveToNextSection(DRI);
uint32_t LoadCommandCount = MachOObj->getHeader().NumLoadCommands; uint32_t LoadCommandCount = MachOObj->getHeader().NumLoadCommands;
@ -61,19 +74,10 @@ const macho::Header &MachOObjectFile::getHeader() const {
ObjectFile *ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) { ObjectFile *ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) {
error_code ec; error_code ec;
std::string Err; ObjectFile *Ret = new MachOObjectFile(Buffer, ec);
MachOObject *MachOObj = MachOObject::LoadFromBuffer(Buffer, &Err); if (ec)
if (!MachOObj)
return NULL; return NULL;
// MachOObject takes ownership of the Buffer we passed to it, and return Ret;
// MachOObjectFile does, too, so we need to make sure they don't get the
// same object. A MemoryBuffer is cheap (it's just a reference to memory,
// not a copy of the memory itself), so just make a new copy here for
// the MachOObjectFile.
MemoryBuffer *NewBuffer =
MemoryBuffer::getMemBuffer(Buffer->getBuffer(),
Buffer->getBufferIdentifier(), false);
return new MachOObjectFile(NewBuffer, MachOObj, ec);
} }
/*===-- Symbols -----------------------------------------------------------===*/ /*===-- Symbols -----------------------------------------------------------===*/