Fix Win64 build of Dart VM.

runtime/vm/constants_x64.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_CONSTANTS_X64_H_
 #define VM_CONSTANTS_X64_H_
 
 namespace dart {
 
 enum Register {
@@ skipping 120 matching lines @@
   GREATER       = 15,
 
   ZERO          = EQUAL,
   NOT_ZERO      = NOT_EQUAL,
   NEGATIVE      = SIGN,
   POSITIVE      = NOT_SIGN,
   CARRY         = BELOW,
   NOT_CARRY     = ABOVE_EQUAL
 };
 
+#define R(reg) (1 << (reg))

[siva, 2014/06/05 17:21:18]

R seems cryptic why not REG?

[Ivan Posva, 2014/06/05 17:42:11]

I don't find R such a bad use here, especially as it is only defined in this one
local section and undefined a could of lines below.

[Vyacheslav Egorov (Google), 2014/06/05 18:05:55]

REG is too long I think. I will keep it R() for now, it is just as Ivan says:
very local thing.

+
+#if defined(_WIN64)
+class CallingConventions {
+ public:
+  static const Register kArg1Reg = RCX;
+  static const Register kArg2Reg = RDX;
+  static const Register kArg3Reg = R8;
+  static const Register kArg4Reg = R9;
+  static const intptr_t kShadowSpaceBytes = 4 * kWordSize;
+
+  static const intptr_t kVolatileCpuRegisters =
+    R(RAX) | R(RCX) | R(RDX) | R(R8) | R(R9) | R(R10) | R(R11);

[srdjan, 2014/06/05 17:00:46]

4 spaces indent: here and below.

[Vyacheslav Egorov (Google), 2014/06/05 18:05:55]

Done.

+
+  static const intptr_t kVolatileXmmRegisters =
+    R(XMM0) | R(XMM1) | R(XMM2) | R(XMM3) | R(XMM4) | R(XMM5);
+
+  static const intptr_t kCalleeSaveCpuRegisters =
+    R(RBX) | R(RSI) | R(RDI) | R(R12) | R(R13) | R(R14) | R(R15);
+
+  static const intptr_t kCalleeSaveXmmRegisters =
+    R(XMM6) | R(XMM7) | R(XMM8) | R(XMM9) | R(XMM10) | R(XMM11) | R(XMM12) |
+    R(XMM13) | R(XMM14) | R(XMM15);
+
+  // Windows x64 ABI specifies that small objects are passed in registers.
+  // Otherwise they are passed by reference.
+  static const size_t kRegisterTransferLimit = 16;
+};
+#else
+class CallingConventions {
+ public:
+  static const Register kArg1Reg = RDI;
+  static const Register kArg2Reg = RSI;
+  static const Register kArg3Reg = RDX;
+  static const Register kArg4Reg = RCX;
+  static const Register kArg5Reg = R8;
+  static const Register kArg6Reg = R9;
+  static const intptr_t kShadowSpaceBytes = 0;
+
+  static const intptr_t kVolatileCpuRegisters =
+    R(RAX) | R(RCX) | R(RDX) | R(RSI) | R(RDI) |
+    R(R8) | R(R9) | R(R10) | R(R11);
+
+  static const intptr_t kVolatileXmmRegisters =
+    R(XMM0) | R(XMM1) | R(XMM2) | R(XMM3) | R(XMM4) |
+    R(XMM5) | R(XMM6) | R(XMM7) | R(XMM8) | R(XMM9) |
+    R(XMM10) | R(XMM11) | R(XMM12) | R(XMM13) | R(XMM14) | R(XMM15);
+
+  static const intptr_t kCalleeSaveCpuRegisters =
+    R(RBX) | R(R12) | R(R13) | R(R14) | R(R15);
+
+  static const intptr_t kCalleeSaveXmmRegisters = 0;
+};
+#endif
+
+#undef R
 
 class Instr {
  public:
   static const uint8_t kHltInstruction = 0xF4;
   // We prefer not to use the int3 instruction since it conflicts with gdb.
   static const uint8_t kBreakPointInstruction = kHltInstruction;
   static const int kBreakPointInstructionSize = 1;
 
   bool IsBreakPoint() {
     ASSERT(kBreakPointInstructionSize == 1);
@@ skipping 13 matching lines @@
 };
 
 
 // The largest multibyte nop we will emit.  This could go up to 15 if it
 // becomes important to us.
 const int MAX_NOP_SIZE = 8;
 
 }  // namespace dart
 
 #endif  // VM_CONSTANTS_X64_H_