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

Fix the build for us -Werror users.

Browse Source 
Remove broken emacs mode major notation marking a C++ file as C.
No functionality change.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138963 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky
2011-09-01 21:09:04 +00:00
parent 81b4e434d9
commit 833a003da0
2 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
//===-- lib/MC/Disassembler.cpp - Disassembler Public C Interface -*- C -*-===// //===-- lib/MC/Disassembler.cpp - Disassembler Public C Interface ---------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
@@ -135,25 +135,21 @@ size_t LLVMDisasmInstruction(LLVMDisasmContextRef DCR, uint8_t *Bytes,
MCInst Inst; MCInst Inst;
const MCDisassembler *DisAsm = DC->getDisAsm(); const MCDisassembler *DisAsm = DC->getDisAsm();
MCInstPrinter *IP = DC->getIP(); MCInstPrinter *IP = DC->getIP();
MCDisassembler::DecodeStatus S; if (DisAsm->getInstruction(Inst, Size, MemoryObject, PC,
S = DisAsm->getInstruction(Inst, Size, MemoryObject, PC, /*REMOVE*/ nulls()); /*REMOVE*/ nulls()) != MCDisassembler::Success) {
switch (S) {
case MCDisassembler::Fail:
case MCDisassembler::SoftFail:
// FIXME: Do something different for soft failure modes? // FIXME: Do something different for soft failure modes?
return 0; return 0;
case MCDisassembler::Success: {
SmallVector<char, 64> InsnStr;
raw_svector_ostream OS(InsnStr);
IP->printInst(&Inst, OS);
OS.flush();
assert(OutStringSize != 0 && "Output buffer cannot be zero size");
size_t OutputSize = std::min(OutStringSize-1, InsnStr.size());
std::memcpy(OutString, InsnStr.data(), OutputSize);
OutString[OutputSize] = '\0'; // Terminate string.
return Size;
}
} }
SmallVector<char, 64> InsnStr;
raw_svector_ostream OS(InsnStr);
IP->printInst(&Inst, OS);
OS.flush();
assert(OutStringSize != 0 && "Output buffer cannot be zero size");
size_t OutputSize = std::min(OutStringSize-1, InsnStr.size());
std::memcpy(OutString, InsnStr.data(), OutputSize);
OutString[OutputSize] = '\0'; // Terminate string.
return Size;
} }

27
lib/MC/MCDisassembler/EDDisassembler.cpp
View File

@@ -239,29 +239,20 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader,
MCInst* inst = new MCInst; MCInst* inst = new MCInst;
uint64_t byteSize; uint64_t byteSize;
MCDisassembler::DecodeStatus S; if (Disassembler->getInstruction(*inst, byteSize, memoryObject, address,
S = Disassembler->getInstruction(*inst, ErrorStream) != MCDisassembler::Success) {
byteSize,
memoryObject,
address,
ErrorStream);
switch (S) {
case MCDisassembler::Fail:
case MCDisassembler::SoftFail:
// FIXME: Do something different on soft failure mode? // FIXME: Do something different on soft failure mode?
delete inst; delete inst;
return NULL; return NULL;
case MCDisassembler::Success: {
const llvm::EDInstInfo *thisInstInfo = NULL;
if (InstInfos) {
thisInstInfo = &InstInfos[inst->getOpcode()];
}
EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
return sdInst;
} }
const llvm::EDInstInfo *thisInstInfo = NULL;
if (InstInfos) {
thisInstInfo = &InstInfos[inst->getOpcode()];
} }
EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
return sdInst;
} }
void EDDisassembler::initMaps(const MCRegisterInfo &registerInfo) { void EDDisassembler::initMaps(const MCRegisterInfo &registerInfo) {