From cc271fe75173bd144158319d440564c7ccc142fe Mon Sep 17 00:00:00 2001
From: "whesse@chromium.org"
 <whesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 24 Jun 2009 13:48:09 +0000
Subject: [PATCH] X64 implementation: Start compiling native functions. Review
 URL: http://codereview.chromium.org/146083

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2265 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/bootstrapper.cc            | 5 +----
 src/x64/assembler-x64.cc       | 9 +++++++++
 src/x64/assembler-x64.h        | 1 +
 src/x64/codegen-x64.cc         | 6 ++++--
 src/x64/macro-assembler-x64.cc | 3 ++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 2dbc030..3810c6a 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -1113,11 +1113,8 @@ bool Genesis::InstallNatives() {
   }
 
 #ifdef V8_HOST_ARCH_64_BIT
-  // TODO(X64): Remove these tests when code generation works and is stable.
-  MacroAssembler::ConstructAndTestJSFunction();
+  // TODO(X64): Remove this test when code generation works and is stable.
   CodeGenerator::TestCodeGenerator();
-  // TODO(X64): Reenable remaining initialization when code generation works.
-  return true;
 #endif  // V8_HOST_ARCH_64_BIT
 
 
diff --git a/src/x64/assembler-x64.cc b/src/x64/assembler-x64.cc
index e1529f7..7da6a8f 100644
--- a/src/x64/assembler-x64.cc
+++ b/src/x64/assembler-x64.cc
@@ -1110,6 +1110,15 @@ void Assembler::movsxlq(Register dst, Register src) {
 }
 
 
+void Assembler::movsxlq(Register dst, const Operand& src) {
+  EnsureSpace ensure_space(this);
+  last_pc_ = pc_;
+  emit_rex_64(dst, src);
+  emit(0x63);
+  emit_operand(dst, src);
+}
+
+
 void Assembler::movzxbq(Register dst, const Operand& src) {
   EnsureSpace ensure_space(this);
   last_pc_ = pc_;
diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
index d5ef846..5143bf3 100644
--- a/src/x64/assembler-x64.h
+++ b/src/x64/assembler-x64.h
@@ -495,6 +495,7 @@ class Assembler : public Malloced {
   void movq(Register dst, Handle<Object> handle, RelocInfo::Mode rmode);
 
   void movsxlq(Register dst, Register src);
+  void movsxlq(Register dst, const Operand& src);
   void movzxbq(Register dst, const Operand& src);
 
   // New x64 instruction to load from an immediate 64-bit pointer into RAX.
diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
index 230df73..0481de3 100644
--- a/src/x64/codegen-x64.cc
+++ b/src/x64/codegen-x64.cc
@@ -206,8 +206,10 @@ void CodeGenerator::TestCodeGenerator() {
                       NULL,
                       &pending_exceptions);
   // Function compiles and runs, but returns a JSFunction object.
-  CHECK(result->IsSmi());
-  CHECK_EQ(47, Smi::cast(*result)->value());
+#ifdef DEBUG
+  PrintF("Result of test function: ");
+  result->Print();
+#endif
 }
 
 
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index 12e9e3d..f5f744d 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -694,7 +694,8 @@ void MacroAssembler::InvokeFunction(Register function,
   ASSERT(function.is(rdi));
   movq(rdx, FieldOperand(function, JSFunction::kSharedFunctionInfoOffset));
   movq(rsi, FieldOperand(function, JSFunction::kContextOffset));
-  movl(rbx, FieldOperand(rdx, SharedFunctionInfo::kFormalParameterCountOffset));
+  movsxlq(rbx,
+          FieldOperand(rdx, SharedFunctionInfo::kFormalParameterCountOffset));
   movq(rdx, FieldOperand(rdx, SharedFunctionInfo::kCodeOffset));
   // Advances rdx to the end of the Code object header, to the start of
   // the executable code.
-- 
2.7.4