Reviewers: danno, titzer, haitao.feng,

Message:
PTAL

Description:
x32: disable turbofan for x32 port

BUG=

Please review this at https://codereview.chromium.org/697353003/

Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+12, -8 lines):
  M src/compiler/instruction-selector.cc
  M src/globals.h
  M tools/gyp/v8.gyp


Index: src/compiler/instruction-selector.cc
diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc index 877230ca2ab742c22b10c82b910769078d2938b6..ffbf2a3013dd3e4bcbf0c6808e78d0added9263f 100644
--- a/src/compiler/instruction-selector.cc
+++ b/src/compiler/instruction-selector.cc
@@ -833,7 +833,7 @@ void InstructionSelector::VisitLoadStackPointer(Node* node) {
 #endif  // V8_TURBOFAN_BACKEND

 // 32 bit targets do not implement the following instructions.
-#if V8_TARGET_ARCH_32_BIT && V8_TURBOFAN_BACKEND
+#if V8_TARGET_ARCH_32_BIT && !V8_TARGET_ARCH_X64 && V8_TURBOFAN_BACKEND

 void InstructionSelector::VisitWord64And(Node* node) { UNIMPLEMENTED(); }

@@ -905,7 +905,7 @@ void InstructionSelector::VisitTruncateInt64ToInt32(Node* node) {
   UNIMPLEMENTED();
 }

-#endif  // V8_TARGET_ARCH_32_BIT && V8_TURBOFAN_BACKEND
+#endif // V8_TARGET_ARCH_32_BIT && !V8_TARGET_ARCH_X64 && V8_TURBOFAN_BACKEND


 void InstructionSelector::VisitFinish(Node* node) {
Index: src/globals.h
diff --git a/src/globals.h b/src/globals.h
index ae7903826dfb1f9bd51416f1a4a7e236c0951f9a..660263f9f918c524d1c0dd4592d016ca3e8c5415 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -26,8 +26,8 @@
 # define V8_INFINITY INFINITY
 #endif

-#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM || \
-    V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_MIPS
+#if V8_TARGET_ARCH_IA32 || (V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_32_BIT) | | \
+    V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_MIPS
 #define V8_TURBOFAN_BACKEND 1
 #else
 #define V8_TURBOFAN_BACKEND 0
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index ab811957132374a48468c8db3f0019ede82af2e6..acee421bf11b3e0c7d6e5ef49b5700524a28612c 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -1145,10 +1145,6 @@
             '../../src/x64/macro-assembler-x64.h',
             '../../src/x64/regexp-macro-assembler-x64.cc',
             '../../src/x64/regexp-macro-assembler-x64.h',
-            '../../src/compiler/x64/code-generator-x64.cc',
-            '../../src/compiler/x64/instruction-codes-x64.h',
-            '../../src/compiler/x64/instruction-selector-x64.cc',
-            '../../src/compiler/x64/linkage-x64.cc',
             '../../src/ic/x64/access-compiler-x64.cc',
             '../../src/ic/x64/handler-compiler-x64.cc',
             '../../src/ic/x64/ic-x64.cc',
@@ -1156,6 +1152,14 @@
             '../../src/ic/x64/stub-cache-x64.cc',
           ],
         }],
+        ['v8_target_arch=="x64"', {
+          'sources': [
+            '../../src/compiler/x64/code-generator-x64.cc',
+            '../../src/compiler/x64/instruction-codes-x64.h',
+            '../../src/compiler/x64/instruction-selector-x64.cc',
+            '../../src/compiler/x64/linkage-x64.cc',
+          ],
+        }],
         ['OS=="linux"', {
             'link_settings': {
               'conditions': [


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to