replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the build for us -Werror users. 

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

llvm-svn: 138963
This commit is contained in:
Nick Lewycky 2011-09-01 21:09:04 +00:00
parent b053ac7e0c
commit 2e2d75fb97
2 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
llvm/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
//
@ -135,25 +135,21 @@ size_t LLVMDisasmInstruction(LLVMDisasmContextRef DCR, uint8_t *Bytes,
MCInst Inst;
const MCDisassembler *DisAsm = DC->getDisAsm();
MCInstPrinter *IP = DC->getIP();
MCDisassembler::DecodeStatus S;
S = DisAsm->getInstruction(Inst, Size, MemoryObject, PC, /*REMOVE*/ nulls());
switch (S) {
case MCDisassembler::Fail:
case MCDisassembler::SoftFail:
if (DisAsm->getInstruction(Inst, Size, MemoryObject, PC,
/*REMOVE*/ nulls()) != MCDisassembler::Success) {
// FIXME: Do something different for soft failure modes?
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
llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
View File

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