Revision: 3073
Author: [email protected]
Date: Thu Oct 15 05:42:16 2009
Log: Initial port of top-level code generator to ARM. For the constant
true at the top level we generate:
0 stmdb sp!, {r1, r8, fp, lr}
4 add fp, sp, #8
8 ldr ip, [r10, #+4]
12 ldr r2, [r10, #+0]
16 str ip, [sp, #-4]!
20 add lr, pc, #4
24 cmp sp, r2
28 ldrcc pc, [pc, #+68] ;; code: STUB, StackCheck, minor: 0
32 ldr ip, [pc, #+68] ;; object: 0xf5bc4161 <true>
36 str ip, [sp, #-4]!
40 ldr ip, [sp, #+0]
44 str ip, [fp, #-12]
48 add sp, sp, #4
52 ldr ip, [fp, #-12]
56 str ip, [sp, #-4]!
60 ldr r0, [sp], #+4
64 mov sp, fp ;; js return
68 ldmia sp!, {fp, lr}
72 add sp, sp, #4
76 bx lr
80 ldr r0, [r10, #+4]
84 mov sp, fp ;; js return
88 ldmia sp!, {fp, lr}
92 add sp, sp, #4
96 bx lr
100 constant pool begin
104 constant
108 constant
Review URL: http://codereview.chromium.org/264067
http://code.google.com/p/v8/source/detail?r=3073
Added:
/branches/bleeding_edge/src/arm/fast-codegen-arm.cc
Modified:
/branches/bleeding_edge/src/SConscript
/branches/bleeding_edge/src/compiler.cc
/branches/bleeding_edge/src/fast-codegen.h
/branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc
/branches/bleeding_edge/tools/gyp/v8.gyp
/branches/bleeding_edge/tools/visual_studio/v8_base_arm.vcproj
=======================================
--- /dev/null
+++ /branches/bleeding_edge/src/arm/fast-codegen-arm.cc Thu Oct 15 05:42:16
2009
@@ -0,0 +1,152 @@
+// Copyright 2009 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "v8.h"
+
+#include "codegen-inl.h"
+#include "fast-codegen.h"
+
+namespace v8 {
+namespace internal {
+
+#define __ ACCESS_MASM(masm_)
+
+// Generate code for a JS function. On entry to the function the receiver
+// and arguments have been pushed on the stack left to right. The actual
+// argument count matches the formal parameter count expected by the
+// function.
+//
+// The live registers are:
+// o r1: the JS function object being called (ie, ourselves)
+// o cp: our context
+// o fp: our caller's frame pointer
+// o sp: stack pointer
+// o lr: return address
+//
+// The function builds a JS frame. Please see JavaScriptFrameConstants in
+// frames-arm.h for its layout.
+void FastCodeGenerator::Generate(FunctionLiteral* fun) {
+ function_ = fun;
+
+ __ stm(db_w, sp, r1.bit() | cp.bit() | fp.bit() | lr.bit());
+ // Adjust fp to point to caller's fp.
+ __ add(fp, sp, Operand(2 * kPointerSize));
+
+ { Comment cmnt(masm_, "[ Allocate locals");
+ int locals_count = fun->scope()->num_stack_slots();
+ if (locals_count > 0) {
+ __ LoadRoot(ip, Heap::kUndefinedValueRootIndex);
+ }
+ if (FLAG_check_stack) {
+ __ LoadRoot(r2, Heap::kStackLimitRootIndex);
+ }
+ for (int i = 0; i < locals_count; i++) {
+ __ push(ip);
+ }
+ }
+
+ if (FLAG_check_stack) {
+ // Put the lr setup instruction in the delay slot. The kInstrSize is
+ // added to the implicit 8 byte offset that always applies to
operations
+ // with pc and gives a return address 12 bytes down.
+ Comment cmnt(masm_, "[ Stack check");
+ __ add(lr, pc, Operand(Assembler::kInstrSize));
+ __ cmp(sp, Operand(r2));
+ StackCheckStub stub;
+ __ mov(pc,
+ Operand(reinterpret_cast<intptr_t>(stub.GetCode().location()),
+ RelocInfo::CODE_TARGET),
+ LeaveCC,
+ lo);
+ }
+
+ { Comment cmnt(masm_, "[ Body");
+ VisitStatements(fun->body());
+ }
+
+ { Comment cmnt(masm_, "[ return <undefined>;");
+ // Emit a 'return undefined' in case control fell off the end of the
+ // body.
+ __ LoadRoot(r0, Heap::kUndefinedValueRootIndex);
+ __ RecordJSReturn();
+ __ mov(sp, fp);
+ __ ldm(ia_w, sp, fp.bit() | lr.bit());
+ int num_parameters = function_->scope()->num_parameters();
+ __ add(sp, sp, Operand((num_parameters + 1) * kPointerSize));
+ __ Jump(lr);
+ }
+}
+
+
+void FastCodeGenerator::VisitExpressionStatement(ExpressionStatement*
stmt) {
+ Comment cmnt(masm_, "[ ExpressionStatement");
+ Visit(stmt->expression());
+ __ pop();
+}
+
+
+void FastCodeGenerator::VisitReturnStatement(ReturnStatement* stmt) {
+ Comment cmnt(masm_, "[ ReturnStatement");
+ Visit(stmt->expression());
+ __ pop(r0);
+ __ RecordJSReturn();
+ __ mov(sp, fp);
+ __ ldm(ia_w, sp, fp.bit() | lr.bit());
+ int num_parameters = function_->scope()->num_parameters();
+ __ add(sp, sp, Operand((num_parameters + 1) * kPointerSize));
+ __ Jump(lr);
+}
+
+
+void FastCodeGenerator::VisitSlot(Slot* expr) {
+ Comment cmnt(masm_, "[ Slot");
+ __ ldr(ip, MemOperand(fp, SlotOffset(expr)));
+ __ push(ip);
+}
+
+
+void FastCodeGenerator::VisitLiteral(Literal* expr) {
+ Comment cmnt(masm_, "[ Literal");
+ __ mov(ip, Operand(expr->handle()));
+ __ push(ip);
+}
+
+
+void FastCodeGenerator::VisitAssignment(Assignment* expr) {
+ Comment cmnt(masm_, "[ Assignment");
+ ASSERT(expr->op() == Token::ASSIGN || expr->op() == Token::INIT_VAR);
+
+ Visit(expr->value());
+
+ Variable* var = expr->target()->AsVariableProxy()->AsVariable();
+ ASSERT(var != NULL && var->slot() != NULL);
+ __ ldr(ip, MemOperand(sp));
+ __ str(ip, MemOperand(fp, SlotOffset(var->slot())));
+}
+
+
+} } // namespace v8::internal
=======================================
--- /branches/bleeding_edge/src/SConscript Thu Oct 15 04:21:26 2009
+++ /branches/bleeding_edge/src/SConscript Thu Oct 15 05:42:16 2009
@@ -56,6 +56,7 @@
disassembler.cc
execution.cc
factory.cc
+ fast-codegen.cc
flags.cc
frame-element.cc
frames.cc
@@ -112,6 +113,7 @@
arm/cpu-arm.cc
arm/debug-arm.cc
arm/disasm-arm.cc
+ arm/fast-codegen-arm.cc
arm/frames-arm.cc
arm/ic-arm.cc
arm/jump-target-arm.cc
@@ -122,7 +124,6 @@
arm/virtual-frame-arm.cc
"""),
'arch:ia32': Split("""
- fast-codegen.cc
ia32/assembler-ia32.cc
ia32/builtins-ia32.cc
ia32/codegen-ia32.cc
@@ -140,7 +141,6 @@
ia32/virtual-frame-ia32.cc
"""),
'arch:x64': Split("""
- fast-codegen.cc
x64/assembler-x64.cc
x64/builtins-x64.cc
x64/codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/compiler.cc Thu Oct 15 04:21:26 2009
+++ /branches/bleeding_edge/src/compiler.cc Thu Oct 15 05:42:16 2009
@@ -41,7 +41,6 @@
namespace v8 {
namespace internal {
-#ifndef V8_TARGET_ARCH_ARM
class CodeGenSelector: public AstVisitor {
public:
@@ -64,8 +63,6 @@
DISALLOW_COPY_AND_ASSIGN(CodeGenSelector);
};
-#endif
-
static Handle<Code> MakeCode(FunctionLiteral* literal,
Handle<Script> script,
@@ -106,7 +103,6 @@
}
// Generate code and return it.
-#ifndef V8_TARGET_ARCH_ARM
if (FLAG_fast_compiler) {
CodeGenSelector selector;
CodeGenSelector::CodeGenTag code_gen = selector.Select(literal);
@@ -115,8 +111,6 @@
}
ASSERT(code_gen == CodeGenSelector::NORMAL);
}
-#endif
-
return CodeGenerator::MakeCode(literal, script, is_eval);
}
@@ -453,8 +447,6 @@
}
-#ifndef V8_TARGET_ARCH_ARM
-
CodeGenSelector::CodeGenTag CodeGenSelector::Select(FunctionLiteral* fun) {
Scope* scope = fun->scope();
@@ -718,7 +710,5 @@
#undef BAILOUT
#undef CHECK_BAILOUT
-#endif // !defined(V8_TARGET_ARCH_ARM)
-
} } // namespace v8::internal
=======================================
--- /branches/bleeding_edge/src/fast-codegen.h Thu Oct 15 04:21:26 2009
+++ /branches/bleeding_edge/src/fast-codegen.h Thu Oct 15 05:42:16 2009
@@ -28,8 +28,6 @@
#ifndef V8_FAST_CODEGEN_H_
#define V8_FAST_CODEGEN_H_
-#ifndef V8_TARGET_ARCH_ARM
-
#include "v8.h"
#include "ast.h"
@@ -37,6 +35,7 @@
namespace v8 {
namespace internal {
+
class FastCodeGenerator: public AstVisitor {
public:
explicit FastCodeGenerator(MacroAssembler* masm)
@@ -61,7 +60,7 @@
DISALLOW_COPY_AND_ASSIGN(FastCodeGenerator);
};
+
} } // namespace v8::internal
-#endif // !defined(V8_TARGET_ARCH_ARM)
#endif // V8_FAST_CODEGEN_H_
=======================================
--- /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc Thu Oct 15
04:21:26 2009
+++ /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc Thu Oct 15
05:42:16 2009
@@ -44,6 +44,7 @@
// o edi: the JS function object being called (ie, ourselves)
// o esi: our context
// o ebp: our caller's frame pointer
+// o esp: stack pointer (pointing to return address)
//
// The function builds a JS frame. Please see JavaScriptFrameConstants in
// frames-ia32.h for its layout.
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Thu Oct 15 04:21:26 2009
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Thu Oct 15 05:42:16 2009
@@ -256,14 +256,16 @@
'../../src/execution.h',
'../../src/factory.cc',
'../../src/factory.h',
+ '../../src/fast-codegen.cc',
+ '../../src/fast-codegen.h',
'../../src/flag-definitions.h',
'../../src/flags.cc',
'../../src/flags.h',
+ '../../src/frame-element.cc',
+ '../../src/frame-element.h',
'../../src/frames-inl.h',
'../../src/frames.cc',
'../../src/frames.h',
- '../../src/frame-element.cc',
- '../../src/frame-element.h',
'../../src/func-name-inferrer.cc',
'../../src/func-name-inferrer.h',
'../../src/global-handles.cc',
@@ -394,6 +396,7 @@
'../../src/arm/cpu-arm.cc',
'../../src/arm/debug-arm.cc',
'../../src/arm/disasm-arm.cc',
+ '../../src/arm/fast-codegen-arm.cc',
'../../src/arm/frames-arm.cc',
'../../src/arm/frames-arm.h',
'../../src/arm/ic-arm.cc',
@@ -414,8 +417,6 @@
'../../src/ia32',
],
'sources': [
- '../../src/fast-codegen.cc',
- '../../src/fast-codegen.h',
'../../src/ia32/assembler-ia32-inl.h',
'../../src/ia32/assembler-ia32.cc',
'../../src/ia32/assembler-ia32.h',
@@ -445,8 +446,6 @@
'../../src/x64',
],
'sources': [
- '../../src/fast-codegen.cc',
- '../../src/fast-codegen.h',
'../../src/x64/assembler-x64-inl.h',
'../../src/x64/assembler-x64.cc',
'../../src/x64/assembler-x64.h',
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_base_arm.vcproj Thu Oct
8 00:10:10 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_base_arm.vcproj Thu Oct
15 05:42:16 2009
@@ -396,6 +396,18 @@
RelativePath="..\..\src\factory.h"
>
</File>
+ <File
+
RelativePath="..\..\src\arm\fast-codegen-arm.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\fast-codegen.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\fast-codegen.h"
+ >
+ </File>
<File
RelativePath="..\..\src\flags.cc"
>
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
