VM: Re-format to use at most one newline between functions

runtime/vm/disassembler.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/disassembler.h"
 
 #include "vm/assembler.h"
+#include "vm/code_patcher.h"
 #include "vm/deopt_instructions.h"
 #include "vm/globals.h"
 #include "vm/il_printer.h"
 #include "vm/instructions.h"
 #include "vm/json_stream.h"
 #include "vm/log.h"
 #include "vm/os.h"
-#include "vm/code_patcher.h"
-
 
 namespace dart {
 
 #ifndef PRODUCT
 
 DECLARE_FLAG(bool, trace_inlining_intervals);
 DEFINE_FLAG(bool, trace_source_positions, false, "Source position diagnostics");
 
 void DisassembleToStdout::ConsumeInstruction(const Code& code,
                                              char* hex_buffer,
@@ skipping 11 matching lines @@
       THR_Print(" ");
     }
   }
   THR_Print("%s", human_buffer);
   if (object != NULL) {
     THR_Print("   %s", object->ToCString());
   }
   THR_Print("\n");
 }
 
-
 void DisassembleToStdout::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
   THR_VPrint(format, args);
   va_end(args);
 }
 
-
 void DisassembleToJSONStream::ConsumeInstruction(const Code& code,
                                                  char* hex_buffer,
                                                  intptr_t hex_size,
                                                  char* human_buffer,
                                                  intptr_t human_size,
                                                  Object* object,
                                                  uword pc) {
   // Instructions are represented as four consecutive values in a JSON array.
   // The first is the address of the instruction, the second is the hex string,
   // of the code, and the third is a human readable string, and the fourth is
   // the object loaded by the instruction.
   jsarr_.AddValueF("%" Pp "", pc);
   jsarr_.AddValue(hex_buffer);
   jsarr_.AddValue(human_buffer);
 
   if (object != NULL) {
     jsarr_.AddValue(*object);
   } else {
     jsarr_.AddValueNull();  // Not a reference to null.
   }
 }
 
-
 void DisassembleToJSONStream::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len + 1));
   va_start(args, format);
   intptr_t len2 = OS::VSNPrint(p, len, format, args);
   va_end(args);
   ASSERT(len == len2);
   for (intptr_t i = 0; i < len; i++) {
     if (p[i] == '\n' || p[i] == '\r') {
       p[i] = ' ';
     }
   }
   // Instructions are represented as four consecutive values in a JSON array.
   // Comments only use the third slot. See above comment for more information.
   jsarr_.AddValueNull();
   jsarr_.AddValueNull();
   jsarr_.AddValue(p);
   jsarr_.AddValueNull();
   free(p);
 }
 
-
 void Disassembler::Disassemble(uword start,
                                uword end,
                                DisassemblyFormatter* formatter,
                                const Code& code) {
   const Code::Comments& comments =
       code.IsNull() ? Code::Comments::New(0) : code.comments();
   ASSERT(formatter != NULL);
   char hex_buffer[kHexadecimalBufferSize];  // Instruction in hexadecimal form.
   char human_buffer[kUserReadableBufferSize];  // Human-readable instruction.
   uword pc = start;
@@ skipping 37 matching lines @@
     DecodeInstruction(hex_buffer, sizeof(hex_buffer), human_buffer,
                       sizeof(human_buffer), &instruction_length, code, &object,
                       pc);
     formatter->ConsumeInstruction(code, hex_buffer, sizeof(hex_buffer),
                                   human_buffer, sizeof(human_buffer), object,
                                   pc);
     pc += instruction_length;
   }
 }
 
-
 void Disassembler::DisassembleCodeHelper(const char* function_fullname,
                                          const Code& code,
                                          bool optimized) {
   Zone* zone = Thread::Current()->zone();
   LocalVarDescriptors& var_descriptors = LocalVarDescriptors::Handle(zone);
   if (FLAG_print_variable_descriptors) {
     var_descriptors = code.GetLocalVarDescriptors();
   }
   THR_Print("Code for %sfunction '%s' {\n", optimized ? "optimized " : "",
             function_fullname);
@@ skipping 122 matching lines @@
     THR_Print("}\n");
   }
   if (optimized && FLAG_trace_inlining_intervals) {
     code.DumpInlineIntervals();
   }
   if (FLAG_trace_source_positions) {
     code.DumpSourcePositions();
   }
 }
 
-
 void Disassembler::DisassembleCode(const Function& function,
                                    const Code& code,
                                    bool optimized) {
   const char* function_fullname = function.ToFullyQualifiedCString();
   DisassembleCodeHelper(function_fullname, code, optimized);
 }
 
-
 #endif  // !PRODUCT
 
 }  // namespace dart