6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-16 11:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Use a StringRefMemoryObject. NFC.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221503 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-11-07 01:09:51 +00:00
parent 751848bb02
commit 3f4021398e
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/MC/MCDisassembler/Disassembler.cpp
View File

@ -21,7 +21,7 @@
#include "llvm/MC/MCSymbolizer.h" #include "llvm/MC/MCSymbolizer.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FormattedStream.h" #include "llvm/Support/FormattedStream.h"
#include "llvm/Support/MemoryObject.h" #include "llvm/Support/StringRefMemoryObject.h"
#include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetRegistry.h"
using namespace llvm; using namespace llvm;
@ -122,30 +122,6 @@ void LLVMDisasmDispose(LLVMDisasmContextRef DCR){
delete DC; delete DC;
} }
namespace {
//
// The memory object created by LLVMDisasmInstruction().
//
class DisasmMemoryObject : public MemoryObject {
uint8_t *Bytes;
uint64_t Size;
uint64_t BasePC;
public:
DisasmMemoryObject(uint8_t *bytes, uint64_t size, uint64_t basePC) :
Bytes(bytes), Size(size), BasePC(basePC) {}
uint64_t getBase() const override { return BasePC; }
uint64_t getExtent() const override { return Size; }
int readByte(uint64_t Addr, uint8_t *Byte) const override {
if (Addr - BasePC >= Size)
return -1;
*Byte = Bytes[Addr - BasePC];
return 0;
}
};
} // end anonymous namespace
/// \brief Emits the comments that are stored in \p DC comment stream. /// \brief Emits the comments that are stored in \p DC comment stream.
/// Each comment in the comment stream must end with a newline. /// Each comment in the comment stream must end with a newline.
static void emitComments(LLVMDisasmContext *DC, static void emitComments(LLVMDisasmContext *DC,
@ -269,7 +245,8 @@ size_t LLVMDisasmInstruction(LLVMDisasmContextRef DCR, uint8_t *Bytes,
size_t OutStringSize){ size_t OutStringSize){
LLVMDisasmContext *DC = (LLVMDisasmContext *)DCR; LLVMDisasmContext *DC = (LLVMDisasmContext *)DCR;
// Wrap the pointer to the Bytes, BytesSize and PC in a MemoryObject. // Wrap the pointer to the Bytes, BytesSize and PC in a MemoryObject.
DisasmMemoryObject MemoryObject(Bytes, BytesSize, PC); StringRef Data((const char*) Bytes, BytesSize);
StringRefMemoryObject MemoryObject(Data, PC);
uint64_t Size; uint64_t Size;
MCInst Inst; MCInst Inst;