diff --git a/pcsx2/x86/microVU_Misc.h b/pcsx2/x86/microVU_Misc.h index 0b62880f74..c51cb22ba8 100644 --- a/pcsx2/x86/microVU_Misc.h +++ b/pcsx2/x86/microVU_Misc.h @@ -16,49 +16,41 @@ struct microVU; struct mVU_Globals { - u32 absclip[4], signbit[4], minvals[4], maxvals[4]; - u32 one[4]; - u32 Pi4[4]; - u32 T1[4], T2[4], T3[4], T4[4], T5[4], T6[4], T7[4], T8[4]; - u32 S2[4], S3[4], S4[4], S5[4]; - u32 E1[4], E2[4], E3[4], E4[4], E5[4], E6[4]; - float FTOI_4[4], FTOI_12[4], FTOI_15[4]; - float ITOF_4[4], ITOF_12[4], ITOF_15[4]; +#define __four(val) { val, val, val, val } + u32 absclip [4] = __four(0x7fffffff); + u32 signbit [4] = __four(0x80000000); + u32 minvals [4] = __four(0xff7fffff); + u32 maxvals [4] = __four(0x7f7fffff); + u32 one [4] = __four(0x3f800000); + u32 Pi4 [4] = __four(0x3f490fdb); + u32 T1 [4] = __four(0x3f7ffff5); + u32 T5 [4] = __four(0xbeaaa61c); + u32 T2 [4] = __four(0x3e4c40a6); + u32 T3 [4] = __four(0xbe0e6c63); + u32 T4 [4] = __four(0x3dc577df); + u32 T6 [4] = __four(0xbd6501c4); + u32 T7 [4] = __four(0x3cb31652); + u32 T8 [4] = __four(0xbb84d7e7); + u32 S2 [4] = __four(0xbe2aaaa4); + u32 S3 [4] = __four(0x3c08873e); + u32 S4 [4] = __four(0xb94fb21f); + u32 S5 [4] = __four(0x362e9c14); + u32 E1 [4] = __four(0x3e7fffa8); + u32 E2 [4] = __four(0x3d0007f4); + u32 E3 [4] = __four(0x3b29d3ff); + u32 E4 [4] = __four(0x3933e553); + u32 E5 [4] = __four(0x36b63510); + u32 E6 [4] = __four(0x353961ac); + float FTOI_4 [4] = __four(16.0); + float FTOI_12 [4] = __four(4096.0); + float FTOI_15 [4] = __four(32768.0); + float ITOF_4 [4] = __four(0.0625f); + float ITOF_12 [4] = __four(0.000244140625); + float ITOF_15 [4] = __four(0.000030517578125); +#undef __four }; -#define __four(val) { val, val, val, val } -alignas(32) static const mVU_Globals mVUglob = { - __four(0x7fffffff), // absclip - __four(0x80000000), // signbit - __four(0xff7fffff), // minvals - __four(0x7f7fffff), // maxvals - __four(0x3f800000), // ONE! - __four(0x3f490fdb), // PI4! - __four(0x3f7ffff5), // T1 - __four(0xbeaaa61c), // T5 - __four(0x3e4c40a6), // T2 - __four(0xbe0e6c63), // T3 - __four(0x3dc577df), // T4 - __four(0xbd6501c4), // T6 - __four(0x3cb31652), // T7 - __four(0xbb84d7e7), // T8 - __four(0xbe2aaaa4), // S2 - __four(0x3c08873e), // S3 - __four(0xb94fb21f), // S4 - __four(0x362e9c14), // S5 - __four(0x3e7fffa8), // E1 - __four(0x3d0007f4), // E2 - __four(0x3b29d3ff), // E3 - __four(0x3933e553), // E4 - __four(0x36b63510), // E5 - __four(0x353961ac), // E6 - __four(16.0), // FTOI_4 - __four(4096.0), // FTOI_12 - __four(32768.0), // FTOI_15 - __four(0.0625f), // ITOF_4 - __four(0.000244140625), // ITOF_12 - __four(0.000030517578125) // ITOF_15 -}; +alignas(32) static constexpr struct mVU_Globals mVUglob; static const uint _Ibit_ = 1 << 31; static const uint _Ebit_ = 1 << 30;