archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-15 19:28:29 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nn_fp: Multiple fixes

Browse source
This commit is contained in:
Exzap 2023-10-19 05:55:52 +02:00
parent b0a7fd4e07
commit f3c95f72e7
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Cafe/OS/libs/nn_fp/nn_fp.cpp
View file

@ -55,8 +55,8 @@ namespace nn
{
std::unique_lock _l(m_mtx);
void* p = g_fp.fpBufferHeap->alloc(size, 32);
uint32 heapSize, allocationSize, allocNum;
g_fp.fpBufferHeap->getStats(heapSize, allocationSize, allocNum);
if (!p)
cemuLog_log(LogType::Force, "nn_fp: Internal heap is full");
return p;
}
@ -153,8 +153,11 @@ namespace nn
totalBufferSize += m_vec[i].size;
totalBufferSize = (totalBufferSize+31)&~31;
}
m_dataBuffer = FPIpcBufferAllocator.Allocate(totalBufferSize, 32);
cemu_assert_debug(m_dataBuffer);
if(totalBufferSize > 0)
{
m_dataBuffer = FPIpcBufferAllocator.Allocate(totalBufferSize, 32);
cemu_assert_debug(m_dataBuffer);
}
// update Ioctl vector addresses
for(uint8 i=0; i<m_numVecIn + m_numVecOut; i++)
{
@ -176,9 +179,7 @@ namespace nn
ppcDefineParamPtr(ipcCtx, FPIpcContext, 1);
ipcCtx->m_asyncResult = result; // store result in variable since FP callbacks pass a pointer to nnResult and not the value directly
ipcCtx->CopyBackOutputs();
cemuLog_logDebug(LogType::Force, "[DBG] AsyncHandler BeforeCallback");
PPCCoreCallback(ipcCtx->m_callbackFunc, &ipcCtx->m_asyncResult, ipcCtx->m_callbackParam);
cemuLog_logDebug(LogType::Force, "[DBG] AsyncHandler AfterCallback");
delete ipcCtx;
osLib_returnFromFunction(hCPU, 0);
}