AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

ARM: Remove LoadConditionAndSpill and VisitAndSpill.

Browse Source 
Review URL: http://codereview.chromium.org/2414001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4753 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
erik.corry@gmail.com 2010-05-31 08:52:57 +00:00
parent 63e79f5f68
commit 44cfbe392c
3 changed files with 32 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/arm/codegen-arm-inl.h
View File

@ -36,24 +36,6 @@ namespace internal {
#define __ ACCESS_MASM(masm_) #define __ ACCESS_MASM(masm_)
void CodeGenerator::LoadConditionAndSpill(Expression* expression,
JumpTarget* true_target,
JumpTarget* false_target,
bool force_control) {
LoadCondition(expression, true_target, false_target, force_control);
}
void CodeGenerator::VisitAndSpill(Statement* statement) {
Visit(statement);
}
void CodeGenerator::VisitStatementsAndSpill(ZoneList<Statement*>* statements) {
VisitStatements(statements);
}
// Platform-specific inline functions. // Platform-specific inline functions.
void DeferredCode::Jump() { __ jmp(&entry_label_); } void DeferredCode::Jump() { __ jmp(&entry_label_); }

81
src/arm/codegen-arm.cc
View File

@ -321,7 +321,7 @@ void CodeGenerator::Generate(CompilationInfo* info) {
// Ignore the return value. // Ignore the return value.
} }
#endif #endif
VisitStatementsAndSpill(info->function()->body()); VisitStatements(info->function()->body());
} }
} }
@ -1566,7 +1566,7 @@ void CodeGenerator::VisitStatements(ZoneList<Statement*>* statements) {
#endif #endif
VirtualFrame::SpilledScope spilled_scope(frame_); VirtualFrame::SpilledScope spilled_scope(frame_);
for (int i = 0; frame_ != NULL && i < statements->length(); i++) { for (int i = 0; frame_ != NULL && i < statements->length(); i++) {
VisitAndSpill(statements->at(i)); Visit(statements->at(i));
} }
ASSERT(!has_valid_frame() || frame_->height() == original_height); ASSERT(!has_valid_frame() || frame_->height() == original_height);
} }
@ -1580,7 +1580,7 @@ void CodeGenerator::VisitBlock(Block* node) {
Comment cmnt(masm_, "[ Block"); Comment cmnt(masm_, "[ Block");
CodeForStatementPosition(node); CodeForStatementPosition(node);
node->break_target()->SetExpectedHeight(); node->break_target()->SetExpectedHeight();
VisitStatementsAndSpill(node->statements()); VisitStatements(node->statements());
if (node->break_target()->is_linked()) { if (node->break_target()->is_linked()) {
node->break_target()->Bind(); node->break_target()->Bind();
} }
@ -1695,7 +1695,6 @@ void CodeGenerator::VisitIfStatement(IfStatement* node) {
#ifdef DEBUG #ifdef DEBUG
int original_height = frame_->height(); int original_height = frame_->height();
#endif #endif
VirtualFrame::SpilledScope spilled_scope(frame_);
Comment cmnt(masm_, "[ IfStatement"); Comment cmnt(masm_, "[ IfStatement");
// Generate different code depending on which parts of the if statement // Generate different code depending on which parts of the if statement
// are present or not. // are present or not.
@ -1710,14 +1709,14 @@ void CodeGenerator::VisitIfStatement(IfStatement* node) {
JumpTarget then; JumpTarget then;
JumpTarget else_; JumpTarget else_;
// if (cond) // if (cond)
LoadConditionAndSpill(node->condition(), &then, &else_, true); LoadCondition(node->condition(), &then, &else_, true);
if (frame_ != NULL) { if (frame_ != NULL) {
Branch(false, &else_); Branch(false, &else_);
} }
// then // then
if (frame_ != NULL || then.is_linked()) { if (frame_ != NULL || then.is_linked()) {
then.Bind(); then.Bind();
VisitAndSpill(node->then_statement()); Visit(node->then_statement());
} }
if (frame_ != NULL) { if (frame_ != NULL) {
exit.Jump(); exit.Jump();
@ -1725,7 +1724,7 @@ void CodeGenerator::VisitIfStatement(IfStatement* node) {
// else // else
if (else_.is_linked()) { if (else_.is_linked()) {
else_.Bind(); else_.Bind();
VisitAndSpill(node->else_statement()); Visit(node->else_statement());
} }
} else if (has_then_stm) { } else if (has_then_stm) {
@ -1733,14 +1732,14 @@ void CodeGenerator::VisitIfStatement(IfStatement* node) {
ASSERT(!has_else_stm); ASSERT(!has_else_stm);
JumpTarget then; JumpTarget then;
// if (cond) // if (cond)
LoadConditionAndSpill(node->condition(), &then, &exit, true); LoadCondition(node->condition(), &then, &exit, true);
if (frame_ != NULL) { if (frame_ != NULL) {
Branch(false, &exit); Branch(false, &exit);
} }
// then // then
if (frame_ != NULL || then.is_linked()) { if (frame_ != NULL || then.is_linked()) {
then.Bind(); then.Bind();
VisitAndSpill(node->then_statement()); Visit(node->then_statement());
} }
} else if (has_else_stm) { } else if (has_else_stm) {
@ -1748,21 +1747,21 @@ void CodeGenerator::VisitIfStatement(IfStatement* node) {
ASSERT(!has_then_stm); ASSERT(!has_then_stm);
JumpTarget else_; JumpTarget else_;
// if (!cond) // if (!cond)
LoadConditionAndSpill(node->condition(), &exit, &else_, true); LoadCondition(node->condition(), &exit, &else_, true);
if (frame_ != NULL) { if (frame_ != NULL) {
Branch(true, &exit); Branch(true, &exit);
} }
// else // else
if (frame_ != NULL || else_.is_linked()) { if (frame_ != NULL || else_.is_linked()) {
else_.Bind(); else_.Bind();
VisitAndSpill(node->else_statement()); Visit(node->else_statement());
} }
} else { } else {
Comment cmnt(masm_, "[ If"); Comment cmnt(masm_, "[ If");
ASSERT(!has_then_stm && !has_else_stm); ASSERT(!has_then_stm && !has_else_stm);
// if (cond) // if (cond)
LoadConditionAndSpill(node->condition(), &exit, &exit, false); LoadCondition(node->condition(), &exit, &exit, false);
if (frame_ != NULL) { if (frame_ != NULL) {
if (has_cc()) { if (has_cc()) {
cc_reg_ = al; cc_reg_ = al;
@ -1905,7 +1904,7 @@ void CodeGenerator::VisitSwitchStatement(SwitchStatement* node) {
fall_through.Bind(); fall_through.Bind();
fall_through.Unuse(); fall_through.Unuse();
} }
VisitStatementsAndSpill(clause->statements()); VisitStatements(clause->statements());
// If control flow can fall through from the body, jump to the next body // If control flow can fall through from the body, jump to the next body
// or the end of the statement. // or the end of the statement.
@ -1926,7 +1925,7 @@ void CodeGenerator::VisitSwitchStatement(SwitchStatement* node) {
if (default_clause != NULL) { if (default_clause != NULL) {
Comment cmnt(masm_, "[ Default clause"); Comment cmnt(masm_, "[ Default clause");
default_entry.Bind(); default_entry.Bind();
VisitStatementsAndSpill(default_clause->statements()); VisitStatements(default_clause->statements());
// If control flow can fall out of the default and there is a case after // If control flow can fall out of the default and there is a case after
// it, jup to that case's body. // it, jup to that case's body.
if (frame_ != NULL && default_exit.is_bound()) { if (frame_ != NULL && default_exit.is_bound()) {
@ -1976,7 +1975,7 @@ void CodeGenerator::VisitDoWhileStatement(DoWhileStatement* node) {
} }
CheckStack(); // TODO(1222600): ignore if body contains calls. CheckStack(); // TODO(1222600): ignore if body contains calls.
VisitAndSpill(node->body()); Visit(node->body());
// Compile the test. // Compile the test.
switch (info) { switch (info) {
@ -2003,7 +2002,7 @@ void CodeGenerator::VisitDoWhileStatement(DoWhileStatement* node) {
if (has_valid_frame()) { if (has_valid_frame()) {
Comment cmnt(masm_, "[ DoWhileCondition"); Comment cmnt(masm_, "[ DoWhileCondition");
CodeForDoWhileConditionPosition(node); CodeForDoWhileConditionPosition(node);
LoadConditionAndSpill(node->cond(), &body, node->break_target(), true); LoadCondition(node->cond(), &body, node->break_target(), true);
if (has_valid_frame()) { if (has_valid_frame()) {
// A invalid frame here indicates that control did not // A invalid frame here indicates that control did not
// fall out of the test expression. // fall out of the test expression.
@ -2044,7 +2043,7 @@ void CodeGenerator::VisitWhileStatement(WhileStatement* node) {
if (info == DONT_KNOW) { if (info == DONT_KNOW) {
JumpTarget body; JumpTarget body;
LoadConditionAndSpill(node->cond(), &body, node->break_target(), true); LoadCondition(node->cond(), &body, node->break_target(), true);
if (has_valid_frame()) { if (has_valid_frame()) {
// A NULL frame indicates that control did not fall out of the // A NULL frame indicates that control did not fall out of the
// test expression. // test expression.
@ -2057,7 +2056,7 @@ void CodeGenerator::VisitWhileStatement(WhileStatement* node) {
if (has_valid_frame()) { if (has_valid_frame()) {
CheckStack(); // TODO(1222600): ignore if body contains calls. CheckStack(); // TODO(1222600): ignore if body contains calls.
VisitAndSpill(node->body()); Visit(node->body());
// If control flow can fall out of the body, jump back to the top. // If control flow can fall out of the body, jump back to the top.
if (has_valid_frame()) { if (has_valid_frame()) {
@ -2080,7 +2079,7 @@ void CodeGenerator::VisitForStatement(ForStatement* node) {
Comment cmnt(masm_, "[ ForStatement"); Comment cmnt(masm_, "[ ForStatement");
CodeForStatementPosition(node); CodeForStatementPosition(node);
if (node->init() != NULL) { if (node->init() != NULL) {
VisitAndSpill(node->init()); Visit(node->init());
} }
// If the test is never true there is no need to compile the test or // If the test is never true there is no need to compile the test or
@ -2105,7 +2104,7 @@ void CodeGenerator::VisitForStatement(ForStatement* node) {
// If the test is always true, there is no need to compile it. // If the test is always true, there is no need to compile it.
if (info == DONT_KNOW) { if (info == DONT_KNOW) {
JumpTarget body; JumpTarget body;
LoadConditionAndSpill(node->cond(), &body, node->break_target(), true); LoadCondition(node->cond(), &body, node->break_target(), true);
if (has_valid_frame()) { if (has_valid_frame()) {
Branch(false, node->break_target()); Branch(false, node->break_target());
} }
@ -2116,7 +2115,7 @@ void CodeGenerator::VisitForStatement(ForStatement* node) {
if (has_valid_frame()) { if (has_valid_frame()) {
CheckStack(); // TODO(1222600): ignore if body contains calls. CheckStack(); // TODO(1222600): ignore if body contains calls.
VisitAndSpill(node->body()); Visit(node->body());
if (node->next() == NULL) { if (node->next() == NULL) {
// If there is no update statement and control flow can fall out // If there is no update statement and control flow can fall out
@ -2136,7 +2135,7 @@ void CodeGenerator::VisitForStatement(ForStatement* node) {
// after the code for the body actually belongs to the loop // after the code for the body actually belongs to the loop
// statement and not the body. // statement and not the body.
CodeForStatementPosition(node); CodeForStatementPosition(node);
VisitAndSpill(node->next()); Visit(node->next());
loop.Jump(); loop.Jump();
} }
} }
@ -2357,7 +2356,7 @@ void CodeGenerator::VisitForInStatement(ForInStatement* node) {
} }
// Body. // Body.
CheckStack(); // TODO(1222600): ignore if body contains calls. CheckStack(); // TODO(1222600): ignore if body contains calls.
VisitAndSpill(node->body()); Visit(node->body());
// Next. Reestablish a spilled frame in case we are coming here via // Next. Reestablish a spilled frame in case we are coming here via
// a continue in the body. // a continue in the body.
@ -2404,7 +2403,7 @@ void CodeGenerator::VisitTryCatchStatement(TryCatchStatement* node) {
// Remove the exception from the stack. // Remove the exception from the stack.
frame_->Drop(); frame_->Drop();
VisitStatementsAndSpill(node->catch_block()->statements()); VisitStatements(node->catch_block()->statements());
if (frame_ != NULL) { if (frame_ != NULL) {
exit.Jump(); exit.Jump();
} }
@ -2439,7 +2438,7 @@ void CodeGenerator::VisitTryCatchStatement(TryCatchStatement* node) {
} }
// Generate code for the statements in the try block. // Generate code for the statements in the try block.
VisitStatementsAndSpill(node->try_block()->statements()); VisitStatements(node->try_block()->statements());
// Stop the introduced shadowing and count the number of required unlinks. // Stop the introduced shadowing and count the number of required unlinks.
// After shadowing stops, the original labels are unshadowed and the // After shadowing stops, the original labels are unshadowed and the
@ -2553,7 +2552,7 @@ void CodeGenerator::VisitTryFinallyStatement(TryFinallyStatement* node) {
} }
// Generate code for the statements in the try block. // Generate code for the statements in the try block.
VisitStatementsAndSpill(node->try_block()->statements()); VisitStatements(node->try_block()->statements());
// Stop the introduced shadowing and count the number of required unlinks. // Stop the introduced shadowing and count the number of required unlinks.
// After shadowing stops, the original labels are unshadowed and the // After shadowing stops, the original labels are unshadowed and the
@ -2643,7 +2642,7 @@ void CodeGenerator::VisitTryFinallyStatement(TryFinallyStatement* node) {
// and the state - while evaluating the finally block. // and the state - while evaluating the finally block.
// //
// Generate code for the statements in the finally block. // Generate code for the statements in the finally block.
VisitStatementsAndSpill(node->finally_block()->statements()); VisitStatements(node->finally_block()->statements());
if (has_valid_frame()) { if (has_valid_frame()) {
// Restore state and return value or faked TOS. // Restore state and return value or faked TOS.
@ -2758,7 +2757,7 @@ void CodeGenerator::VisitConditional(Conditional* node) {
Comment cmnt(masm_, "[ Conditional"); Comment cmnt(masm_, "[ Conditional");
JumpTarget then; JumpTarget then;
JumpTarget else_; JumpTarget else_;
LoadConditionAndSpill(node->condition(), &then, &else_, true); LoadCondition(node->condition(), &then, &else_, true);
if (has_valid_frame()) { if (has_valid_frame()) {
Branch(false, &else_); Branch(false, &else_);
} }
@ -4056,7 +4055,6 @@ void CodeGenerator::GenerateLog(ZoneList<Expression*>* args) {
if (ShouldGenerateLog(args->at(0))) { if (ShouldGenerateLog(args->at(0))) {
Load(args->at(1)); Load(args->at(1));
Load(args->at(2)); Load(args->at(2));
frame_->SpillAll();
frame_->CallRuntime(Runtime::kLog, 2); frame_->CallRuntime(Runtime::kLog, 2);
} }
#endif #endif
@ -4954,10 +4952,7 @@ void CodeGenerator::VisitUnaryOperation(UnaryOperation* node) {
Token::Value op = node->op(); Token::Value op = node->op();
if (op == Token::NOT) { if (op == Token::NOT) {
LoadConditionAndSpill(node->expression(), LoadCondition(node->expression(), false_target(), true_target(), true);
false_target(),
true_target(),
true);
// LoadCondition may (and usually does) leave a test and branch to // LoadCondition may (and usually does) leave a test and branch to
// be emitted by the caller. In that case, negate the condition. // be emitted by the caller. In that case, negate the condition.
if (has_cc()) cc_reg_ = NegateCondition(cc_reg_); if (has_cc()) cc_reg_ = NegateCondition(cc_reg_);
@ -5200,10 +5195,7 @@ void CodeGenerator::GenerateLogicalBooleanOperation(BinaryOperation* node) {
VirtualFrame::SpilledScope spilled_scope(frame_); VirtualFrame::SpilledScope spilled_scope(frame_);
if (node->op() == Token::AND) { if (node->op() == Token::AND) {
JumpTarget is_true; JumpTarget is_true;
LoadConditionAndSpill(node->left(), LoadCondition(node->left(), &is_true, false_target(), false);
&is_true,
false_target(),
false);
if (has_valid_frame() && !has_cc()) { if (has_valid_frame() && !has_cc()) {
// The left-hand side result is on top of the virtual frame. // The left-hand side result is on top of the virtual frame.
JumpTarget pop_and_continue; JumpTarget pop_and_continue;
@ -5234,10 +5226,7 @@ void CodeGenerator::GenerateLogicalBooleanOperation(BinaryOperation* node) {
Branch(false, false_target()); Branch(false, false_target());
} }
is_true.Bind(); is_true.Bind();
LoadConditionAndSpill(node->right(), LoadCondition(node->right(), true_target(), false_target(), false);
true_target(),
false_target(),
false);
} else { } else {
// Nothing to do. // Nothing to do.
ASSERT(!has_valid_frame() && !has_cc() && !is_true.is_linked()); ASSERT(!has_valid_frame() && !has_cc() && !is_true.is_linked());
@ -5246,10 +5235,7 @@ void CodeGenerator::GenerateLogicalBooleanOperation(BinaryOperation* node) {
} else { } else {
ASSERT(node->op() == Token::OR); ASSERT(node->op() == Token::OR);
JumpTarget is_false; JumpTarget is_false;
LoadConditionAndSpill(node->left(), LoadCondition(node->left(), true_target(), &is_false, false);
true_target(),
&is_false,
false);
if (has_valid_frame() && !has_cc()) { if (has_valid_frame() && !has_cc()) {
// The left-hand side result is on top of the virtual frame. // The left-hand side result is on top of the virtual frame.
JumpTarget pop_and_continue; JumpTarget pop_and_continue;
@ -5280,10 +5266,7 @@ void CodeGenerator::GenerateLogicalBooleanOperation(BinaryOperation* node) {
Branch(true, true_target()); Branch(true, true_target());
} }
is_false.Bind(); is_false.Bind();
LoadConditionAndSpill(node->right(), LoadCondition(node->right(), true_target(), false_target(), false);
true_target(),
false_target(),
false);
} else { } else {
// Nothing to do. // Nothing to do.
ASSERT(!has_valid_frame() && !has_cc() && !is_false.is_linked()); ASSERT(!has_valid_frame() && !has_cc() && !is_false.is_linked());

18
src/arm/codegen-arm.h
View File

@ -257,16 +257,6 @@ class CodeGenerator: public AstVisitor {
AST_NODE_LIST(DEF_VISIT) AST_NODE_LIST(DEF_VISIT)
#undef DEF_VISIT #undef DEF_VISIT
// Visit a statement and then spill the virtual frame if control flow can
// reach the end of the statement (ie, it does not exit via break,
// continue, return, or throw). This function is used temporarily while
// the code generator is being transformed.
inline void VisitAndSpill(Statement* statement);
// Visit a list of statements and then spill the virtual frame if control
// flow can reach the end of the list.
inline void VisitStatementsAndSpill(ZoneList<Statement*>* statements);
// Main code generation function // Main code generation function
void Generate(CompilationInfo* info); void Generate(CompilationInfo* info);
@ -304,14 +294,6 @@ class CodeGenerator: public AstVisitor {
void LoadGlobal(); void LoadGlobal();
void LoadGlobalReceiver(Register scratch); void LoadGlobalReceiver(Register scratch);
// Call LoadCondition and then spill the virtual frame unless control flow
// cannot reach the end of the expression (ie, by emitting only
// unconditional jumps to the control targets).
inline void LoadConditionAndSpill(Expression* expression,
JumpTarget* true_target,
JumpTarget* false_target,
bool force_control);
// Read a value from a slot and leave it on top of the expression stack. // Read a value from a slot and leave it on top of the expression stack.
void LoadFromSlot(Slot* slot, TypeofState typeof_state); void LoadFromSlot(Slot* slot, TypeofState typeof_state);
void LoadFromSlotCheckForArguments(Slot* slot, TypeofState state); void LoadFromSlotCheckForArguments(Slot* slot, TypeofState state);