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

don't crash on blank lines, rename some variables.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91892 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-12-22 06:24:00 +00:00
parent 1a0e7081c3
commit 222af46482
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tools/llvm-mc/HexDisassembler.cpp
View File

@ -84,75 +84,68 @@ void printInst(const llvm::MCDisassembler &disassembler,
}
}
int HexDisassembler::disassemble(const Target &target,
const std::string &tripleString,
MemoryBuffer &buffer) {
// Set up disassembler
int HexDisassembler::disassemble(const Target &T, const std::string &Triple,
MemoryBuffer &Buffer) {
// Set up disassembler.
llvm::OwningPtr<const llvm::MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));
llvm::OwningPtr<const llvm::MCAsmInfo> asmInfo
(target.createAsmInfo(tripleString));
if (!asmInfo) {
errs() << "error: no assembly info for target " << tripleString << "\n";
if (!AsmInfo) {
errs() << "error: no assembly info for target " << Triple << "\n";
return -1;
}
llvm::OwningPtr<const llvm::MCDisassembler> disassembler
(target.createMCDisassembler());
if (!disassembler) {
errs() << "error: no disassembler for target " << tripleString << "\n";
llvm::OwningPtr<const llvm::MCDisassembler> DisAsm(T.createMCDisassembler());
if (!DisAsm) {
errs() << "error: no disassembler for target " << Triple << "\n";
return -1;
}
llvm::MCInstPrinter *instPrinter = target.createMCInstPrinter(0,
*asmInfo,
outs());
llvm::MCInstPrinter *InstPrinter = T.createMCInstPrinter(0, *AsmInfo, outs());
if (!instPrinter) {
errs() << "error: no instruction printer for target " << tripleString
if (!InstPrinter) {
errs() << "error: no instruction printer for target " << Triple
<< "\n";
return -1;
}
// Convert the input to a vector for disassembly.
std::vector<unsigned char> ByteArray;
std::vector<unsigned char> bytes;
StringRef Str = Buffer.getBuffer();
StringRef str = buffer.getBuffer();
while (!str.empty()) {
if(str.find_first_of("\n") < str.find_first_not_of(" \t\n\r")) {
printInst(*disassembler, *instPrinter, bytes);
while (!Str.empty()) {
if (Str.find_first_of('\n') < Str.find_first_not_of(" \t\n\r")) {
if (!ByteArray.empty())
printInst(*DisAsm, *InstPrinter, ByteArray);
bytes.clear();
ByteArray.clear();
}
// Skip leading space.
str = str.substr(str.find_first_not_of(" \t\n\r"));
Str = Str.substr(Str.find_first_not_of(" \t\n\r"));
// Get the current token.
size_t next = str.find_first_of(" \t\n\r");
size_t Next = Str.find_first_of(" \t\n\r");
if(next == (size_t)StringRef::npos)
if(Next == (size_t)StringRef::npos)
break;
StringRef value = str.slice(0, next);
StringRef Value = Str.slice(0, Next);
// Convert to a byte and add to the byte vector.
unsigned byte;
if (value.getAsInteger(0, byte) || byte > 255) {
errs() << "warning: invalid input token '" << value << "' of length "
<< next << "\n";
unsigned ByteVal;
if (Value.getAsInteger(0, ByteVal) || ByteVal > 255) {
errs() << "warning: invalid input token '" << Value << "' of length "
<< Next << "\n";
}
else {
bytes.push_back((unsigned char)byte);
ByteArray.push_back((unsigned char)ByteVal);
}
str = str.substr(next);
Str = Str.substr(Next);
}
if (!bytes.empty())
printInst(*disassembler, *instPrinter, bytes);
if (!ByteArray.empty())
printInst(*DisAsm, *InstPrinter, ByteArray);
return 0;
}