[not for landing] Diff between a64 and r19234 for no-a64 files.

src/code-stubs.h

 // Copyright 2012 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
@@ skipping 89 matching lines @@
   V(LoadField)                           \
   V(KeyedLoadField)
 
 // List of code stubs only used on ARM platforms.
 #if V8_TARGET_ARCH_ARM
 #define CODE_STUB_LIST_ARM(V)  \
   V(GetProperty)               \
   V(SetProperty)               \
   V(InvokeBuiltin)             \
   V(DirectCEntry)
+#elif V8_TARGET_ARCH_A64

[rmcilroy, 2014/02/11 18:31:06]

These seem to be the same, could we merge into the previous ifdef and make it
#if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_A64).

[Rodolph Perfetta, 2014/02/12 01:08:24]

Yes they can be consolidated.

On 2014/02/11 18:31:06, rmcilroy wrote:

+#define CODE_STUB_LIST_ARM(V)  \
+  V(GetProperty)               \
+  V(SetProperty)               \
+  V(InvokeBuiltin)             \
+  V(DirectCEntry)
 #else
 #define CODE_STUB_LIST_ARM(V)
 #endif
 
 // List of code stubs only used on MIPS platforms.
 #if V8_TARGET_ARCH_MIPS
 #define CODE_STUB_LIST_MIPS(V)  \
   V(RegExpCEntry)               \
   V(DirectCEntry)               \
   V(StoreRegistersState)        \
@@ skipping 315 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RuntimeCallHelper);
 };
 
 
 } }  // namespace v8::internal
 
 #if V8_TARGET_ARCH_IA32
 #include "ia32/code-stubs-ia32.h"
 #elif V8_TARGET_ARCH_X64
 #include "x64/code-stubs-x64.h"
+#elif V8_TARGET_ARCH_A64
+#include "a64/code-stubs-a64.h"
 #elif V8_TARGET_ARCH_ARM
 #include "arm/code-stubs-arm.h"
 #elif V8_TARGET_ARCH_MIPS
 #include "mips/code-stubs-mips.h"
 #else
 #error Unsupported target architecture.
 #endif
 
 namespace v8 {
 namespace internal {
@@ skipping 1404 matching lines @@
 };
 
 
 class DoubleToIStub : public PlatformCodeStub {
  public:
   DoubleToIStub(Register source,
                 Register destination,
                 int offset,
                 bool is_truncating,
                 bool skip_fastpath = false) : bit_field_(0) {
+#if V8_TARGET_ARCH_A64
+    // TODO(jbramley): Make A64's Register type compatible with the normal code,
+    // so we don't need this special case.
+    bit_field_ = SourceRegisterBits::encode(source.code()) |
+      DestinationRegisterBits::encode(destination.code()) |
+      OffsetBits::encode(offset) |
+      IsTruncatingBits::encode(is_truncating) |
+      SkipFastPathBits::encode(skip_fastpath) |
+      SSEBits::encode(CpuFeatures::IsSafeForSnapshot(SSE2) ?
+                      CpuFeatures::IsSafeForSnapshot(SSE3) ? 2 : 1 : 0);
+#else
     bit_field_ = SourceRegisterBits::encode(source.code_) |
       DestinationRegisterBits::encode(destination.code_) |
       OffsetBits::encode(offset) |
       IsTruncatingBits::encode(is_truncating) |
       SkipFastPathBits::encode(skip_fastpath) |
       SSEBits::encode(CpuFeatures::IsSafeForSnapshot(SSE2) ?
-                          CpuFeatures::IsSafeForSnapshot(SSE3) ? 2 : 1 : 0);
+                      CpuFeatures::IsSafeForSnapshot(SSE3) ? 2 : 1 : 0);
+#endif
   }
 
   Register source() {
+#if V8_TARGET_ARCH_A64
+    // TODO(jbramley): Make A64's Register type compatible with the normal code,
+    // so we don't need this special case.
+    return Register::XRegFromCode(SourceRegisterBits::decode(bit_field_));
+#else
     Register result = { SourceRegisterBits::decode(bit_field_) };
     return result;
+#endif
   }
 
   Register destination() {
+#if V8_TARGET_ARCH_A64
+    // TODO(jbramley): Make A64's Register type compatible with the normal code,
+    // so we don't need this special case.
+    return Register::XRegFromCode(DestinationRegisterBits::decode(bit_field_));
+#else
     Register result = { DestinationRegisterBits::decode(bit_field_) };
     return result;
+#endif
   }
 
   bool is_truncating() {
     return IsTruncatingBits::decode(bit_field_);
   }
 
   bool skip_fastpath() {
     return SkipFastPathBits::decode(bit_field_);
   }
 
@@ skipping 580 matching lines @@
 
 
 class CallDescriptors {
  public:
   static void InitializeForIsolate(Isolate* isolate);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_