Skip to content

Commit 7a6e28f

Browse files
committed
Compilation fix for some mips compilers.
1 parent d4dd259 commit 7a6e28f

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

src/mips/psyqo/gte-registers.hh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ static inline void write(uint32_t value) {
199199
* @tparam reg The register to write to.
200200
* @param fp The fixed point number to write.
201201
*/
202-
template <Register reg>
202+
template <Register reg, bool valid = false>
203203
static inline void writeSafe(Short fp) {
204-
static_assert(false, "Unable to write single fixed point to register");
204+
static_assert(valid, "Unable to write single fixed point to register");
205205
}
206206

207207
/**
@@ -211,9 +211,9 @@ static inline void writeSafe(Short fp) {
211211
* @tparam reg The register to write to.
212212
* @param fp The fixed point number to write.
213213
*/
214-
template <Register reg>
214+
template <Register reg, bool valid = false>
215215
static inline void writeUnsafe(Short fp) {
216-
static_assert(false, "Unable to write single fixed point to register");
216+
static_assert(valid, "Unable to write single fixed point to register");
217217
}
218218

219219
/**
@@ -223,9 +223,9 @@ static inline void writeUnsafe(Short fp) {
223223
* @param low The value to write to the lower 16 bits of the register.
224224
* @param hi The value to write to the higher 16 bits of the register.
225225
*/
226-
template <Register reg>
226+
template <Register reg, bool valid = false>
227227
static inline void writeSafe(Short low, Short hi) {
228-
static_assert(false, "Unable to write double fixed point to register");
228+
static_assert(valid, "Unable to write double fixed point to register");
229229
}
230230

231231
/**
@@ -236,9 +236,9 @@ static inline void writeSafe(Short low, Short hi) {
236236
* @param low The value to write to the lower 16 bits of the register.
237237
* @param hi The value to write to the higher 16 bits of the register.
238238
*/
239-
template <Register reg>
239+
template <Register reg, bool valid = false>
240240
static inline void writeUnsafe(Short low, Short hi) {
241-
static_assert(false, "Unable to write double fixed point to register");
241+
static_assert(valid, "Unable to write double fixed point to register");
242242
}
243243

244244
/**
@@ -253,9 +253,9 @@ enum class PseudoRegister { Rotation, Light, Color, V0, V1, V2, SV, LV };
253253
* @tparam reg The pseudo register to write to.
254254
* @param in The matrix to write.
255255
*/
256-
template <PseudoRegister reg>
256+
template <PseudoRegister reg, bool valid = false>
257257
static inline void writeSafe(const Matrix33& in) {
258-
static_assert(false, "Unable to write matrix to pseudo register");
258+
static_assert(valid, "Unable to write matrix to pseudo register");
259259
}
260260

261261
/**
@@ -265,9 +265,9 @@ static inline void writeSafe(const Matrix33& in) {
265265
* @tparam reg The pseudo register to write to.
266266
* @param in The matrix to write.
267267
*/
268-
template <PseudoRegister reg>
268+
template <PseudoRegister reg, bool valid = false>
269269
static inline void writeUnsafe(const Matrix33& in) {
270-
static_assert(false, "Unable to write matrix to pseudo register");
270+
static_assert(valid, "Unable to write matrix to pseudo register");
271271
}
272272

273273
/**
@@ -277,9 +277,9 @@ static inline void writeUnsafe(const Matrix33& in) {
277277
* @tparam reg The pseudo register to write to.
278278
* @param in The vector to write.
279279
*/
280-
template <PseudoRegister reg>
280+
template <PseudoRegister reg, bool valid = false>
281281
static inline void writeSafe(const Vec3& in) {
282-
static_assert(false, "Unable to write vector to pseudo register");
282+
static_assert(valid, "Unable to write vector to pseudo register");
283283
}
284284

285285
/**
@@ -289,9 +289,9 @@ static inline void writeSafe(const Vec3& in) {
289289
* @tparam reg The pseudo register to write to.
290290
* @param in The vector to write.
291291
*/
292-
template <PseudoRegister reg>
292+
template <PseudoRegister reg, bool valid = false>
293293
static inline void writeUnsafe(const Vec3& in) {
294-
static_assert(false, "Unable to write vector to pseudo register");
294+
static_assert(valid, "Unable to write vector to pseudo register");
295295
}
296296

297297
/**
@@ -360,9 +360,9 @@ static inline void read(uint32_t* ptr) {
360360
* @tparam reg The pseudo register to read from.
361361
* @return PackedVec3 The vector read from the pseudo register.
362362
*/
363-
template <PseudoRegister reg>
363+
template <PseudoRegister reg, bool valid = false>
364364
static inline PackedVec3 readSafe() {
365-
static_assert(false, "Unable to read pseudo register as vector");
365+
static_assert(valid, "Unable to read pseudo register as vector");
366366
__builtin_unreachable();
367367
}
368368

@@ -373,15 +373,15 @@ static inline PackedVec3 readSafe() {
373373
* @tparam reg The pseudo register to read from.
374374
* @return PackedVec3 The vector read from the pseudo register.
375375
*/
376-
template <PseudoRegister reg>
376+
template <PseudoRegister reg, bool valid = false>
377377
static inline PackedVec3 readUnsafe() {
378-
static_assert(false, "Unable to read pseudo register as vector");
378+
static_assert(valid, "Unable to read pseudo register as vector");
379379
__builtin_unreachable();
380380
}
381381

382-
template <PseudoRegister reg>
382+
template <PseudoRegister reg, bool valid = false>
383383
static inline void read(Vec3* ptr) {
384-
static_assert(false, "Unable to read pseudo register as vector");
384+
static_assert(valid, "Unable to read pseudo register as vector");
385385
__builtin_unreachable();
386386
}
387387

0 commit comments

Comments
 (0)