Backport the changes from the readability.

test/cctest/test-disasm-arm.cc

 // Copyright 2007-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 32 matching lines @@
 static v8::Persistent<v8::Context> env;
 
 static void InitializeVM() {
   if (env.IsEmpty()) {
     env = v8::Context::New();
   }
 }
 
 
 bool DisassembleAndCompare(byte* pc, const char* compare_string) {
-  disasm::Disassembler disasm;
+  disasm::NameConverter converter;
+  disasm::Disassembler disasm(converter);
   EmbeddedVector<char, 128> disasm_buffer;
 
   disasm.InstructionDecode(disasm_buffer, pc);
 
   if (strcmp(compare_string, disasm_buffer.start()) != 0) {
     fprintf(stderr,
             "expected: \n"
             "%s\n"
             "disassembled: \n"
             "%s\n\n",
             compare_string, disasm_buffer.start());
     return false;
   }
   return true;
 }
 
 
+// Setup V8 to a state where we can at least run the assembler and
+// disassembler. Declare the variables and allocate the data structures used
+// in the rest of the macros.
 #define SETUP() \
   InitializeVM(); \
   Serializer::disable(); \
   v8::HandleScope scope; \
   byte *buffer = reinterpret_cast<byte*>(malloc(4*1024)); \
   Assembler assm(buffer, 4*1024); \
   bool failure = false;
 
 
+// This macro assembles one instruction using the preallocated assembler and
+// disassembles the generated instruction, comparing the output to the expected
+// value. If the comparison fails an error message is printed, but the test
+// continues to run until the end.
 #define COMPARE(asm_, compare_string) \
   { \
     int pc_offset = assm.pc_offset(); \
     byte *pc = &buffer[pc_offset]; \
     assm.asm_; \
     if (!DisassembleAndCompare(pc, compare_string)) failure = true; \
   }
 
 
-#define OUTPUT() \
-  if (failure) { \
+// Verify that all invocations of the COMPARE macro passed successfully.
+// Exit with a failure if at least one of the tests failed.
+#define VERIFY_RUN() \
+if (failure) { \
     V8_Fatal(__FILE__, __LINE__, "ARM Disassembler tests failed.\n"); \
   }
 
 
 TEST(Type0) {
   SETUP();
 
   COMPARE(and_(r0, r1, Operand(r2)),
           "e0010002       and r0, r1, r2");
   COMPARE(and_(r1, r2, Operand(r3), LeaveCC),
@@ skipping 131 matching lines @@
 
   COMPARE(mvn(r10, Operand(r1)),
           "e1e0a001       mvn sl, r1");
   COMPARE(mvn(r9, Operand(r2)),
           "e1e09002       mvn r9, r2");
   COMPARE(mvn(r0, Operand(r3), SetCC),
           "e1f00003       mvns r0, r3");
   COMPARE(mvn(r5, Operand(r4), SetCC, cc),
           "31f05004       mvnccs r5, r4");
 
-  OUTPUT();
+  VERIFY_RUN();
 }
 
 
 TEST(Type1) {
   SETUP();
 
   COMPARE(and_(r0, r1, Operand(0x00000000)),
           "e2010000       and r0, r1, #0");
   COMPARE(and_(r1, r2, Operand(0x00000001), LeaveCC),
           "e2021001       and r1, r2, #1");
   COMPARE(and_(r2, r3, Operand(0x00000010), SetCC),
           "e2132010       ands r2, r3, #16");
   COMPARE(and_(r3, r4, Operand(0x00000100), LeaveCC, eq),
           "02043c01       andeq r3, r4, #256");
   COMPARE(and_(r4, r5, Operand(0x00001000), SetCC, ne),
           "12154a01       andnes r4, r5, #4096");
 
   COMPARE(eor(r4, r5, Operand(0x00001000)),
           "e2254a01       eor r4, r5, #4096");
   COMPARE(eor(r4, r4, Operand(0x00010000), LeaveCC),
           "e2244801       eor r4, r4, #65536");
   COMPARE(eor(r4, r3, Operand(0x00100000), SetCC),
           "e2334601       eors r4, r3, #1048576");
   COMPARE(eor(r4, r2, Operand(0x01000000), LeaveCC, cs),
           "22224401       eorcs r4, r2, #16777216");
   COMPARE(eor(r4, r1, Operand(0x10000000), SetCC, cc),
           "32314201       eorccs r4, r1, #268435456");
 
-  OUTPUT();
+  VERIFY_RUN();
 }