[Project64] Update OpCode.h
This commit is contained in:
parent
4ac266bd94
commit
08cc72f6ed
|
@ -21,7 +21,7 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2)
|
|||
{
|
||||
OPCODE Command;
|
||||
|
||||
if (!g_MMU->LW_VAddr(PC + 4, Command.Hex))
|
||||
if (!g_MMU->LW_VAddr(PC + 4, (DWORD &)Command.Hex))
|
||||
{
|
||||
//g_Notify->DisplayError(L"Failed to load word 2");
|
||||
//ExitThread(0);
|
||||
|
@ -276,7 +276,7 @@ void CInterpreterCPU::ExecuteCPU()
|
|||
{
|
||||
while (!Done)
|
||||
{
|
||||
if (g_MMU->LW_VAddr(PROGRAM_COUNTER, Opcode.Hex))
|
||||
if (g_MMU->LW_VAddr(PROGRAM_COUNTER, (DWORD &)Opcode.Hex))
|
||||
{
|
||||
/*if (PROGRAM_COUNTER > 0x80000300 && PROGRAM_COUNTER< 0x80380000)
|
||||
{
|
||||
|
@ -367,7 +367,7 @@ void CInterpreterCPU::ExecuteOps(int Cycles)
|
|||
return;
|
||||
}
|
||||
|
||||
if (g_MMU->LW_VAddr(PROGRAM_COUNTER, Opcode.Hex))
|
||||
if (g_MMU->LW_VAddr(PROGRAM_COUNTER, (DWORD &)Opcode.Hex))
|
||||
{
|
||||
/*if (PROGRAM_COUNTER > 0x80000300 && PROGRAM_COUNTER< 0x80380000)
|
||||
{
|
||||
|
|
|
@ -10,10 +10,13 @@
|
|||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4201) // warning C4201: nonstandard extension used : nameless struct/union
|
||||
|
||||
union OPCODE
|
||||
{
|
||||
unsigned long Hex;
|
||||
unsigned char Ascii[4];
|
||||
uint32_t Hex;
|
||||
uint8_t Ascii[4];
|
||||
|
||||
struct
|
||||
{
|
||||
|
@ -57,6 +60,7 @@ union OPCODE
|
|||
unsigned : 6;
|
||||
};
|
||||
};
|
||||
#pragma warning(pop)
|
||||
|
||||
enum R4300iOpCodes
|
||||
{
|
||||
|
|
|
@ -397,7 +397,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
PermLoop = false;
|
||||
|
||||
OPCODE Command;
|
||||
if (!g_MMU->LW_VAddr(PC, Command.Hex))
|
||||
if (!g_MMU->LW_VAddr(PC, (DWORD &)Command.Hex))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
|
|
|
@ -17,7 +17,7 @@ bool DelaySlotEffectsCompare(DWORD PC, DWORD Reg1, DWORD Reg2);
|
|||
static bool DelaySlotEffectsJump(DWORD JumpPC) {
|
||||
OPCODE Command;
|
||||
|
||||
if (!g_MMU->LW_VAddr(JumpPC, Command.Hex))
|
||||
if (!g_MMU->LW_VAddr(JumpPC, (DWORD &)Command.Hex))
|
||||
return true;
|
||||
|
||||
switch (Command.op) {
|
||||
|
@ -58,7 +58,7 @@ static bool DelaySlotEffectsJump(DWORD JumpPC) {
|
|||
bool EffectDelaySlot = false;
|
||||
OPCODE NewCommand;
|
||||
|
||||
if (!g_MMU->LW_VAddr(JumpPC + 4, NewCommand.Hex)) {
|
||||
if (!g_MMU->LW_VAddr(JumpPC + 4, (DWORD &)NewCommand.Hex)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -932,7 +932,7 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
|
||||
do {
|
||||
__try {
|
||||
if (!g_MMU->LW_VAddr(m_CompilePC,m_Opcode.Hex))
|
||||
if (!g_MMU->LW_VAddr(m_CompilePC,(DWORD &)m_Opcode.Hex))
|
||||
{
|
||||
g_Notify->DisplayError(GS(MSG_FAIL_LOAD_WORD));
|
||||
ExitThread(0);
|
||||
|
|
|
@ -167,7 +167,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
CPU_Message("ContinueSectionPC = %08X",ContinueSectionPC);
|
||||
|
||||
do {
|
||||
if (!g_MMU->LW_VAddr(m_PC, m_Command.Hex))
|
||||
if (!g_MMU->LW_VAddr(m_PC, (DWORD &)m_Command.Hex))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
|
|
|
@ -61,7 +61,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
|
|||
{
|
||||
OPCODE Command;
|
||||
|
||||
if (!g_MMU->LW_VAddr(m_CompilePC + 4, Command.Hex)) {
|
||||
if (!g_MMU->LW_VAddr(m_CompilePC + 4, (DWORD &)Command.Hex)) {
|
||||
g_Notify->DisplayError(GS(MSG_FAIL_LOAD_WORD));
|
||||
ExitThread(0);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue