Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: src/IceRegistersARM32.h

Issue 1676123002: Subzero: Use a proper RegNumT type instead of int32_t/SizeT. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Make it possible to do "auto NewReg = RegNumT::NoRegister;" Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/IceRegAlloc.cpp ('k') | src/IceRegistersMIPS32.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceRegistersARM32.h
diff --git a/src/IceRegistersARM32.h b/src/IceRegistersARM32.h
index 1ce05ab8605284e8f5e3a199df0058eaeb4c95c7..6e3c56264a98d9e23065493e4eb7e616c3ad1b2b 100644
--- a/src/IceRegistersARM32.h
+++ b/src/IceRegistersARM32.h
@@ -102,9 +102,13 @@ extern struct RegTableType {
#undef NUM_ALIASES_BITS
} RegTable[Reg_NUM];
-static inline bool isGPRegister(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline void assertValidRegNum(RegNumT RegNum) {
+ (void)RegNum;
+ assert(RegNum != RegNumT::NoRegister);
+}
+
+static inline bool isGPRegister(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].IsGPR;
}
@@ -118,9 +122,8 @@ static constexpr inline SizeT getNumGPRegs() {
;
}
-static inline GPRRegister getEncodedGPR(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline GPRRegister getEncodedGPR(RegNumT RegNum) {
+ RegNum.assertIsValid();
return GPRRegister(RegTable[RegNum].Encoding);
}
@@ -134,33 +137,28 @@ static constexpr inline SizeT getNumGPRs() {
;
}
-static inline bool isGPR(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline bool isGPR(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].IsGPR;
}
-static inline GPRRegister getI64PairFirstGPRNum(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline GPRRegister getI64PairFirstGPRNum(RegNumT RegNum) {
+ RegNum.assertIsValid();
return GPRRegister(RegTable[RegNum].Encoding);
}
-static inline GPRRegister getI64PairSecondGPRNum(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline GPRRegister getI64PairSecondGPRNum(RegNumT RegNum) {
+ RegNum.assertIsValid();
return GPRRegister(RegTable[RegNum].Encoding + 1);
}
-static inline bool isI64RegisterPair(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline bool isI64RegisterPair(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].IsI64Pair;
}
-static inline bool isEncodedSReg(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline bool isEncodedSReg(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].IsFP32;
}
@@ -174,15 +172,13 @@ static constexpr inline SizeT getNumSRegs() {
;
}
-static inline SRegister getEncodedSReg(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline SRegister getEncodedSReg(RegNumT RegNum) {
+ RegNum.assertIsValid();
return SRegister(RegTable[RegNum].Encoding);
}
-static inline bool isEncodedDReg(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline bool isEncodedDReg(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].IsFP64;
}
@@ -196,26 +192,23 @@ static constexpr inline SizeT getNumDRegs() {
;
}
-static inline DRegister getEncodedDReg(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline DRegister getEncodedDReg(RegNumT RegNum) {
+ RegNum.assertIsValid();
return DRegister(RegTable[RegNum].Encoding);
}
-static inline bool isEncodedQReg(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline bool isEncodedQReg(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].IsVec128;
}
-static inline QRegister getEncodedQReg(int32_t RegNum) {
+static inline QRegister getEncodedQReg(RegNumT RegNum) {
assert(isEncodedQReg(RegNum));
return QRegister(RegTable[RegNum].Encoding);
}
-static inline IceString getRegName(int32_t RegNum) {
- assert(RegNum >= 0);
- assert(RegNum < Reg_NUM);
+static inline IceString getRegName(RegNumT RegNum) {
+ RegNum.assertIsValid();
return RegTable[RegNum].Name;
}
« no previous file with comments | « src/IceRegAlloc.cpp ('k') | src/IceRegistersMIPS32.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698