ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rsp: Change usage of alignas to try and fix android build

This commit is contained in:
zilmar 2023-09-28 15:53:46 +09:30
parent 7e249d22b1
commit dd7ec63dd9
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-rsp-core/cpu/RSPRegister.cpp
View File

@ -64,7 +64,7 @@ void InitilizeRSPRegisters(void)
for (uint16_t i = 0; i < 512; i++) for (uint16_t i = 0; i < 512; i++)
{ {
uint64_t a = i + 512 >> (i % 2 == 1); uint64_t a = (i + 512) >> ((i % 2 == 1) ? 1 : 0);
uint64_t b = 1 << 17; uint64_t b = 1 << 17;
while (a * (b + 1) * (b + 1) < (uint64_t(1) << 44)) while (a * (b + 1) * (b + 1) < (uint64_t(1) << 44))
{ {

2
Source/Project64-rsp-core/cpu/RSPRegisterHandler.cpp
View File

@ -335,7 +335,5 @@ void RSPRegisterHandler::WriteReg(RSPRegister Reg, uint32_t Value)
SP_STATUS_REG |= SP_STATUS_SIG7; SP_STATUS_REG |= SP_STATUS_SIG7;
} }
break; break;
default:
__debugbreak();
} }
} }

2
Source/Project64-rsp-core/cpu/RspTypes.h
View File

@ -40,7 +40,7 @@ public:
uint64_t & u64(uint8_t Index); uint64_t & u64(uint8_t Index);
private: private:
uint64_t m_Reg[2] alignas(16); uint64_t alignas(16) m_Reg[2];
}; };
class RSPFlag class RSPFlag