maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Construct MachOObject in MachOObjectFile's constructor. 

llvm-svn: 178988
This commit is contained in:
Rafael Espindola 2013-04-07 16:58:48 +00:00
parent 717c4d44c4
commit 17bece31af
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

36
llvm/lib/Object/MachOObjectFile.cpp
View File

@ -27,10 +27,23 @@ using namespace object;
namespace llvm {
namespace object {
MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, MachOObject *MOO,
error_code &ec)
: ObjectFile(Binary::ID_MachO, Object),
MachOObj(MOO) {
MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, error_code &ec)
: ObjectFile(Binary::ID_MachO, Object) {
// MachOObject takes ownership of the Buffer we passed to it, and
// 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;
moveToNextSection(DRI);
uint32_t LoadCommandCount = MachOObj->getHeader().NumLoadCommands;
@ -61,19 +74,10 @@ const macho::Header &MachOObjectFile::getHeader() const {
ObjectFile *ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) {
error_code ec;
std::string Err;
MachOObject *MachOObj = MachOObject::LoadFromBuffer(Buffer, &Err);
if (!MachOObj)
ObjectFile *Ret = new MachOObjectFile(Buffer, ec);
if (ec)
return NULL;
// MachOObject takes ownership of the Buffer we passed to it, and
// 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);
return Ret;
}
/*===-- Symbols -----------------------------------------------------------===*/