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

Android: Fix some compile issues

This commit is contained in:
zilmar 2022-07-11 13:39:57 +09:30
parent c4ff300cb8
commit 47e27b591c
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Android/jni/Plugin-Input/CMakeLists.txt
View File

@ -3,6 +3,7 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 99)
project("Project64-input-android")
include_directories(..)
add_library(Project64-input-android SHARED
Main.cpp)

8
Android/jni/Project64-plugin-spec/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/.cxx
/build
*.cpp
*.h
*.vcproj
*.vcxproj
*.vcxproj.filters
*.in

2
Source/Android/PluginRSP/Rsp.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "Common.h"
#include "common.h"
typedef struct
{

20
Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp
View File

@ -6372,21 +6372,23 @@ void CArmRecompilerOps::SW_Const(uint32_t Value, uint32_t VAddr)
case 0x04600000: MoveConstToVariable(Value, &g_Reg->PI_DRAM_ADDR_REG, "PI_DRAM_ADDR_REG"); break;
case 0x04600004: MoveConstToVariable(Value, &g_Reg->PI_CART_ADDR_REG, "PI_CART_ADDR_REG"); break;
case 0x04600008:
MoveConstToVariable(Value, &g_Reg->PI_RD_LEN_REG, "PI_RD_LEN_REG");
ArmBreakPoint(__FILE__, __LINE__);
/*MoveConstToVariable(Value, &g_Reg->PI_RD_LEN_REG, "PI_RD_LEN_REG");
m_RegWorkingSet.BeforeCallDirect();
MoveConstToArmReg(Arm_R0, (uint32_t)((CDMA *)g_MMU), "(CDMA *)g_MMU");
CallFunction(AddressOf(&CDMA::PI_DMA_READ), "CDMA::PI_DMA_READ");
m_RegWorkingSet.AfterCallDirect();
m_RegWorkingSet.AfterCallDirect();*/
break;
case 0x0460000C:
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
ArmBreakPoint(__FILE__, __LINE__);
/*m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
UpdateCounters(m_RegWorkingSet, false, true);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
MoveConstToVariable(Value, &g_Reg->PI_WR_LEN_REG, "PI_WR_LEN_REG");
m_RegWorkingSet.BeforeCallDirect();
MoveConstToArmReg(Arm_R0, (uint32_t)((CDMA *)g_MMU), "(CDMA *)g_MMU");
CallFunction(AddressOf(&CDMA::PI_DMA_WRITE), "CDMA::PI_DMA_WRITE");
m_RegWorkingSet.AfterCallDirect();
m_RegWorkingSet.AfterCallDirect();*/
break;
case 0x04600010:
if ((Value & PI_CLR_INTR) != 0)
@ -6809,21 +6811,23 @@ void CArmRecompilerOps::SW_Register(ArmReg Reg, uint32_t VAddr)
}
break;
case 0x04600008:
MoveArmRegToVariable(Reg, &g_Reg->PI_RD_LEN_REG, "PI_RD_LEN_REG");
ArmBreakPoint(__FILE__, __LINE__);
/*MoveArmRegToVariable(Reg, &g_Reg->PI_RD_LEN_REG, "PI_RD_LEN_REG");
m_RegWorkingSet.BeforeCallDirect();
MoveConstToArmReg(Arm_R0, (uint32_t)((CDMA *)g_MMU), "(CDMA *)g_MMU");
CallFunction(AddressOf(&CDMA::PI_DMA_READ), "CDMA::PI_DMA_READ");
m_RegWorkingSet.AfterCallDirect();
m_RegWorkingSet.AfterCallDirect();*/
break;
case 0x0460000C:
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
ArmBreakPoint(__FILE__, __LINE__);
/*m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
UpdateCounters(m_RegWorkingSet, false, true);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
MoveArmRegToVariable(Reg, &g_Reg->PI_WR_LEN_REG, "PI_WR_LEN_REG");
m_RegWorkingSet.BeforeCallDirect();
MoveConstToArmReg(Arm_R0, (uint32_t)((CDMA *)g_MMU), "(CDMA *)g_MMU");
CallFunction(AddressOf(&CDMA::PI_DMA_WRITE), "CDMA::PI_DMA_WRITE");
m_RegWorkingSet.AfterCallDirect();
m_RegWorkingSet.AfterCallDirect();*/
break;
case 0x04600010:
if (ShowUnhandledMemory())

4
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
View File

@ -10664,7 +10664,7 @@ void CX86RecompilerOps::SW_Const(uint32_t Value, uint32_t VAddr)
Call_Direct((void *)((long**)(MemoryHandler *)&g_MMU->m_PeripheralInterfaceHandler)[0][1], "PeripheralInterfaceHandler::Write32");
#else
PushImm32((uint32_t)&g_MMU->m_PeripheralInterfaceHandler);
Call_Direct(AddressOf(&m_PeripheralInterfaceHandler::Write32), "PeripheralInterfaceHandler::Write32");
Call_Direct(AddressOf(&PeripheralInterfaceHandler::Write32), "PeripheralInterfaceHandler::Write32");
AddConstToX86Reg(x86_ESP, 16);
#endif
m_RegWorkingSet.AfterCallDirect();
@ -11092,7 +11092,7 @@ void CX86RecompilerOps::SW_Register(x86Reg Reg, uint32_t VAddr)
MoveConstToX86reg((uint32_t)(MemoryHandler *)&g_MMU->m_PeripheralInterfaceHandler, x86_ECX);
Call_Direct((void *)((long**)(MemoryHandler *)&g_MMU->m_PeripheralInterfaceHandler)[0][1], "PeripheralInterfaceHandler::Write32");
#else
PushImm32((uint32_t)&g_MMU->PeripheralInterfaceHandler);
PushImm32((uint32_t)&g_MMU->m_PeripheralInterfaceHandler);
Call_Direct(AddressOf(&PeripheralInterfaceHandler::Write32), "PeripheralInterfaceHandler::Write32");
AddConstToX86Reg(x86_ESP, 16);
#endif

2
Source/Project64-core/Plugins/ControllerPlugin.cpp
View File

@ -89,7 +89,7 @@ bool CControl_Plugin::Initiate(CN64System * System, RenderWindow * Window)
ControlInfo.hWnd = Window ? Window->GetWindowHandle() : nullptr;
#else
ControlInfo.hinst = nullptr;
ControlInfo.hMainWindow = nullptr;
ControlInfo.hWnd = nullptr;
#endif
ControlInfo.Reserved = true;