6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-01 00:33:09 +00:00
Code Issues Projects Releases Wiki Activity

Make MachOObjectFile independent from MachOObject.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178998 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-04-07 20:01:29 +00:00
parent f1cc8001fd
commit 8764c8979c
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,6 @@ protected:
virtual error_code getLibraryPath(DataRefImpl LibData, StringRef &Res) const;
private:
OwningPtr<MachOObject> MachOObj;
typedef SmallVector<DataRefImpl, 1> SectionList;
SectionList Sections;

25
lib/Object/MachOObjectFile.cpp
View File

@ -15,6 +15,7 @@
#include "llvm/Object/MachO.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Object/MachOFormat.h"
#include "llvm/Support/DataExtractor.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/MemoryBuffer.h"
#include <cctype>
@ -29,21 +30,6 @@ namespace object {
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 = getHeader()->NumLoadCommands;
@ -78,7 +64,14 @@ MachOObjectFile::getLoadCommandInfo(unsigned Index) const {
void MachOObjectFile::ReadULEB128s(uint64_t Index,
SmallVectorImpl<uint64_t> &Out) const {
return MachOObj->ReadULEB128s(Index, Out);
DataExtractor extractor(ObjectFile::getData(), true, 0);
uint32_t offset = Index;
uint64_t data = 0;
while (uint64_t delta = extractor.getULEB128(&offset)) {
data += delta;
Out.push_back(data);
}
}
const MachOFormat::Header *MachOObjectFile::getHeader() const {