commit 4aa6bea7a2d79ddbb0023baaa7ce5009d1f6dfbd
author Rafael Espindola <rafael.espindola@gmail.com> Mon Nov 10 18:11:10 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Nov 10 18:11:10 2014 +0000
tree 62ea0ca2dbca372d6a5b2c2f3e134ead9085dd25
parent 94794d08b94a8329d3f833ef0d2ac01938dd9cce

Misc style fixes. NFC.

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.

llvm-svn: 221615

llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp

diff --git a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
index 521bd21..5ceba2f 100644
--- a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
+++ b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
@@ -97,16 +97,15 @@
   }
 }
 
-/// 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 @@
 // 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;
   }
 }