Factor out a commonly used code sequence to DropAndMove(Location, Register)

Review URL: http://codereview.chromium.org/337060

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3156 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/arm/fast-codegen-arm.cc b/src/arm/fast-codegen-arm.cc
index e1a4ba51d299dd02e4d4720f4c1844da1caa86c8..fc5deb6068803356ce2ae4e0e0f29a015d068a44 100644 (file)
--- a/src/arm/fast-codegen-arm.cc
+++ b/src/arm/fast-codegen-arm.cc
@@ -153,6 +153,18 @@ void FastCodeGenerator::Move(Slot* destination, Location source) {
 }
 
 
+void FastCodeGenerator::DropAndMove(Location destination, Register source) {
+  switch (destination.type()) {
+    case Location::NOWHERE:
+      __ pop();
+      break;
+    case Location::TEMP:
+      __ str(source, MemOperand(sp));
+      break;
+  }
+}
+
+
 void FastCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
   // Call the runtime to declare the globals.
   // The context is the first argument.
@@ -219,16 +231,7 @@ void FastCodeGenerator::VisitVariableProxy(VariableProxy* expr) {
     __ mov(r2, Operand(expr->name()));
     Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
     __ Call(ic, RelocInfo::CODE_TARGET_CONTEXT);
-    switch (expr->location().type()) {
-      case Location::NOWHERE:
-        __ pop();
-        break;
-      case Location::TEMP:
-        // Replace the global object with the result.
-        __ str(r0, MemOperand(sp));
-        break;
-    }
-
+    DropAndMove(expr->location(), r0);
   } else {
     Comment cmnt(masm_, "Stack slot");
     Move(expr->location(), rewrite->AsSlot());
@@ -456,15 +459,7 @@ void FastCodeGenerator::VisitAssignment(Assignment* expr) {
     Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
     __ Call(ic, RelocInfo::CODE_TARGET);
     // Overwrite the global object on the stack with the result if needed.
-    switch (expr->location().type()) {
-      case Location::NOWHERE:
-        __ pop();
-        break;
-      case Location::TEMP:
-        __ str(r0, MemOperand(sp));
-        break;
-    }
-
+    DropAndMove(expr->location(), r0);
   } else {
     // Local or parameter assignment.
 
@@ -561,14 +556,7 @@ void FastCodeGenerator::VisitCall(Call* expr) {
   __ Call(ic, RelocInfo::CODE_TARGET_CONTEXT);
   // Restore context register.
   __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
-  switch (expr->location().type()) {
-    case Location::NOWHERE:
-      __ pop();
-      break;
-    case Location::TEMP:
-      __ str(r0, MemOperand(sp));
-      break;
-  }
+  DropAndMove(expr->location(), r0);
 }
 
 
@@ -607,14 +595,7 @@ void FastCodeGenerator::VisitCallNew(CallNew* node) {
   __ Call(construct_builtin, RelocInfo::CONSTRUCT_CALL);
 
   // Replace function on TOS with result in r0, or pop it.
-  switch (node->location().type()) {
-    case Location::TEMP:
-      __ str(r0, MemOperand(sp, 0));
-      break;
-    case Location::NOWHERE:
-      __ pop();
-      break;
-  }
+  DropAndMove(node->location(), r0);
 }
 
 

diff --git a/src/fast-codegen.h b/src/fast-codegen.h
index c50239294fa115fd5cb8b0fe3d27bcae91c16347..a718157b3586f3842637e17faa3e572ac06b8ecd 100644 (file)
--- a/src/fast-codegen.h
+++ b/src/fast-codegen.h
@@ -60,6 +60,10 @@ class FastCodeGenerator: public AstVisitor {
   void Move(Register destination, Location source);
   void Move(Slot* destination, Location source);
 
+  // Drop the TOS, and store source to destination.
+  // If destination is TOS, just overwrite TOS with source.
+  void DropAndMove(Location destination, Register source);
+
   void VisitDeclarations(ZoneList<Declaration*>* declarations);
   Handle<JSFunction> BuildBoilerplate(FunctionLiteral* fun);
   void DeclareGlobals(Handle<FixedArray> pairs);

diff --git a/src/ia32/fast-codegen-ia32.cc b/src/ia32/fast-codegen-ia32.cc
index 5dd1332c3238fa4fdfc2a379c471017715091f65..cd3d02ff89ccca675a2939ebc17a7a6209bcc0ac 100644 (file)
--- a/src/ia32/fast-codegen-ia32.cc
+++ b/src/ia32/fast-codegen-ia32.cc
@@ -141,6 +141,18 @@ void FastCodeGenerator::Move(Slot* destination, Location source) {
 }
 
 
+void FastCodeGenerator::DropAndMove(Location destination, Register source) {
+  switch (destination.type()) {
+    case Location::NOWHERE:
+      __ add(Operand(esp), Immediate(kPointerSize));
+      break;
+    case Location::TEMP:
+      __ mov(Operand(esp, 0), source);
+      break;
+  }
+}
+
+
 void FastCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
   // Call the runtime to declare the globals.
   __ push(esi);  // The context is the first argument.
@@ -211,16 +223,7 @@ void FastCodeGenerator::VisitVariableProxy(VariableProxy* expr) {
     // (eg, push/pop elimination).
     __ nop();
 
-    switch (expr->location().type()) {
-      case Location::NOWHERE:
-        __ add(Operand(esp), Immediate(kPointerSize));
-        break;
-      case Location::TEMP:
-        // Replace the global object with the result.
-        __ mov(Operand(esp, 0), eax);
-        break;
-    }
-
+    DropAndMove(expr->location(), eax);
   } else {
     Comment cmnt(masm_, "Stack slot");
     Move(expr->location(), rewrite->AsSlot());
@@ -455,14 +458,7 @@ void FastCodeGenerator::VisitAssignment(Assignment* expr) {
     Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
     __ call(ic, RelocInfo::CODE_TARGET);
     // Overwrite the global object on the stack with the result if needed.
-    switch (expr->location().type()) {
-      case Location::NOWHERE:
-        __ add(Operand(esp), Immediate(kPointerSize));
-        break;
-      case Location::TEMP:
-        __ mov(Operand(esp, 0), eax);
-        break;
-    }
+    DropAndMove(expr->location(), eax);
   } else {
     // Local or parameter assignment.
 
@@ -557,14 +553,7 @@ void FastCodeGenerator::VisitCall(Call* expr) {
   // Restore context register.
   __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
   // Discard the function left on TOS.
-  switch (expr->location().type()) {
-    case Location::NOWHERE:
-      __ add(Operand(esp), Immediate(kPointerSize));
-      break;
-    case Location::TEMP:
-      __ mov(Operand(esp, 0), eax);
-      break;
-  }
+  DropAndMove(expr->location(), eax);
 }
 
 
@@ -603,14 +592,7 @@ void FastCodeGenerator::VisitCallNew(CallNew* node) {
   __ call(construct_builtin, RelocInfo::CONSTRUCT_CALL);
 
   // Replace function on TOS with result in eax, or pop it.
-  switch (node->location().type()) {
-    case Location::TEMP:
-      __ mov(Operand(esp, 0), eax);
-      break;
-    case Location::NOWHERE:
-      __ add(Operand(esp), Immediate(kPointerSize));
-      break;
-  }
+  DropAndMove(node->location(), eax);
 }
 
 

diff --git a/src/x64/fast-codegen-x64.cc b/src/x64/fast-codegen-x64.cc
index dc87ef3277cbabaab62a99c584132dde25d14624..98e72e2584931c7c7bc59ae30a63877d238ac4ec 100644 (file)
--- a/src/x64/fast-codegen-x64.cc
+++ b/src/x64/fast-codegen-x64.cc
@@ -149,6 +149,18 @@ void FastCodeGenerator::Move(Slot* destination, Location source) {
 }
 
 
+void FastCodeGenerator::DropAndMove(Location destination, Register source) {
+  switch (destination.type()) {
+    case Location::NOWHERE:
+      __ addq(rsp, Immediate(kPointerSize));
+      break;
+    case Location::TEMP:
+      __ movq(Operand(rsp, 0), source);
+      break;
+  }
+}
+
+
 void FastCodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
   // Call the runtime to declare the globals.
   __ push(rsi);  // The context is the first argument.
@@ -226,16 +238,7 @@ void FastCodeGenerator::VisitVariableProxy(VariableProxy* expr) {
     // A test rax instruction following the call is used by the IC to
     // indicate that the inobject property case was inlined.  Ensure there
     // is no test rax instruction here.
-    switch (expr->location().type()) {
-      case Location::NOWHERE:
-        __ addq(rsp, Immediate(kPointerSize));
-        break;
-      case Location::TEMP:
-        // Replace the global object with the result.
-        __ movq(Operand(rsp, 0), rax);
-        break;
-    }
-
+    DropAndMove(expr->location(), rax);
   } else {
     Comment cmnt(masm_, "Stack slot");
     Move(expr->location(), rewrite->AsSlot());
@@ -468,14 +471,7 @@ void FastCodeGenerator::VisitAssignment(Assignment* expr) {
     Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
     __ Call(ic, RelocInfo::CODE_TARGET);
     // Overwrite the global object on the stack with the result if needed.
-    switch (expr->location().type()) {
-      case Location::NOWHERE:
-        __ addq(rsp, Immediate(kPointerSize));
-        break;
-      case Location::TEMP:
-        __ movq(Operand(rsp, 0), rax);
-        break;
-    }
+    DropAndMove(expr->location(), rax);
   } else {
     // Local or parameter assignment.
 
@@ -570,14 +566,7 @@ void FastCodeGenerator::VisitCall(Call* expr) {
   // Restore context register.
   __ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));
   // Discard the function left on TOS.
-  switch (expr->location().type()) {
-    case Location::NOWHERE:
-      __ addq(rsp, Immediate(kPointerSize));
-      break;
-    case Location::TEMP:
-      __ movq(Operand(rsp, 0), rax);
-      break;
-  }
+  DropAndMove(expr->location(), rax);
 }
 
 
@@ -617,14 +606,7 @@ void FastCodeGenerator::VisitCallNew(CallNew* node) {
   __ Call(construct_builtin, RelocInfo::CONSTRUCT_CALL);
 
   // Replace function on TOS with result in rax, or pop it.
-  switch (node->location().type()) {
-    case Location::TEMP:
-      __ movq(Operand(rsp, 0), rax);
-      break;
-    case Location::NOWHERE:
-      __ addq(rsp, Immediate(kPointerSize));
-      break;
-  }
+  DropAndMove(node->location(), rax);
 }