A64: Rename k<Y>RegSize to k<Y>RegSizeInBits, and k<Y>RegSizeInBytes to k<Y>RegSize.

test/cctest/test-utils-a64.cc

 // Copyright 2013 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 203 matching lines @@
                               int reg_size, int reg_count, RegList allowed) {
   RegList list = 0;
   int i = 0;
   for (unsigned n = 0; (n < kNumberOfRegisters) && (i < reg_count); n++) {
     if (((1UL << n) & allowed) != 0) {
       // Only assign allowed registers.
       if (r) {
         r[i] = Register::Create(n, reg_size);
       }
       if (x) {
-        x[i] = Register::Create(n, kXRegSize);
+        x[i] = Register::Create(n, kXRegSizeInBits);
       }
       if (w) {
-        w[i] = Register::Create(n, kWRegSize);
+        w[i] = Register::Create(n, kWRegSizeInBits);
       }
       list |= (1UL << n);
       i++;
     }
   }
   // Check that we got enough registers.
   ASSERT(CountSetBits(list, kNumberOfRegisters) == reg_count);
 
   return list;
 }
 
 
 RegList PopulateFPRegisterArray(FPRegister* s, FPRegister* d, FPRegister* v,
                                 int reg_size, int reg_count, RegList allowed) {
   RegList list = 0;
   int i = 0;
   for (unsigned n = 0; (n < kNumberOfFPRegisters) && (i < reg_count); n++) {
     if (((1UL << n) & allowed) != 0) {
       // Only assigned allowed registers.
       if (v) {
         v[i] = FPRegister::Create(n, reg_size);
       }
       if (d) {
-        d[i] = FPRegister::Create(n, kDRegSize);
+        d[i] = FPRegister::Create(n, kDRegSizeInBits);
       }
       if (s) {
-        s[i] = FPRegister::Create(n, kSRegSize);
+        s[i] = FPRegister::Create(n, kSRegSizeInBits);
       }
       list |= (1UL << n);
       i++;
     }
   }
   // Check that we got enough registers.
   ASSERT(CountSetBits(list, kNumberOfFPRegisters) == reg_count);
 
   return list;
 }
 
 
 void Clobber(MacroAssembler* masm, RegList reg_list, uint64_t const value) {
   Register first = NoReg;
   for (unsigned i = 0; i < kNumberOfRegisters; i++) {
     if (reg_list & (1UL << i)) {
-      Register xn = Register::Create(i, kXRegSize);
+      Register xn = Register::Create(i, kXRegSizeInBits);
       // We should never write into csp here.
       ASSERT(!xn.Is(csp));
       if (!xn.IsZero()) {
         if (!first.IsValid()) {
           // This is the first register we've hit, so construct the literal.
           __ Mov(xn, value);
           first = xn;
         } else {
           // We've already loaded the literal, so re-use the value already
           // loaded into the first register we hit.
           __ Mov(xn, first);
         }
       }
     }
   }
 }
 
 
 void ClobberFP(MacroAssembler* masm, RegList reg_list, double const value) {
   FPRegister first = NoFPReg;
   for (unsigned i = 0; i < kNumberOfFPRegisters; i++) {
     if (reg_list & (1UL << i)) {
-      FPRegister dn = FPRegister::Create(i, kDRegSize);
+      FPRegister dn = FPRegister::Create(i, kDRegSizeInBits);
       if (!first.IsValid()) {
         // This is the first register we've hit, so construct the literal.
         __ Fmov(dn, value);
         first = dn;
       } else {
         // We've already loaded the literal, so re-use the value already loaded
         // into the first register we hit.
         __ Fmov(dn, first);
       }
     }
@@ skipping 42 matching lines @@
 
   __ Push(xzr, dump_base, dump, tmp);
 
   // Load the address where we will dump the state.
   __ Mov(dump_base, reinterpret_cast<uint64_t>(&dump_));
 
   // Dump the stack pointer (csp and wcsp).
   // The stack pointer cannot be stored directly; it needs to be moved into
   // another register first. Also, we pushed four X registers, so we need to
   // compensate here.
-  __ Add(tmp, csp, 4 * kXRegSizeInBytes);
+  __ Add(tmp, csp, 4 * kXRegSize);
   __ Str(tmp, MemOperand(dump_base, sp_offset));
-  __ Add(tmp_w, wcsp, 4 * kXRegSizeInBytes);
+  __ Add(tmp_w, wcsp, 4 * kXRegSize);
   __ Str(tmp_w, MemOperand(dump_base, wsp_offset));
 
   // Dump X registers.
   __ Add(dump, dump_base, x_offset);
   for (unsigned i = 0; i < kNumberOfRegisters; i += 2) {
     __ Stp(Register::XRegFromCode(i), Register::XRegFromCode(i + 1),
-           MemOperand(dump, i * kXRegSizeInBytes));
+           MemOperand(dump, i * kXRegSize));
   }
 
   // Dump W registers.
   __ Add(dump, dump_base, w_offset);
   for (unsigned i = 0; i < kNumberOfRegisters; i += 2) {
     __ Stp(Register::WRegFromCode(i), Register::WRegFromCode(i + 1),
-           MemOperand(dump, i * kWRegSizeInBytes));
+           MemOperand(dump, i * kWRegSize));
   }
 
   // Dump D registers.
   __ Add(dump, dump_base, d_offset);
   for (unsigned i = 0; i < kNumberOfFPRegisters; i += 2) {
     __ Stp(FPRegister::DRegFromCode(i), FPRegister::DRegFromCode(i + 1),
-           MemOperand(dump, i * kDRegSizeInBytes));
+           MemOperand(dump, i * kDRegSize));
   }
 
   // Dump S registers.
   __ Add(dump, dump_base, s_offset);
   for (unsigned i = 0; i < kNumberOfFPRegisters; i += 2) {
     __ Stp(FPRegister::SRegFromCode(i), FPRegister::SRegFromCode(i + 1),
-           MemOperand(dump, i * kSRegSizeInBytes));
+           MemOperand(dump, i * kSRegSize));
   }
 
   // Dump the flags.
   __ Mrs(tmp, NZCV);
   __ Str(tmp, MemOperand(dump_base, flags_offset));
 
   // To dump the values that were in tmp amd dump, we need a new scratch
   // register.  We can use any of the already dumped registers since we can
   // easily restore them.
   Register dump2_base = x10;
   Register dump2 = x11;
   ASSERT(!AreAliased(dump_base, dump, tmp, dump2_base, dump2));
 
   // Don't lose the dump_ address.
   __ Mov(dump2_base, dump_base);
 
   __ Pop(tmp, dump, dump_base, xzr);
 
   __ Add(dump2, dump2_base, w_offset);
-  __ Str(dump_base_w, MemOperand(dump2, dump_base.code() * kWRegSizeInBytes));
-  __ Str(dump_w, MemOperand(dump2, dump.code() * kWRegSizeInBytes));
-  __ Str(tmp_w, MemOperand(dump2, tmp.code() * kWRegSizeInBytes));
+  __ Str(dump_base_w, MemOperand(dump2, dump_base.code() * kWRegSize));
+  __ Str(dump_w, MemOperand(dump2, dump.code() * kWRegSize));
+  __ Str(tmp_w, MemOperand(dump2, tmp.code() * kWRegSize));
 
   __ Add(dump2, dump2_base, x_offset);
-  __ Str(dump_base, MemOperand(dump2, dump_base.code() * kXRegSizeInBytes));
-  __ Str(dump, MemOperand(dump2, dump.code() * kXRegSizeInBytes));
-  __ Str(tmp, MemOperand(dump2, tmp.code() * kXRegSizeInBytes));
+  __ Str(dump_base, MemOperand(dump2, dump_base.code() * kXRegSize));
+  __ Str(dump, MemOperand(dump2, dump.code() * kXRegSize));
+  __ Str(tmp, MemOperand(dump2, tmp.code() * kXRegSize));
 
   // Finally, restore dump2_base and dump2.
-  __ Ldr(dump2_base, MemOperand(dump2, dump2_base.code() * kXRegSizeInBytes));
-  __ Ldr(dump2, MemOperand(dump2, dump2.code() * kXRegSizeInBytes));
+  __ Ldr(dump2_base, MemOperand(dump2, dump2_base.code() * kXRegSize));
+  __ Ldr(dump2, MemOperand(dump2, dump2.code() * kXRegSize));
 
   // Restore the MacroAssembler's scratch registers.
   masm->TmpList()->set_list(old_tmp_list);
   masm->FPTmpList()->set_list(old_fptmp_list);
 
   completed_ = true;
 }