From ded3fb5e123ac0afb1c0a6837c67f0aa2e8f7ecd Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 19 May 2013 17:54:14 -0700 Subject: [PATCH] Add reporting to a bunch of unimpl functions. Also some comment/logging fixes along the way. --- Core/HLE/HLETables.cpp | 2 +- Core/HLE/sceFont.cpp | 11 ++++++----- Core/HLE/sceGameUpdate.cpp | 2 +- Core/HLE/sceGe.cpp | 5 +---- Core/HLE/sceIo.cpp | 12 ++++++------ Core/HLE/sceJpeg.cpp | 29 +++++++++++++++-------------- Core/HLE/sceKernel.h | 2 +- Core/HLE/sceKernelModule.cpp | 15 +++++++++------ Core/HLE/sceMd5.cpp | 11 ++++++----- Core/HLE/sceMp3.cpp | 13 +++++++------ Core/HLE/sceMp4.cpp | 7 ++++--- Core/HLE/sceP3da.cpp | 9 +++++---- Core/HLE/scePsmf.cpp | 11 ++++++----- Core/HLE/sceRtc.cpp | 17 +++++++++-------- Core/HLE/sceSas.cpp | 10 +++++----- Core/HLE/sceUtility.cpp | 4 ++-- Core/HLE/sceVaudio.cpp | 5 +++-- 17 files changed, 87 insertions(+), 78 deletions(-) diff --git a/Core/HLE/HLETables.cpp b/Core/HLE/HLETables.cpp index b1a9881fa9..a5d1919881 100644 --- a/Core/HLE/HLETables.cpp +++ b/Core/HLE/HLETables.cpp @@ -159,7 +159,7 @@ const HLEFunction LoadCoreForKernel[] = {0xCCE4A157, 0, "sceKernelFindModuleByUID"}, {0x82CE54ED, 0, "sceKernelModuleCount"}, {0xC0584F0C, 0, "sceKernelGetModuleList"}, - {0xCF8A41B1, WrapU_V,"sceKernelFindModuleByName"}, + {0xCF8A41B1, WrapU_C,"sceKernelFindModuleByName"}, }; diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index aca1f6663a..c896dc10fa 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -11,6 +11,7 @@ #include "../MIPS/MIPS.h" #include "ChunkFile.h" #include "Core/FileSystems/FileSystem.h" +#include "Core/Reporting.h" #include "Core/System.h" #include "Core/HLE/sceKernel.h" #include "Core/Font/PGF.h" @@ -793,7 +794,7 @@ int sceFontGetCharInfo(u32 fontHandle, u32 charCode, u32 charInfoPtr) { // Not sure about the arguments. int sceFontGetShadowInfo(u32 fontHandle, u32 charCode, u32 shadowCharInfoPtr) { - ERROR_LOG(HLE, "UNIMPL sceFontGetShadowInfo(%08x, %i, %08x)", fontHandle, charCode, shadowCharInfoPtr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceFontGetShadowInfo(%08x, %i, %08x)", fontHandle, charCode, shadowCharInfoPtr); // TODO return 0; } @@ -816,7 +817,7 @@ int sceFontGetCharImageRect(u32 fontHandle, u32 charCode, u32 charRectPtr) { } int sceFontGetShadowImageRect(u32 fontHandle, u32 charCode, u32 charRectPtr) { - ERROR_LOG(HLE, "UNIMPL sceFontGetShadowImageRect()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceFontGetShadowImageRect()"); return 0; } @@ -946,17 +947,17 @@ float sceFontPointToPixelV(int fontLibHandle, float fontPointsV, u32 errorCodePt } int sceFontCalcMemorySize() { - ERROR_LOG(HLE, "UNIMPL sceFontCalcMemorySize()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceFontCalcMemorySize()"); return 0; } int sceFontGetShadowGlyphImage() { - ERROR_LOG(HLE, "UNIMPL sceFontGetShadowGlyphImage()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceFontGetShadowGlyphImage()"); return 0; } int sceFontGetShadowGlyphImage_Clip() { - ERROR_LOG(HLE, "UNIMPL sceFontGetShadowGlyphImage_Clip()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceFontGetShadowGlyphImage_Clip()"); return 0; } diff --git a/Core/HLE/sceGameUpdate.cpp b/Core/HLE/sceGameUpdate.cpp index 650783c0b4..b1c49e78b4 100644 --- a/Core/HLE/sceGameUpdate.cpp +++ b/Core/HLE/sceGameUpdate.cpp @@ -20,7 +20,7 @@ u32 sceGameUpdateInit() { - ERROR_LOG(HLE, "UNIMPL ceGameUpdateInit()"); + ERROR_LOG(HLE, "UNIMPL sceGameUpdateInit()"); return 0; } diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp index 525cce4faa..d41ecfae48 100644 --- a/Core/HLE/sceGe.cpp +++ b/Core/HLE/sceGe.cpp @@ -263,18 +263,15 @@ u32 sceGeListEnQueueHead(u32 listAddress, u32 stallAddress, int callbackId, DEBUG_LOG(HLE, "sceGeListEnQueueHead(addr=%08x, stall=%08x, cbid=%08x, param=%08x)", listAddress, stallAddress, callbackId, optParamAddr); - //if (!stallAddress) - // stallAddress = listAddress; u32 listID = gpu->EnqueueList(listAddress, stallAddress, __GeSubIntrBase(callbackId), true); DEBUG_LOG(HLE, "List %i enqueued.", listID); - //return display list ID return listID; } int sceGeListDeQueue(u32 listID) { - ERROR_LOG(HLE, "UNIMPL sceGeListDeQueue(%08x)", listID); + WARN_LOG(HLE, "sceGeListDeQueue(%08x)", listID); return gpu->DequeueList(listID); } diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index cfb1afde2a..40dc45e5f3 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -574,7 +574,7 @@ u32 sceIoWriteAsync(int id, u32 data_addr, int size) { u32 sceIoGetDevType(int id) { - ERROR_LOG(HLE, "UNIMPL sceIoGetDevType(%d)", id); + ERROR_LOG_REPORT(HLE, "UNIMPL sceIoGetDevType(%d)", id); u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); int result; @@ -590,7 +590,7 @@ u32 sceIoGetDevType(int id) u32 sceIoCancel(int id) { - ERROR_LOG(HLE, "UNIMPL sceIoCancel(%d)", id); + ERROR_LOG_REPORT(HLE, "UNIMPL sceIoCancel(%d)", id); u32 error; FileNode *f = kernelObjects.Get < FileNode > (id, error); if (f) { @@ -1561,24 +1561,24 @@ u32 sceIoIoctlAsync(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u __IoSchedAsync(f, id, 100); return 0; } else { - ERROR_LOG(HLE, "UNIMPL %08x=sceIoIoctl id: %08x, cmd %08x, bad file", error, id, cmd); + ERROR_LOG(HLE, "UNIMPL %08x=sceIoIoctlAsync id: %08x, cmd %08x, bad file", error, id, cmd); return error; } } u32 sceIoGetFdList(u32 outAddr, int outSize, u32 fdNumAddr) { - ERROR_LOG(HLE, "UNIMPL sceIoGetFdList(%08x, %i, %08x)", outAddr, outSize, fdNumAddr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceIoGetFdList(%08x, %i, %08x)", outAddr, outSize, fdNumAddr); return 0; } // Presumably lets you hook up stderr to a MsgPipe. u32 sceKernelRegisterStderrPipe(u32 msgPipeUID) { - ERROR_LOG(HLE, "UNIMPL sceKernelRegisterStderrPipe(%08x)", msgPipeUID); + ERROR_LOG_REPORT(HLE, "UNIMPL sceKernelRegisterStderrPipe(%08x)", msgPipeUID); return 0; } u32 sceKernelRegisterStdoutPipe(u32 msgPipeUID) { - ERROR_LOG(HLE, "UNIMPL sceKernelRegisterStdoutPipe(%08x)", msgPipeUID); + ERROR_LOG_REPORT(HLE, "UNIMPL sceKernelRegisterStdoutPipe(%08x)", msgPipeUID); return 0; } diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp index 679d2eb5e3..3ab3e8c169 100644 --- a/Core/HLE/sceJpeg.cpp +++ b/Core/HLE/sceJpeg.cpp @@ -15,84 +15,85 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/Reporting.h" int sceJpegDecompressAllImage() { - ERROR_LOG(HLE, "UNIMPL sceJpegDecompressAllImage"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegDecompressAllImage"); return 0; } int sceJpegMJpegCsc() { - ERROR_LOG(HLE, "UNIMPL sceJpegMJpegCsc"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegMJpegCsc"); return 0; } int sceJpegDecodeMJpeg() { - ERROR_LOG(HLE, "UNIMPL sceJpegDecodeMJpeg"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegDecodeMJpeg"); return 0; } int sceJpegDecodeMJpegYCbCrSuccessively() { - ERROR_LOG(HLE, "UNIMPL sceJpegDecodeMJpegYCbCrSuccessively"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegDecodeMJpegYCbCrSuccessively"); return 0; } int sceJpegDeleteMJpeg() { - ERROR_LOG(HLE, "UNIMPL sceJpegDeleteMJpeg"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegDeleteMJpeg"); return 0; } int sceJpegDecodeMJpegSuccessively() { - ERROR_LOG(HLE, "UNIMPL sceJpegDecodeMJpegSuccessively"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegDecodeMJpegSuccessively"); return 0; } int sceJpegCsc() { - ERROR_LOG(HLE, "UNIMPL sceJpegCsc"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegCsc"); return 0; } int sceJpegFinishMJpeg() { - ERROR_LOG(HLE, "UNIMPL sceJpegFinishMJpeg"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegFinishMJpeg"); return 0; } int sceJpegGetOutputInfo() { - ERROR_LOG(HLE, "UNIMPL sceJpegGetOutputInfo"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegGetOutputInfo"); return 0; } int sceJpegDecodeMJpegYCbCr() { - ERROR_LOG(HLE, "UNIMPL sceJpegDecodeMJpegYCbCr"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegDecodeMJpegYCbCr"); return 0; } int sceJpeg_9B36444C() { - ERROR_LOG(HLE, "UNIMPL sceJpeg_9B36444C"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpeg_9B36444C"); return 0; } int sceJpegCreateMJpeg() { - ERROR_LOG(HLE, "UNIMPL sceJpegCreateMJpeg"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegCreateMJpeg"); return 0; } int sceJpegInitMJpeg() { - ERROR_LOG(HLE, "UNIMPL sceJpegInitMJpeg"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceJpegInitMJpeg"); return 0; } diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h index f5e03e6dab..96dd55374a 100644 --- a/Core/HLE/sceKernel.h +++ b/Core/HLE/sceKernel.h @@ -376,7 +376,7 @@ u32 sceKernelDevkitVersion(); u32 sceKernelRegisterKprintfHandler(); void sceKernelRegisterDefaultExceptionHandler(); -u32 sceKernelFindModuleByName(); +u32 sceKernelFindModuleByName(const char *name); void sceKernelSetGPO(u32 ledAddr); u32 sceKernelGetGPI(); diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index a6055039de..c5eed23fb3 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -854,7 +854,7 @@ void sceKernelStartModule(u32 moduleId, u32 argsize, u32 argAddr, u32 returnValu INFO_LOG(HLE, "sceKernelStartModule(%d,asize=%08x,aptr=%08x,retptr=%08x,%08x): faked (undecryptable module)", moduleId,argsize,argAddr,returnValueAddr,optionAddr); } else { - WARN_LOG(HLE, "UNIMPL sceKernelStartModule(%d,asize=%08x,aptr=%08x,retptr=%08x,%08x)", + WARN_LOG(HLE, "sceKernelStartModule(%d,asize=%08x,aptr=%08x,retptr=%08x,%08x)", moduleId,argsize,argAddr,returnValueAddr,optionAddr); u32 entryAddr = module->nm.entry_addr; @@ -887,6 +887,7 @@ u32 sceKernelStopModule(u32 moduleId, u32 argSize, u32 argAddr, u32 returnValueA ERROR_LOG(HLE,"UNIMPL sceKernelStopModule(%08x, %08x, %08x, %08x, %08x)", moduleId, argSize, argAddr, returnValueAddr, optionAddr); // We should call the "stop" entry point and return the value in returnValueAddr. See StartModule. + // Possibly also kill all its threads? return 0; } @@ -902,9 +903,11 @@ u32 sceKernelUnloadModule(u32 moduleId) return 0; } -u32 sceKernelStopUnloadSelfModuleWithStatus(u32 moduleId, u32 argSize, u32 argp, u32 statusAddr, u32 optionAddr) +u32 sceKernelStopUnloadSelfModuleWithStatus(u32 exitCode, u32 argSize, u32 argp, u32 statusAddr, u32 optionAddr) { - ERROR_LOG(HLE,"UNIMPL sceKernelStopUnloadSelfModuleWithStatus(%08x, %08x, %08x, %08x, %08x,)", moduleId, argSize, argp, statusAddr, optionAddr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceKernelStopUnloadSelfModuleWithStatus(%08x, %08x, %08x, %08x, %08x): game has likely crashed", exitCode, argSize, argp, statusAddr, optionAddr); + + // Probably similar to sceKernelStopModule, but games generally call this when they die. return 0; } @@ -945,9 +948,9 @@ u32 sceKernelGetModuleId() return __KernelGetCurThreadModuleId(); } -u32 sceKernelFindModuleByName() +u32 sceKernelFindModuleByName(const char *name) { - ERROR_LOG(HLE,"UNIMPL sceKernelFindModuleByName()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceKernelFindModuleByName(%s)", name); return 1; } @@ -993,7 +996,7 @@ u32 sceKernelLoadModuleByID(u32 id, u32 flags, u32 lmoptionPtr) u32 sceKernelLoadModuleDNAS(const char *name, u32 flags) { - ERROR_LOG(HLE,"UNIMPL 0=sceKernelLoadModuleDNAS()"); + ERROR_LOG_REPORT(HLE, "UNIMPL 0=sceKernelLoadModuleDNAS()"); return 0; } diff --git a/Core/HLE/sceMd5.cpp b/Core/HLE/sceMd5.cpp index 5e0239cb96..96d2a8f456 100644 --- a/Core/HLE/sceMd5.cpp +++ b/Core/HLE/sceMd5.cpp @@ -15,7 +15,8 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/Reporting.h" // Not really sure where these belong - is it worth giving them their own file? u32 sceKernelUtilsMt19937Init(u32 ctx, u32 seed) { @@ -39,25 +40,25 @@ u32 sceKernelUtilsMt19937UInt(u32 ctx) { int sceMd5BlockInit(u32 ctxAddr) { - ERROR_LOG(HLE, "UNIMPL sceMd5BlockInit(%08x)", ctxAddr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMd5BlockInit(%08x)", ctxAddr); return 0; } int sceMd5BlockUpdate(u32 ctxAddr, u32 dataPtr, u32 len) { - ERROR_LOG(HLE, "UNIMPL sceMd5BlockUpdate(%08x, %08x, %d)", ctxAddr, dataPtr, len); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMd5BlockUpdate(%08x, %08x, %d)", ctxAddr, dataPtr, len); return 0; } int sceMd5BlockResult(u32 ctxAddr, u32 digestAddr) { - ERROR_LOG(HLE, "UNIMPL sceMd5BlockResult(%08x, %08x)", ctxAddr, digestAddr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMd5BlockResult(%08x, %08x)", ctxAddr, digestAddr); return 0; } int sceMd5Digest(u32 dataPtr, u32 len, u32 digestAddr) { - ERROR_LOG(HLE, "UNIMPL sceMd5Digest(%08x, %d, %08x)", dataPtr, len, digestAddr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMd5Digest(%08x, %d, %08x)", dataPtr, len, digestAddr); return 0; } diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 6808a08e2e..417c83e3bf 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -16,8 +16,9 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "HLE.h" -#include "../HW/MediaEngine.h" +#include "Core/HLE/HLE.h" +#include "Core/HW/MediaEngine.h" +#include "Core/Reporting.h" static const int MP3_BITRATES[] = {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320}; @@ -279,7 +280,7 @@ int sceMp3NotifyAddStreamData(u32 mp3, int size) { } int sceMp3GetSumDecodedSample(u32 mp3) { - DEBUG_LOG(HLE, "UNIMPL: sceMp3GetSumDecodedSample(%08X)", mp3); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMp3GetSumDecodedSample(%08X)", mp3); return 0; } @@ -359,17 +360,17 @@ int sceMp3ReleaseMp3Handle(u32 mp3) { } u32 sceMp3EndEntry() { - DEBUG_LOG(HLE, "UNIMPL sceMp3StartEntry(.)"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMp3EndEntry(...)"); return 0; } u32 sceMp3StartEntry() { - DEBUG_LOG(HLE, "UNIMPL sceMp3StartEntry(.)"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMp3StartEntry(...)"); return 0; } u32 sceMp3GetFrameNum(u32 mp3) { - DEBUG_LOG(HLE, "UNIMPL sceMp3GetFrameNum(%08x)", mp3); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMp3GetFrameNum(%08x)", mp3); return 0; } diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index 45a179659f..678ccb0cf2 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -15,12 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/Reporting.h" u32 sceMp4Init() { - ERROR_LOG(HLE, "UNIMPL sceMp4Init()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMp4Init()"); return 0; } @@ -32,7 +33,7 @@ u32 sceMp4Finish() u32 sceMp4Create() { - ERROR_LOG(HLE, "UNIMPL sceMp4Create()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceMp4Create()"); return 0; } diff --git a/Core/HLE/sceP3da.cpp b/Core/HLE/sceP3da.cpp index 1cbfd63a5c..5676032e5a 100644 --- a/Core/HLE/sceP3da.cpp +++ b/Core/HLE/sceP3da.cpp @@ -15,24 +15,25 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/Reporting.h" u32 sceP3daBridgeInit(u32 channelsNum, u32 samplesNum) { - DEBUG_LOG(HLE, "UNIMPL sceP3daBridgeInit(%08x, %08x)", channelsNum, samplesNum); + ERROR_LOG_REPORT(HLE, "UNIMPL sceP3daBridgeInit(%08x, %08x)", channelsNum, samplesNum); return 0; } u32 sceP3daBridgeExit() { - DEBUG_LOG(HLE, "UNIMPL sceP3daBridgeExit()"); + ERROR_LOG_REPORT(HLE, "UNIMPL sceP3daBridgeExit()"); return 0; } u32 sceP3daBridgeCore(u32 p3daCoreAddr, u32 channelsNum, u32 samplesNum, u32 inputAddr, u32 outputAddr) { - DEBUG_LOG(HLE, "UNIMPL sceP3daBridgeCore(%08x, %08x, %08x, %08x, %08x)", p3daCoreAddr, channelsNum, samplesNum, inputAddr, outputAddr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceP3daBridgeCore(%08x, %08x, %08x, %08x, %08x)", p3daCoreAddr, channelsNum, samplesNum, inputAddr, outputAddr); return 0; } diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index 4e36e3c508..66b751588b 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -15,11 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" -#include "ChunkFile.h" +#include "Core/HLE/HLE.h" +#include "Common/ChunkFile.h" +#include "Core/Reporting.h" -#include "scePsmf.h" -#include "sceMpeg.h" +#include "Core/HLE/scePsmf.h" +#include "Core/HLE/sceMpeg.h" #include @@ -391,7 +392,7 @@ u32 scePsmfGetNumberOfSpecificStreams(u32 psmfStruct, u32 streamType) { Psmf *psmf = getPsmf(psmfStruct); if (!psmf) { - ERROR_LOG(HLE, "UNIMPL scePsmfGetNumberOfSpecificStreams - invalid psmf"); + ERROR_LOG(HLE, "scePsmfGetNumberOfSpecificStreams - invalid psmf"); return ERROR_PSMF_NOT_FOUND; } INFO_LOG(HLE, "scePsmfGetNumberOfSpecificStreams(%08x, %08x)", psmfStruct, streamType); diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp index 1295f7e0ba..e64395286a 100644 --- a/Core/HLE/sceRtc.cpp +++ b/Core/HLE/sceRtc.cpp @@ -24,12 +24,13 @@ #include #include "base/timeutil.h" -#include "HLE.h" -#include "../MIPS/MIPS.h" +#include "Core/HLE/HLE.h" +#include "Core/MIPS/MIPS.h" +#include "Core/Reporting.h" +#include "Core/CoreTiming.h" -#include "sceKernel.h" -#include "sceRtc.h" -#include "../CoreTiming.h" +#include "Core/HLE/sceKernel.h" +#include "Core/HLE/sceRtc.h" // This is a base time that everything is relative to. // This way, time doesn't move strangely with savestates, turbo speed, etc. @@ -625,13 +626,13 @@ int sceRtcGetDosTime(u32 datePtr, u32 dosTime) int sceRtcSetWin32FileTime(u32 datePtr, u32 win32TimePtr) { - ERROR_LOG(HLE, "UNIMPL sceRtcSetWin32FileTime(%d,%d)", datePtr, win32TimePtr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceRtcSetWin32FileTime(%d,%d)", datePtr, win32TimePtr); return 0; } int sceRtcGetWin32FileTime(u32 datePtr, u32 win32TimePtr) { - ERROR_LOG(HLE, "UNIMPL sceRtcGetWin32FileTime(%d,%d)", datePtr, win32TimePtr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceRtcGetWin32FileTime(%d,%d)", datePtr, win32TimePtr); return 0; } @@ -822,7 +823,7 @@ int sceRtcTickAddYears(u32 destTickPtr, u32 srcTickPtr, int numYears) int sceRtcParseDateTime(u32 destTickPtr, u32 dateStringPtr) { - ERROR_LOG(HLE, "UNIMPL sceRtcParseDateTime(%d,%d)", destTickPtr, dateStringPtr); + ERROR_LOG_REPORT(HLE, "UNIMPL sceRtcParseDateTime(%d,%d)", destTickPtr, dateStringPtr); return 0; } diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index 5618105d38..924c4a334c 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -416,27 +416,27 @@ u32 sceSasGetAllEnvelopeHeights(u32 core, u32 heightsAddr) { } u32 sceSasSetTriangularWave(u32 sasCore, int voice, int unknown) { - ERROR_LOG(HLE,"UNIMPL sceSasSetTriangularWave(%08x, %i, %i)", sasCore, voice, unknown); + ERROR_LOG_REPORT(HLE, "UNIMPL sceSasSetTriangularWave(%08x, %i, %i)", sasCore, voice, unknown); return 0; } u32 sceSasSetSteepWave(u32 sasCore, int voice, int unknown) { - ERROR_LOG(HLE,"UNIMPL sceSasSetSteepWave(%08x, %i, %i)", sasCore, voice, unknown); + ERROR_LOG_REPORT(HLE, "UNIMPL sceSasSetSteepWave(%08x, %i, %i)", sasCore, voice, unknown); return 0; } u32 __sceSasSetVoiceATRAC3(u32 core, int voice, int atrac3Context) { - ERROR_LOG(HLE,"UNIMPL __sceSasSetVoiceATRAC3(%08x, %i, %i)", core, voice, atrac3Context); + ERROR_LOG_REPORT(HLE, "UNIMPL __sceSasSetVoiceATRAC3(%08x, %i, %i)", core, voice, atrac3Context); return 0; } u32 __sceSasConcatenateATRAC3(u32 core, int voice, u32 atrac3DataAddr, int atrac3DataLength) { - ERROR_LOG(HLE,"UNIMPL __sceSasConcatenateATRAC3(%08x, %i, %08x, %i)", core, voice, atrac3DataAddr, atrac3DataLength); + ERROR_LOG_REPORT(HLE, "UNIMPL __sceSasConcatenateATRAC3(%08x, %i, %08x, %i)", core, voice, atrac3DataAddr, atrac3DataLength); return 0; } u32 __sceSasUnsetATRAC3(u32 core, int voice) { - ERROR_LOG(HLE, "UNIMPL __sceSasUnsetATRAC3(%08x, %i)", core, voice); + ERROR_LOG_REPORT(HLE, "UNIMPL __sceSasUnsetATRAC3(%08x, %i)", core, voice); return 0; } diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index f20bee688d..233db68949 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -386,7 +386,7 @@ int sceUtilityScreenshotGetStatus() void sceUtilityGamedataInstallInitStart(u32 unkown) { - ERROR_LOG(HLE, "UNIMPL sceUtilityGamedataInstallInitStart(%i)", unkown); + ERROR_LOG_REPORT(HLE, "UNIMPL sceUtilityGamedataInstallInitStart(%i)", unkown); } int sceUtilityGamedataInstallGetStatus() @@ -488,7 +488,7 @@ int sceUtilityStoreCheckoutShutdownStart() int sceUtilityStoreCheckoutInitStart(u32 paramsPtr) { - ERROR_LOG(HLE,"UNIMPL sceUtilityStoreCheckoutInitStart(%d)", paramsPtr); + ERROR_LOG_REPORT(HLE,"UNIMPL sceUtilityStoreCheckoutInitStart(%d)", paramsPtr); return 0; } diff --git a/Core/HLE/sceVaudio.cpp b/Core/HLE/sceVaudio.cpp index 6583eb7bc2..d8b24c32e8 100644 --- a/Core/HLE/sceVaudio.cpp +++ b/Core/HLE/sceVaudio.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/ChunkFile.h" +#include "Core/Reporting.h" #include "Core/HLE/HLE.h" #include "Core/HLE/sceVaudio.h" #include "Core/HLE/sceAudio.h" @@ -76,12 +77,12 @@ u32 sceVaudioOutputBlocking(int vol, u32 buffer) { } u32 sceVaudioSetEffectType(int effectType, int vol) { - ERROR_LOG(HLE, "UNIMPL sceVaudioSetEffectType(%i, %i)", effectType, vol); + ERROR_LOG_REPORT(HLE, "UNIMPL sceVaudioSetEffectType(%i, %i)", effectType, vol); return 0; } u32 sceVaudioSetAlcMode(int alcMode) { - ERROR_LOG(HLE, "UNIMPL sceVaudioSetAlcMode(%i)", alcMode); + ERROR_LOG_REPORT(HLE, "UNIMPL sceVaudioSetAlcMode(%i)", alcMode); return 0; }