Fix up secPower a bit
Removed PARAM stuff, made tests pass with some caveats in that I don't understand what the return values are supposed to be based on the docs and fix a small issue with sceImpose that I created with the last merge
This commit is contained in:
kev :)
parent
72ad8f5ca8
commit
a2c024e454
5 changed files with 197 additions and 131 deletions
|
|
@ -43,6 +43,12 @@ template<int func(u32)> void WrapI_U() {
|
|||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<int func()> void WrapI_V() {
|
||||
int retval = func();
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
|
||||
template<int func(int)> void WrapI_I() {
|
||||
int retval = func(PARAM(0));
|
||||
RETURN(retval);
|
||||
|
|
@ -52,10 +58,18 @@ template<void func(u32)> void WrapV_U() {
|
|||
func(PARAM(0));
|
||||
}
|
||||
|
||||
template<void func(int)> void WrapV_I() {
|
||||
func(PARAM(0));
|
||||
}
|
||||
|
||||
template<void func(u32, u32)> void WrapV_UU() {
|
||||
func(PARAM(0), PARAM(1));
|
||||
}
|
||||
|
||||
template<void func(int, int)> void WrapV_II() {
|
||||
func(PARAM(0), PARAM(1));
|
||||
}
|
||||
|
||||
template<u32 func(u32, u32)> void WrapU_UU() {
|
||||
u32 retval = func(PARAM(0), PARAM(1));
|
||||
RETURN(retval);
|
||||
|
|
@ -66,6 +80,16 @@ template<int func(int, u32)> void WrapI_IU() {
|
|||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<int func(int, int)> void WrapI_II() {
|
||||
int retval = func(PARAM(0), PARAM(1));
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<int func(int, int, int)> void WrapI_III() {
|
||||
int retval = func(PARAM(0), PARAM(1), PARAM(2));
|
||||
RETURN(retval);
|
||||
}
|
||||
|
||||
template<void func(int, u32)> void WrapV_IU() {
|
||||
func(PARAM(0), PARAM(1));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
#include "FunctionWrappers.h"
|
||||
#include "../MIPS/MIPS.h"
|
||||
|
||||
u32 iLanguage = 0;
|
||||
u32 iButtonValue = 0;
|
||||
static u32 iLanguage = 0;
|
||||
static u32 iButtonValue = 0;
|
||||
|
||||
u32 sceImposeGetBatteryIconStatus(u32 chargingPtr, u32 iconStatusPtr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -24,90 +24,130 @@
|
|||
|
||||
static bool volatileMemLocked;
|
||||
|
||||
static int powerCbSlots[16];
|
||||
const int POWER_CB_AUTO = -1;
|
||||
|
||||
const int numberOfCBPowerSlots = 16;
|
||||
static int powerCbSlots[numberOfCBPowerSlots];
|
||||
|
||||
|
||||
void __PowerInit() {
|
||||
memset(powerCbSlots, 0, sizeof(powerCbSlots));
|
||||
}
|
||||
|
||||
void scePowerGetBatteryLifePercent()
|
||||
int scePowerGetBatteryLifePercent()
|
||||
{
|
||||
DEBUG_LOG(HLE, "100=scePowerGetBatteryLifePercent");
|
||||
RETURN(100);
|
||||
return 100;
|
||||
}
|
||||
void scePowerIsPowerOnline()
|
||||
int scePowerIsPowerOnline()
|
||||
{
|
||||
DEBUG_LOG(HLE, "1=scePowerIsPowerOnline");
|
||||
RETURN( 1);
|
||||
return 1;
|
||||
}
|
||||
void scePowerIsBatteryExist()
|
||||
int scePowerIsBatteryExist()
|
||||
{
|
||||
DEBUG_LOG(HLE, "1=scePowerIsBatteryExist");
|
||||
RETURN( 1);
|
||||
return 1;
|
||||
}
|
||||
void scePowerIsBatteryCharging()
|
||||
int scePowerIsBatteryCharging()
|
||||
{
|
||||
DEBUG_LOG(HLE, "0=scePowerIsBatteryCharging");
|
||||
RETURN( 0);
|
||||
return 0;
|
||||
}
|
||||
void scePowerGetBatteryChargingStatus()
|
||||
int scePowerGetBatteryChargingStatus()
|
||||
{
|
||||
DEBUG_LOG(HLE, "0=scePowerGetBatteryChargingStatus");
|
||||
RETURN( 0);
|
||||
return 0;
|
||||
}
|
||||
void scePowerIsLowBattery()
|
||||
int scePowerIsLowBattery()
|
||||
{
|
||||
DEBUG_LOG(HLE, "0=scePowerIsLowBattery");
|
||||
RETURN( 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void scePowerRegisterCallback()
|
||||
int scePowerRegisterCallback(int slot, int cbId)
|
||||
{
|
||||
int slot = PARAM(0);
|
||||
int cbId = PARAM(1);
|
||||
DEBUG_LOG(HLE,"0=scePowerRegisterCallback(%i, %i)", slot, cbId);
|
||||
powerCbSlots[slot] = cbId;
|
||||
int foundSlot = -1;
|
||||
|
||||
if (slot == POWER_CB_AUTO) // -1 signifies auto select of bank
|
||||
{
|
||||
for(int i=0; i < numberOfCBPowerSlots; i++)
|
||||
{
|
||||
if ((powerCbSlots[i]==0) && (foundSlot== POWER_CB_AUTO)) // found an empty slot
|
||||
{
|
||||
powerCbSlots[i] = cbId;
|
||||
foundSlot = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (powerCbSlots[slot] == 0)
|
||||
{
|
||||
powerCbSlots[slot] = cbId;
|
||||
foundSlot= 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// slot already in use!
|
||||
foundSlot = POWER_CB_AUTO;
|
||||
}
|
||||
}
|
||||
if (foundSlot>=0)
|
||||
{
|
||||
__KernelRegisterCallback(THREAD_CALLBACK_POWER, cbId);
|
||||
|
||||
// Immediately notify
|
||||
RETURN(0);
|
||||
|
||||
__KernelNotifyCallbackType(THREAD_CALLBACK_POWER, cbId, 0);
|
||||
__KernelNotifyCallbackType(THREAD_CALLBACK_POWER, cbId, 0xE4); // TODO: I have no idea what the E4 is from the flags, but its needed for the test to pass. Need another example of it being called
|
||||
}
|
||||
return foundSlot;
|
||||
}
|
||||
|
||||
void scePowerUnregisterCallback()
|
||||
int scePowerUnregisterCallback(int slotId)
|
||||
{
|
||||
int slotId = PARAM(0);
|
||||
|
||||
if (slotId < 0 || slotId >= numberOfCBPowerSlots)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (powerCbSlots[slotId] != 0) {
|
||||
|
||||
int cbId = powerCbSlots[slotId];
|
||||
DEBUG_LOG(HLE,"0=scePowerUnregisterCallback(%i) (cbid = %i)", slotId, cbId);
|
||||
__KernelUnregisterCallback(THREAD_CALLBACK_POWER, cbId);
|
||||
RETURN (0);
|
||||
powerCbSlots[slotId] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0x80000025; // TODO: docs say a value less than 0, test checks for this specifically. why??
|
||||
}
|
||||
|
||||
void sceKernelPowerLock()
|
||||
{
|
||||
DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerLock()");
|
||||
RETURN (0);
|
||||
return 0;
|
||||
}
|
||||
void sceKernelPowerUnlock()
|
||||
|
||||
int sceKernelPowerLock(int lockType)
|
||||
{
|
||||
DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerUnlock()");
|
||||
RETURN (0);
|
||||
DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerLock(%i)", lockType);
|
||||
return 0;
|
||||
}
|
||||
void sceKernelPowerTick()
|
||||
int sceKernelPowerUnlock(int lockType)
|
||||
{
|
||||
DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerUnlock(%i)");
|
||||
return 0;
|
||||
}
|
||||
int sceKernelPowerTick(int flag)
|
||||
{
|
||||
DEBUG_LOG(HLE,"UNIMPL 0=sceKernelPowerTick()");
|
||||
RETURN (0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define ERROR_POWER_VMEM_IN_USE 0x802b0200
|
||||
|
||||
void sceKernelVolatileMemTryLock()
|
||||
int sceKernelVolatileMemTryLock(int type, int paddr, int psize)
|
||||
{
|
||||
int type = PARAM(0);
|
||||
int paddr = PARAM(1);
|
||||
int psize = PARAM(2);
|
||||
|
||||
if (!volatileMemLocked)
|
||||
{
|
||||
|
|
@ -117,8 +157,8 @@ void sceKernelVolatileMemTryLock()
|
|||
else
|
||||
{
|
||||
ERROR_LOG(HLE, "sceKernelVolatileMemTryLock - already locked!");
|
||||
RETURN(ERROR_POWER_VMEM_IN_USE);
|
||||
return;
|
||||
//RETURN(ERROR_POWER_VMEM_IN_USE); // does this line still need to be here??
|
||||
return ERROR_POWER_VMEM_IN_USE;
|
||||
}
|
||||
|
||||
// Volatile RAM is always at 0x08400000 and is of size 0x00400000.
|
||||
|
|
@ -126,19 +166,21 @@ void sceKernelVolatileMemTryLock()
|
|||
Memory::Write_U32(0x08400000, paddr);
|
||||
Memory::Write_U32(0x00400000, psize);
|
||||
|
||||
RETURN(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void sceKernelVolatileMemUnlock()
|
||||
int sceKernelVolatileMemUnlock(int type)
|
||||
{
|
||||
INFO_LOG(HLE,"sceKernelVolatileMemUnlock()");
|
||||
// TODO: sanity check
|
||||
volatileMemLocked = false;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void sceKernelVolatileMemLock()
|
||||
int sceKernelVolatileMemLock(int type, int paddr, int psize)
|
||||
{
|
||||
sceKernelVolatileMemTryLock();
|
||||
return sceKernelVolatileMemTryLock(type, paddr, psize);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -156,7 +198,7 @@ void scePowerGetCpuClockFrequencyInt() {
|
|||
|
||||
static const HLEFunction scePower[] =
|
||||
{
|
||||
{0x04B7766E,scePowerRegisterCallback,"scePowerRegisterCallback"},
|
||||
{0x04B7766E,&WrapI_II<scePowerRegisterCallback>,"scePowerRegisterCallback"},
|
||||
{0x2B51FE2F,0,"scePower_2B51FE2F"},
|
||||
{0x442BFBAC,0,"scePowerGetBacklightMaximum"},
|
||||
{0xEFD3C963,0,"scePowerTick"},
|
||||
|
|
@ -166,15 +208,15 @@ static const HLEFunction scePower[] =
|
|||
{0x27F3292C,0,"scePowerBatteryUpdateInfo"},
|
||||
{0xE8E4E204,0,"scePower_E8E4E204"},
|
||||
{0xB999184C,0,"scePowerGetLowBatteryCapacity"},
|
||||
{0x87440F5E,scePowerIsPowerOnline,"scePowerIsPowerOnline"},
|
||||
{0x0AFD0D8B,scePowerIsBatteryExist,"scePowerIsBatteryExist"},
|
||||
{0x1E490401,scePowerIsBatteryCharging,"scePowerIsBatteryCharging"},
|
||||
{0xB4432BC8,scePowerGetBatteryChargingStatus,"scePowerGetBatteryChargingStatus"},
|
||||
{0xD3075926,scePowerIsLowBattery,"scePowerIsLowBattery"},
|
||||
{0x87440F5E,&WrapI_V<scePowerIsPowerOnline>,"scePowerIsPowerOnline"},
|
||||
{0x0AFD0D8B,&WrapI_V<scePowerIsBatteryExist>,"scePowerIsBatteryExist"},
|
||||
{0x1E490401,&WrapI_V<scePowerIsBatteryCharging>,"scePowerIsBatteryCharging"},
|
||||
{0xB4432BC8,&WrapI_V<scePowerGetBatteryChargingStatus>,"scePowerGetBatteryChargingStatus"},
|
||||
{0xD3075926,&WrapI_V<scePowerIsLowBattery>,"scePowerIsLowBattery"},
|
||||
{0x78A1A796,0,"scePowerIsSuspendRequired"},
|
||||
{0x94F5A53F,0,"scePowerGetBatteryRemainCapacity"},
|
||||
{0xFD18A0FF,0,"scePowerGetBatteryFullCapacity"},
|
||||
{0x2085D15D,scePowerGetBatteryLifePercent,"scePowerGetBatteryLifePercent"},
|
||||
{0x2085D15D,&WrapI_V<scePowerGetBatteryLifePercent>,"scePowerGetBatteryLifePercent"},
|
||||
{0x8EFB3FA2,0,"scePowerGetBatteryLifeTime"},
|
||||
{0x28E12023,0,"scePowerGetBatteryTemp"},
|
||||
{0x862AE1A6,0,"scePowerGetBatteryElec"},
|
||||
|
|
@ -190,8 +232,8 @@ static const HLEFunction scePower[] =
|
|||
{0xAC32C9CC,0,"scePowerRequestSuspend"},
|
||||
{0x2875994B,0,"scePower_2875994B"},
|
||||
{0x0074EF9B,0,"scePowerGetResumeCount"},
|
||||
{0xDFA8BAF8,scePowerUnregisterCallback,"scePowerUnregisterCallback"},
|
||||
{0xDB9D28DD,scePowerUnregisterCallback,"scePowerUnregitserCallback"}, //haha
|
||||
{0xDFA8BAF8,&WrapI_I<scePowerUnregisterCallback>,"scePowerUnregisterCallback"},
|
||||
{0xDB9D28DD,&WrapI_I<scePowerUnregisterCallback>,"scePowerUnregitserCallback"}, //haha
|
||||
{0x843FBF43,0,"scePowerSetCpuClockFrequency"},
|
||||
{0xB8D7B3FB,0,"scePowerSetBusClockFrequency"},
|
||||
{0xFEE03A2F,0,"scePowerGetCpuClockFrequency"},
|
||||
|
|
@ -211,15 +253,15 @@ static const HLEFunction scePower[] =
|
|||
//890129c in tyshooter looks bogus
|
||||
const HLEFunction sceSuspendForUser[] =
|
||||
{
|
||||
{0xEADB1BD7,sceKernelPowerLock,"sceKernelPowerLock"}, //(int param) set param to 0
|
||||
{0x3AEE7261,sceKernelPowerUnlock,"sceKernelPowerUnlock"},//(int param) set param to 0
|
||||
{0x090ccb3f,sceKernelPowerTick,"sceKernelPowerTick"},
|
||||
{0xEADB1BD7,&WrapI_I<sceKernelPowerLock>,"sceKernelPowerLock"}, //(int param) set param to 0
|
||||
{0x3AEE7261,&WrapI_I<sceKernelPowerUnlock>,"sceKernelPowerUnlock"},//(int param) set param to 0
|
||||
{0x090ccb3f,&WrapI_I<sceKernelPowerTick>,"sceKernelPowerTick"},
|
||||
|
||||
// There's an extra 4MB that can be allocated, which seems to be "volatile". These functions
|
||||
// let you grab it.
|
||||
{0xa14f40b2,sceKernelVolatileMemTryLock,"sceKernelVolatileMemTryLock"},
|
||||
{0xa569e425,sceKernelVolatileMemUnlock,"sceKernelVolatileMemUnlock"},
|
||||
{0x3e0271d3,sceKernelVolatileMemLock,"sceKernelVolatileMemLock"}, //when "acquiring mem pool" (fired up)
|
||||
{0xa14f40b2,&WrapI_III<sceKernelVolatileMemTryLock>,"sceKernelVolatileMemTryLock"},
|
||||
{0xa569e425,&WrapI_I<sceKernelVolatileMemUnlock>,"sceKernelVolatileMemUnlock"},
|
||||
{0x3e0271d3,&WrapI_III<sceKernelVolatileMemLock>,"sceKernelVolatileMemLock"}, //when "acquiring mem pool" (fired up)
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@ namespace MIPSInt
|
|||
case 0: // vuc2i
|
||||
// Quad is the only option
|
||||
{
|
||||
_dbg_assert_msg_(CPU,0,"Trying to interpret instruction that can't be interpreted");
|
||||
//_dbg_assert_msg_(CPU,0,"Trying to interpret instruction that can't be interpreted");
|
||||
// this op appears to be bugged and most likely useless, and this stuff is wrong. I've disabled this op in the vfpu_convert test
|
||||
u32 value = s[0];
|
||||
u32 value2 = value / 2;
|
||||
|
|
|
|||
2
test.py
2
test.py
|
|
@ -31,6 +31,7 @@ tests_good = [
|
|||
"gpu/callbacks/ge_callbacks",
|
||||
"threads/mbx/mbx",
|
||||
"rtc/rtc",
|
||||
"power/power",
|
||||
]
|
||||
|
||||
# These are the next tests up for fixing.
|
||||
|
|
@ -46,7 +47,6 @@ tests_next = [
|
|||
"io/iodrv/iodrv",
|
||||
"malloc/malloc",
|
||||
"modules/loadexec/loader",
|
||||
"power/power",
|
||||
"threads/events/events",
|
||||
"threads/fpl/fpl",
|
||||
"threads/msgpipe/msgpipe",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue