Index: src/arm64/constants-arm64.h |
diff --git a/src/arm64/constants-arm64.h b/src/arm64/constants-arm64.h |
index 8816cd0e2b3169571cade4e063d39979f507ffb2..43a375d953d6d935da9504639cd5cfa31ddcce33 100644 |
--- a/src/arm64/constants-arm64.h |
+++ b/src/arm64/constants-arm64.h |
@@ -32,8 +32,8 @@ const unsigned kInstructionSizeLog2 = 2; |
const unsigned kLoadLiteralScaleLog2 = 2; |
const unsigned kMaxLoadLiteralRange = 1 * MB; |
-const unsigned kNumberOfRegisters = 32; |
-const unsigned kNumberOfFPRegisters = 32; |
+const int kNumberOfRegisters = 32; |
+const int kNumberOfFPRegisters = 32; |
// Callee saved registers are x19-x30(lr). |
const int kNumberOfCalleeSavedRegisters = 11; |
const int kFirstCalleeSavedRegisterIndex = 19; |
@@ -42,23 +42,22 @@ const int kNumberOfCalleeSavedFPRegisters = 8; |
const int kFirstCalleeSavedFPRegisterIndex = 8; |
// Callee saved registers with no specific purpose in JS are x19-x25. |
const unsigned kJSCalleeSavedRegList = 0x03f80000; |
-// TODO(all): k<Y>RegSize should probably be k<Y>RegSizeInBits. |
-const unsigned kWRegSizeInBits = 32; |
-const unsigned kWRegSizeInBitsLog2 = 5; |
-const unsigned kWRegSize = kWRegSizeInBits >> 3; |
-const unsigned kWRegSizeLog2 = kWRegSizeInBitsLog2 - 3; |
-const unsigned kXRegSizeInBits = 64; |
-const unsigned kXRegSizeInBitsLog2 = 6; |
-const unsigned kXRegSize = kXRegSizeInBits >> 3; |
-const unsigned kXRegSizeLog2 = kXRegSizeInBitsLog2 - 3; |
-const unsigned kSRegSizeInBits = 32; |
-const unsigned kSRegSizeInBitsLog2 = 5; |
-const unsigned kSRegSize = kSRegSizeInBits >> 3; |
-const unsigned kSRegSizeLog2 = kSRegSizeInBitsLog2 - 3; |
-const unsigned kDRegSizeInBits = 64; |
-const unsigned kDRegSizeInBitsLog2 = 6; |
-const unsigned kDRegSize = kDRegSizeInBits >> 3; |
-const unsigned kDRegSizeLog2 = kDRegSizeInBitsLog2 - 3; |
+const int kWRegSizeInBits = 32; |
+const int kWRegSizeInBitsLog2 = 5; |
+const int kWRegSize = kWRegSizeInBits >> 3; |
+const int kWRegSizeLog2 = kWRegSizeInBitsLog2 - 3; |
+const int kXRegSizeInBits = 64; |
+const int kXRegSizeInBitsLog2 = 6; |
+const int kXRegSize = kXRegSizeInBits >> 3; |
+const int kXRegSizeLog2 = kXRegSizeInBitsLog2 - 3; |
+const int kSRegSizeInBits = 32; |
+const int kSRegSizeInBitsLog2 = 5; |
+const int kSRegSize = kSRegSizeInBits >> 3; |
+const int kSRegSizeLog2 = kSRegSizeInBitsLog2 - 3; |
+const int kDRegSizeInBits = 64; |
+const int kDRegSizeInBitsLog2 = 6; |
+const int kDRegSize = kDRegSizeInBits >> 3; |
+const int kDRegSizeLog2 = kDRegSizeInBitsLog2 - 3; |
const int64_t kWRegMask = 0x00000000ffffffffL; |
const int64_t kXRegMask = 0xffffffffffffffffL; |
const int64_t kSRegMask = 0x00000000ffffffffL; |
@@ -86,13 +85,13 @@ const int64_t kXMaxInt = 0x7fffffffffffffffL; |
const int64_t kXMinInt = 0x8000000000000000L; |
const int32_t kWMaxInt = 0x7fffffff; |
const int32_t kWMinInt = 0x80000000; |
-const unsigned kIp0Code = 16; |
-const unsigned kIp1Code = 17; |
-const unsigned kFramePointerRegCode = 29; |
-const unsigned kLinkRegCode = 30; |
-const unsigned kZeroRegCode = 31; |
-const unsigned kJSSPCode = 28; |
-const unsigned kSPRegInternalCode = 63; |
+const int kIp0Code = 16; |
+const int kIp1Code = 17; |
+const int kFramePointerRegCode = 29; |
+const int kLinkRegCode = 30; |
+const int kZeroRegCode = 31; |
+const int kJSSPCode = 28; |
+const int kSPRegInternalCode = 63; |
const unsigned kRegCodeMask = 0x1f; |
const unsigned kShiftAmountWRegMask = 0x1f; |
const unsigned kShiftAmountXRegMask = 0x3f; |