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

Misc style fixes. NFC.

Browse Source 
This fixes a few cases of:

* Wrong variable name style.
* Lines longer than 80 columns.
* Repeated names in comments.
* clang-format of the above.

This make the next patch a lot easier to read.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221615 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-11-10 18:11:10 +00:00
parent 2d268749a5
commit d342c4c748
11 changed files with 274 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/Target/X86/Disassembler/X86Disassembler.cpp
View File

@ -97,16 +97,15 @@ X86GenericDisassembler::X86GenericDisassembler(
}
}
/// regionReader - a callback function that wraps the readByte method from
/// MemoryObject.
/// A callback function that wraps the readByte method from MemoryObject.
///
/// @param arg - The generic callback parameter. In this case, this should
/// @param Arg - The generic callback parameter. In this case, this should
/// be a pointer to a MemoryObject.
/// @param byte - A pointer to the byte to be read.
/// @param address - The address to be read.
static int regionReader(const void* arg, uint8_t* byte, uint64_t address) {
const MemoryObject* region = static_cast<const MemoryObject*>(arg);
return region->readByte(address, byte);
/// @param Byte - A pointer to the byte to be read.
/// @param Address - The address to be read.
static int regionReader(const void *Arg, uint8_t *Byte, uint64_t Address) {
const MemoryObject *Region = static_cast<const MemoryObject *>(Arg);
return Region->readByte(Address, Byte);
}
/// logger - a callback function that wraps the operator<< method from
@ -127,38 +126,27 @@ static void logger(void* arg, const char* log) {
// Public interface for the disassembler
//
MCDisassembler::DecodeStatus
X86GenericDisassembler::getInstruction(MCInst &instr,
uint64_t &size,
const MemoryObject &region,
uint64_t address,
raw_ostream &vStream,
raw_ostream &cStream) const {
CommentStream = &cStream;
MCDisassembler::DecodeStatus X86GenericDisassembler::getInstruction(
MCInst &Instr, uint64_t &Size, const MemoryObject &Region, uint64_t Address,
raw_ostream &VStream, raw_ostream &CStream) const {
CommentStream = &CStream;
InternalInstruction internalInstr;
InternalInstruction InternalInstr;
dlog_t loggerFn = logger;
if (&vStream == &nulls())
loggerFn = nullptr; // Disable logging completely if it's going to nulls().
int ret = decodeInstruction(&internalInstr,
regionReader,
(const void*)&region,
loggerFn,
(void*)&vStream,
(const void*)MII.get(),
address,
fMode);
dlog_t LoggerFn = logger;
if (&VStream == &nulls())
LoggerFn = nullptr; // Disable logging completely if it's going to nulls().
if (ret) {
size = internalInstr.readerCursor - address;
int Ret = decodeInstruction(&InternalInstr, regionReader,
(const void *)&Region, LoggerFn, (void *)&VStream,
(const void *)MII.get(), Address, fMode);
if (Ret) {
Size = InternalInstr.readerCursor - Address;
return Fail;
}
else {
size = internalInstr.length;
return (!translateInstruction(instr, internalInstr, this)) ?
Success : Fail;
} else {
Size = InternalInstr.length;
return (!translateInstruction(Instr, InternalInstr, this)) ? Success : Fail;
}
}