Skip to content

V
V8
Commit 27589107 authored by svenpanne@chromium.org's avatar svenpanne@chromium.org
Browse files
Options

Cleaned up and fixed code comment handling a bit. 

* Let GCC check the arguments of LCodeGen::Coment.
* Fixed a few call sites.
* Made basic blocks a little bit more visible in the code output.
* Sorted #includes.

Review URL: https://codereview.chromium.org/14079007

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14331 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 373bdbc9
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 35 deletions
src/arm/lithium-codegen-arm.cc
View file @ 27589107
...@@ -304,7 +304,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -304,7 +304,7 @@ bool LCodeGen::GenerateDeferredCode() {
LDeferredCode* code = deferred_[i]; LDeferredCode* code = deferred_[i];
__ bind(code->entry()); __ bind(code->entry());
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred build frame", Comment(";;; Deferred build frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(!frame_is_built_); ASSERT(!frame_is_built_);
...@@ -320,7 +320,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -320,7 +320,7 @@ bool LCodeGen::GenerateDeferredCode() {
code->instr()->Mnemonic()); code->instr()->Mnemonic());
code->Generate(); code->Generate();
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred destroy frame", Comment(";;; Deferred destroy frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(frame_is_built_); ASSERT(frame_is_built_);
...@@ -1043,11 +1043,9 @@ void LCodeGen::RecordPosition(int position) { ...@@ -1043,11 +1043,9 @@ void LCodeGen::RecordPosition(int position) {
void LCodeGen::DoLabel(LLabel* label) { void LCodeGen::DoLabel(LLabel* label) {
if (label->is_loop_header()) { Comment(";;; -------------------- B%d%s --------------------",
Comment(";;; B%d - LOOP entry", label->block_id()); label->block_id(),
} else { label->is_loop_header() ? " (loop header)" : "");
Comment(";;; B%d", label->block_id());
}
__ bind(label->label()); __ bind(label->label());
current_block_ = label->block_id(); current_block_ = label->block_id();
DoGap(label); DoGap(label);
......
src/arm/lithium-codegen-arm.h
View file @ 27589107
...@@ -29,10 +29,12 @@ ...@@ -29,10 +29,12 @@
#define V8_ARM_LITHIUM_CODEGEN_ARM_H_ #define V8_ARM_LITHIUM_CODEGEN_ARM_H_
#include "arm/lithium-arm.h" #include "arm/lithium-arm.h"
#include "arm/lithium-gap-resolver-arm.h" #include "arm/lithium-gap-resolver-arm.h"
#include "deoptimizer.h" #include "deoptimizer.h"
#include "safepoint-table.h" #include "safepoint-table.h"
#include "scopes.h" #include "scopes.h"
#include "v8utils.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -211,7 +213,7 @@ class LCodeGen BASE_EMBEDDED { ...@@ -211,7 +213,7 @@ class LCodeGen BASE_EMBEDDED {
int GetStackSlotCount() const { return chunk()->spill_slot_count(); } int GetStackSlotCount() const { return chunk()->spill_slot_count(); }
void Abort(const char* reason); void Abort(const char* reason);
void Comment(const char* format, ...); void FPRINTF_CHECKING Comment(const char* format, ...);
void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); } void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); }
......
src/ia32/lithium-codegen-ia32.cc
View file @ 27589107
...@@ -467,7 +467,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -467,7 +467,7 @@ bool LCodeGen::GenerateDeferredCode() {
LDeferredCode* code = deferred_[i]; LDeferredCode* code = deferred_[i];
__ bind(code->entry()); __ bind(code->entry());
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred build frame", Comment(";;; Deferred build frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(!frame_is_built_); ASSERT(!frame_is_built_);
...@@ -484,7 +484,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -484,7 +484,7 @@ bool LCodeGen::GenerateDeferredCode() {
code->instr()->Mnemonic()); code->instr()->Mnemonic());
code->Generate(); code->Generate();
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred destroy frame", Comment(";;; Deferred destroy frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(frame_is_built_); ASSERT(frame_is_built_);
...@@ -1126,11 +1126,9 @@ void LCodeGen::RecordPosition(int position) { ...@@ -1126,11 +1126,9 @@ void LCodeGen::RecordPosition(int position) {
void LCodeGen::DoLabel(LLabel* label) { void LCodeGen::DoLabel(LLabel* label) {
if (label->is_loop_header()) { Comment(";;; -------------------- B%d%s --------------------",
Comment(";;; B%d - LOOP entry", label->block_id()); label->block_id(),
} else { label->is_loop_header() ? " (loop header)" : "");
Comment(";;; B%d", label->block_id());
}
__ bind(label->label()); __ bind(label->label());
current_block_ = label->block_id(); current_block_ = label->block_id();
DoGap(label); DoGap(label);
......
src/ia32/lithium-codegen-ia32.h
View file @ 27589107
...@@ -32,9 +32,10 @@ ...@@ -32,9 +32,10 @@
#include "checks.h" #include "checks.h"
#include "deoptimizer.h" #include "deoptimizer.h"
#include "ia32/lithium-gap-resolver-ia32.h"
#include "safepoint-table.h" #include "safepoint-table.h"
#include "scopes.h" #include "scopes.h"
#include "ia32/lithium-gap-resolver-ia32.h" #include "v8utils.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -201,7 +202,7 @@ class LCodeGen BASE_EMBEDDED { ...@@ -201,7 +202,7 @@ class LCodeGen BASE_EMBEDDED {
int GetStackSlotCount() const { return chunk()->spill_slot_count(); } int GetStackSlotCount() const { return chunk()->spill_slot_count(); }
void Abort(const char* reason); void Abort(const char* reason);
void Comment(const char* format, ...); void FPRINTF_CHECKING Comment(const char* format, ...);
void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); } void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); }
......
src/mips/lithium-codegen-mips.cc
View file @ 27589107
...@@ -301,7 +301,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -301,7 +301,7 @@ bool LCodeGen::GenerateDeferredCode() {
LDeferredCode* code = deferred_[i]; LDeferredCode* code = deferred_[i];
__ bind(code->entry()); __ bind(code->entry());
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred build frame", Comment(";;; Deferred build frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(!frame_is_built_); ASSERT(!frame_is_built_);
...@@ -317,7 +317,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -317,7 +317,7 @@ bool LCodeGen::GenerateDeferredCode() {
code->instr()->Mnemonic()); code->instr()->Mnemonic());
code->Generate(); code->Generate();
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred destroy frame", Comment(";;; Deferred destroy frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(frame_is_built_); ASSERT(frame_is_built_);
...@@ -1024,11 +1024,9 @@ void LCodeGen::RecordPosition(int position) { ...@@ -1024,11 +1024,9 @@ void LCodeGen::RecordPosition(int position) {
void LCodeGen::DoLabel(LLabel* label) { void LCodeGen::DoLabel(LLabel* label) {
if (label->is_loop_header()) { Comment(";;; -------------------- B%d%s --------------------",
Comment(";;; B%d - LOOP entry", label->block_id()); label->block_id(),
} else { label->is_loop_header() ? " (loop header)" : "");
Comment(";;; B%d", label->block_id());
}
__ bind(label->label()); __ bind(label->label());
current_block_ = label->block_id(); current_block_ = label->block_id();
DoGap(label); DoGap(label);
......
src/mips/lithium-codegen-mips.h
View file @ 27589107
...@@ -28,11 +28,12 @@ ...@@ -28,11 +28,12 @@
#ifndef V8_MIPS_LITHIUM_CODEGEN_MIPS_H_ #ifndef V8_MIPS_LITHIUM_CODEGEN_MIPS_H_
#define V8_MIPS_LITHIUM_CODEGEN_MIPS_H_ #define V8_MIPS_LITHIUM_CODEGEN_MIPS_H_
#include "mips/lithium-mips.h"
#include "mips/lithium-gap-resolver-mips.h"
#include "deoptimizer.h" #include "deoptimizer.h"
#include "mips/lithium-gap-resolver-mips.h"
#include "mips/lithium-mips.h"
#include "safepoint-table.h" #include "safepoint-table.h"
#include "scopes.h" #include "scopes.h"
#include "v8utils.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -207,7 +208,7 @@ class LCodeGen BASE_EMBEDDED { ...@@ -207,7 +208,7 @@ class LCodeGen BASE_EMBEDDED {
int GetStackSlotCount() const { return chunk()->spill_slot_count(); } int GetStackSlotCount() const { return chunk()->spill_slot_count(); }
void Abort(const char* reason); void Abort(const char* reason);
void Comment(const char* format, ...); void FPRINTF_CHECKING Comment(const char* format, ...);
void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); } void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); }
......
src/x64/lithium-codegen-x64.cc
View file @ 27589107
...@@ -370,7 +370,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -370,7 +370,7 @@ bool LCodeGen::GenerateDeferredCode() {
LDeferredCode* code = deferred_[i]; LDeferredCode* code = deferred_[i];
__ bind(code->entry()); __ bind(code->entry());
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred build frame", Comment(";;; Deferred build frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(!frame_is_built_); ASSERT(!frame_is_built_);
...@@ -387,7 +387,7 @@ bool LCodeGen::GenerateDeferredCode() { ...@@ -387,7 +387,7 @@ bool LCodeGen::GenerateDeferredCode() {
code->instr()->Mnemonic()); code->instr()->Mnemonic());
code->Generate(); code->Generate();
if (NeedsDeferredFrame()) { if (NeedsDeferredFrame()) {
Comment(";;; Deferred destroy frame", Comment(";;; Deferred destroy frame @%d: %s.",
code->instruction_index(), code->instruction_index(),
code->instr()->Mnemonic()); code->instr()->Mnemonic());
ASSERT(frame_is_built_); ASSERT(frame_is_built_);
...@@ -926,11 +926,9 @@ void LCodeGen::RecordPosition(int position) { ...@@ -926,11 +926,9 @@ void LCodeGen::RecordPosition(int position) {
void LCodeGen::DoLabel(LLabel* label) { void LCodeGen::DoLabel(LLabel* label) {
if (label->is_loop_header()) { Comment(";;; -------------------- B%d%s --------------------",
Comment(";;; B%d - LOOP entry", label->block_id()); label->block_id(),
} else { label->is_loop_header() ? " (loop header)" : "");
Comment(";;; B%d", label->block_id());
}
__ bind(label->label()); __ bind(label->label());
current_block_ = label->block_id(); current_block_ = label->block_id();
DoGap(label); DoGap(label);
......
src/x64/lithium-codegen-x64.h
View file @ 27589107
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "deoptimizer.h" #include "deoptimizer.h"
#include "safepoint-table.h" #include "safepoint-table.h"
#include "scopes.h" #include "scopes.h"
#include "v8utils.h"
#include "x64/lithium-gap-resolver-x64.h" #include "x64/lithium-gap-resolver-x64.h"
namespace v8 { namespace v8 {
...@@ -172,7 +173,7 @@ class LCodeGen BASE_EMBEDDED { ...@@ -172,7 +173,7 @@ class LCodeGen BASE_EMBEDDED {
int GetStackSlotCount() const { return chunk()->spill_slot_count(); } int GetStackSlotCount() const { return chunk()->spill_slot_count(); }
void Abort(const char* reason); void Abort(const char* reason);
void Comment(const char* format, ...); void FPRINTF_CHECKING Comment(const char* format, ...);
void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); } void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment