Revert 13117: "Enable stub generation using Hydrogen/Lithium (again)"

src/arm/assembler-arm.h

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 53 matching lines @@
 // doing certain constant folds, which may significantly reduce the
 // code generated for some assembly instructions (because they boil down
 // to a few constants). If this is a problem, we could change the code
 // such that we use an enum in optimized mode, and the struct in debug
 // mode. This way we get the compile-time error checking in debug mode
 // and best performance in optimized code.
 
 // Core register
 struct Register {
   static const int kNumRegisters = 16;
-  static const int kMaxNumAllocatableRegisters = 8;
-  static const int kGPRsPerNonVFP2Double = 2;
-  static int NumAllocatableRegisters();
+  static const int kNumAllocatableRegisters = 8;
   static const int kSizeInBytes = 4;
 
   static int ToAllocationIndex(Register reg) {
-    ASSERT(reg.code() < NumAllocatableRegisters());
+    ASSERT(reg.code() < kNumAllocatableRegisters);
     return reg.code();
   }
 
   static Register FromAllocationIndex(int index) {
-    ASSERT(index >= 0 && index < NumAllocatableRegisters());
+    ASSERT(index >= 0 && index < kNumAllocatableRegisters);
     return from_code(index);
   }
 
   static const char* AllocationIndexToString(int index) {
-    ASSERT(index >= 0 && index < NumAllocatableRegisters());
+    ASSERT(index >= 0 && index < kNumAllocatableRegisters);
     const char* const names[] = {
       "r0",
       "r1",
       "r2",
       "r3",
       "r4",
       "r5",
       "r6",
       "r7",
     };
@@ skipping 82 matching lines @@
   void split_code(int* vm, int* m) const {
     ASSERT(is_valid());
     *m = code_ & 0x1;
     *vm = code_ >> 1;
   }
 
   int code_;
 };
 
 
-struct ArmDoubleRegister {
-  static const int kMaxNumRegisters = 16;
+// Double word VFP register.
+struct DwVfpRegister {
+  static const int kNumRegisters = 16;
   // A few double registers are reserved: one as a scratch register and one to
   // hold 0.0, that does not fit in the immediate field of vmov instructions.
   //  d14: 0.0
   //  d15: scratch register.
   static const int kNumReservedRegisters = 2;
-  static const int kMaxNumAllocatableRegisters = kMaxNumRegisters -
+  static const int kNumAllocatableRegisters = kNumRegisters -
       kNumReservedRegisters;
-  explicit ArmDoubleRegister(int code) { code_ = code; }
-  static int NumAllocatableRegisters();
-  static int NumRegisters() { return kNumRegisters; }
-  static const char* AllocationIndexToString(int index);
-  inline static ArmDoubleRegister FromAllocationIndex(int index);
-  inline static int ToAllocationIndex(ArmDoubleRegister reg) {
-    return reg.code();
-  }
 
-  static ArmDoubleRegister from_code(int code) {
-    ArmDoubleRegister r = ArmDoubleRegister(code);
-    return r;
-  }
-
-  bool is_valid() const {
-    return 0 <= code_ && code_ < NumRegisters();
-  }
-  bool is(ArmDoubleRegister reg) const { return code_ == reg.code_; }
-  int code() const {
-    ASSERT(is_valid());
-    return code_;
-  }
-
-  int code_;
-};
-
-
-// Double word VFP register.
-struct DwVfpRegister : ArmDoubleRegister {
-  static const int kNumRegisters = 16;
-
-  explicit DwVfpRegister(int code) : ArmDoubleRegister(code) {}
-
-  inline int ToAllocationIndex(DwVfpRegister reg);
+  inline static int ToAllocationIndex(DwVfpRegister reg);
 
   static DwVfpRegister FromAllocationIndex(int index) {
-    ASSERT(index >= 0 && index < kMaxNumAllocatableRegisters);
+    ASSERT(index >= 0 && index < kNumAllocatableRegisters);
     return from_code(index);
   }
 
   static const char* AllocationIndexToString(int index) {
-    ASSERT(index >= 0 && index < kMaxNumAllocatableRegisters);
+    ASSERT(index >= 0 && index < kNumAllocatableRegisters);
     const char* const names[] = {
       "d0",
       "d1",
       "d2",
       "d3",
       "d4",
       "d5",
       "d6",
       "d7",
       "d8",
       "d9",
       "d10",
       "d11",
       "d12",
       "d13"
     };
     return names[index];
   }
 
   static DwVfpRegister from_code(int code) {
-    return DwVfpRegister(code);
+    DwVfpRegister r = { code };
+    return r;
   }
 
   // Supporting d0 to d15, can be later extended to d31.
   bool is_valid() const { return 0 <= code_ && code_ < 16; }
   bool is(DwVfpRegister reg) const { return code_ == reg.code_; }
   SwVfpRegister low() const {
     SwVfpRegister reg;
     reg.code_ = code_ * 2;
 
     ASSERT(reg.is_valid());
@@ skipping 12 matching lines @@
   }
   int bit() const {
     ASSERT(is_valid());
     return 1 << code_;
   }
   void split_code(int* vm, int* m) const {
     ASSERT(is_valid());
     *m = (code_ & 0x10) >> 4;
     *vm = code_ & 0x0F;
   }
+
+  int code_;
 };
 
 
-// Double word VFP register.
-struct SoftFloatRegister : ArmDoubleRegister {
-  static const int kNumRegisters = 1;
-  static const int kMaxNumAllocatableRegisters = kNumRegisters;
-
-  explicit SoftFloatRegister(int code) : ArmDoubleRegister(code) {}
-
-  static SoftFloatRegister FromAllocationIndex(int index) {
-    ASSERT(index >= 0 && index < kMaxNumAllocatableRegisters);
-    return from_code(index);
-  }
-
-  static const char* AllocationIndexToString(int index) {
-    ASSERT(index >= 0 && index < kMaxNumAllocatableRegisters);
-    const char* const names[] = {
-      "sfpd0"
-    };
-    return names[index];
-  }
-
-  static SoftFloatRegister from_code(int code) {
-    SoftFloatRegister r = SoftFloatRegister(code);
-    return r;
-  }
-};
-
-
-typedef ArmDoubleRegister DoubleRegister;
+typedef DwVfpRegister DoubleRegister;
 
 
 // Support for the VFP registers s0 to s31 (d0 to d15).
 // Note that "s(N):s(N+1)" is the same as "d(N/2)".
 const SwVfpRegister s0  = {  0 };
 const SwVfpRegister s1  = {  1 };
 const SwVfpRegister s2  = {  2 };
 const SwVfpRegister s3  = {  3 };
 const SwVfpRegister s4  = {  4 };
 const SwVfpRegister s5  = {  5 };
@@ skipping 17 matching lines @@
 const SwVfpRegister s23 = { 23 };
 const SwVfpRegister s24 = { 24 };
 const SwVfpRegister s25 = { 25 };
 const SwVfpRegister s26 = { 26 };
 const SwVfpRegister s27 = { 27 };
 const SwVfpRegister s28 = { 28 };
 const SwVfpRegister s29 = { 29 };
 const SwVfpRegister s30 = { 30 };
 const SwVfpRegister s31 = { 31 };
 
-const DwVfpRegister no_dreg = DwVfpRegister(-1);
-const DwVfpRegister d0  = DwVfpRegister(0);
-const DwVfpRegister d1  = DwVfpRegister(1);
-const DwVfpRegister d2  = DwVfpRegister(2);
-const DwVfpRegister d3  = DwVfpRegister(3);
-const DwVfpRegister d4  = DwVfpRegister(4);
-const DwVfpRegister d5  = DwVfpRegister(5);
-const DwVfpRegister d6  = DwVfpRegister(6);
-const DwVfpRegister d7  = DwVfpRegister(7);
-const DwVfpRegister d8  = DwVfpRegister(8);
-const DwVfpRegister d9  = DwVfpRegister(9);
-const DwVfpRegister d10 = DwVfpRegister(10);
-const DwVfpRegister d11 = DwVfpRegister(11);
-const DwVfpRegister d12 = DwVfpRegister(12);
-const DwVfpRegister d13 = DwVfpRegister(13);
-const DwVfpRegister d14 = DwVfpRegister(14);
-const DwVfpRegister d15 = DwVfpRegister(15);
-
-const Register sfpd_lo  = { kRegister_r6_Code };
-const Register sfpd_hi  = { kRegister_r7_Code };
+const DwVfpRegister no_dreg = { -1 };
+const DwVfpRegister d0  = {  0 };
+const DwVfpRegister d1  = {  1 };
+const DwVfpRegister d2  = {  2 };
+const DwVfpRegister d3  = {  3 };
+const DwVfpRegister d4  = {  4 };
+const DwVfpRegister d5  = {  5 };
+const DwVfpRegister d6  = {  6 };
+const DwVfpRegister d7  = {  7 };
+const DwVfpRegister d8  = {  8 };
+const DwVfpRegister d9  = {  9 };
+const DwVfpRegister d10 = { 10 };
+const DwVfpRegister d11 = { 11 };
+const DwVfpRegister d12 = { 12 };
+const DwVfpRegister d13 = { 13 };
+const DwVfpRegister d14 = { 14 };
+const DwVfpRegister d15 = { 15 };
 
 // Aliases for double registers.  Defined using #define instead of
 // "static const DwVfpRegister&" because Clang complains otherwise when a
 // compilation unit that includes this header doesn't use the variables.
 #define kFirstCalleeSavedDoubleReg d8
 #define kLastCalleeSavedDoubleReg d15
 #define kDoubleRegZero d14
 #define kScratchDoubleReg d15
 
 
@@ skipping 1153 matching lines @@
  public:
   explicit EnsureSpace(Assembler* assembler) {
     assembler->CheckBuffer();
   }
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_ASSEMBLER_ARM_H_