diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index e508313567..f42e7b9acb 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -21,6 +21,7 @@ #include "HLE.h" #include "../MIPS/MIPS.h" +#include "../CoreTiming.h" #include "sceKernel.h" #include "sceUtility.h" @@ -39,6 +40,22 @@ struct Atrac { Atrac globalAtrac; +// Temporary workaround to prevent excessive logging making games very slow. +// This is just the default cycle / 10, so about 1/10 second. +const u64 atracLogTickFrequency = 22200; +static bool atracShouldLogUnimpl(u64 &lastTicks) +{ + u64 ticks = CoreTiming::GetTicks(); + bool result = ticks - lastTicks >= atracLogTickFrequency; + lastTicks = ticks; + + return result; +} + +// Switch if you want all errors. +#define ERROR_LOG_LIMITED(t, ...) { static u64 limited__lastTicks = 0; if (atracShouldLogUnimpl(limited__lastTicks)) ERROR_LOG(t, __VA_ARGS__); } +//#define ERROR_LOG_LIMITED(t, ...) { ERROR_LOG(t, __VA_ARGS__); } + // TODO: Properly. Atrac *getAtrac(int atracID) { if (atracID == 1) { @@ -60,13 +77,13 @@ int getCodecType(int addr) { u32 sceAtracGetAtracID(int codecType) { - ERROR_LOG(HLE, "FAKE sceAtracGetAtracID(%i)", codecType); + ERROR_LOG_LIMITED(HLE, "FAKE sceAtracGetAtracID(%i)", codecType); return 1; } u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) { - ERROR_LOG(HLE, "UNIMPL sceAtracAddStreamData(%i, %08x)", atracID, bytesToAdd); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracAddStreamData(%i, %08x)", atracID, bytesToAdd); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -77,7 +94,7 @@ u32 sceAtracAddStreamData(int atracID, u32 bytesToAdd) u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { - ERROR_LOG(HLE, "FAKE sceAtracDecodeData(%i, %08x, %08x, %08x, %08x)", atracID, outAddr, numSamplesAddr, finishFlagAddr, remainAddr); + ERROR_LOG_LIMITED(HLE, "FAKE sceAtracDecodeData(%i, %08x, %08x, %08x, %08x)", atracID, outAddr, numSamplesAddr, finishFlagAddr, remainAddr); Memory::Write_U16(0, outAddr); // Write a single 16-bit stereo Memory::Write_U16(0, outAddr + 2); @@ -90,13 +107,13 @@ u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishF u32 sceAtracEndEntry() { - ERROR_LOG(HLE, "UNIMPL sceAtracEndEntry(.)"); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracEndEntry(.)"); return 0; } u32 sceAtracGetBufferInfoForReseting(int atracID, int sample, u32 bufferInfoAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetBufferInfoForReseting(%i, %i, %08x)",atracID, sample, bufferInfoAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetBufferInfoForReseting(%i, %i, %08x)",atracID, sample, bufferInfoAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -108,7 +125,7 @@ u32 sceAtracGetBufferInfoForReseting(int atracID, int sample, u32 bufferInfoAddr u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetBitrate(%i, %08x)", atracID, outBitrateAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetBitrate(%i, %08x)", atracID, outBitrateAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -120,7 +137,7 @@ u32 sceAtracGetBitrate(int atracID, u32 outBitrateAddr) u32 sceAtracGetChannel(int atracID, u32 channelAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetChannel(%i, %08x)", atracID, channelAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetChannel(%i, %08x)", atracID, channelAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -132,7 +149,7 @@ u32 sceAtracGetChannel(int atracID, u32 channelAddr) u32 sceAtracGetLoopStatus(int atracID, u32 loopNbr, u32 statusAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetLoopStatus(%i, %08x, %08x)", atracID, loopNbr, statusAddr ); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetLoopStatus(%i, %08x, %08x)", atracID, loopNbr, statusAddr ); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -142,7 +159,7 @@ u32 sceAtracGetLoopStatus(int atracID, u32 loopNbr, u32 statusAddr) u32 sceAtracGetInternalErrorInfo(int atracID, u32 errorAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetInternalErrorInfo(%i, %08x)", atracID, errorAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetInternalErrorInfo(%i, %08x)", atracID, errorAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -154,7 +171,7 @@ u32 sceAtracGetInternalErrorInfo(int atracID, u32 errorAddr) u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetMaxSample(%i, %08x)", atracID, maxSamplesAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetMaxSample(%i, %08x)", atracID, maxSamplesAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -166,7 +183,7 @@ u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetNextDecodePosition(%i, %08x)", atracID, outposAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetNextDecodePosition(%i, %08x)", atracID, outposAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -177,7 +194,7 @@ u32 sceAtracGetNextDecodePosition(int atracID, u32 outposAddr) u32 sceAtracGetNextSample(int atracID, u32 outNAddr) { - ERROR_LOG(HLE, "FAKE sceAtracGetNextSample(%i, %08x)", atracID, outNAddr); + ERROR_LOG_LIMITED(HLE, "FAKE sceAtracGetNextSample(%i, %08x)", atracID, outNAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -188,7 +205,7 @@ u32 sceAtracGetNextSample(int atracID, u32 outNAddr) u32 sceAtracGetRemainFrame(int atracID, u32 outposAddr) { - ERROR_LOG(HLE, "sceAtracGetRemainFrame(%i, %08x)", atracID, outposAddr); + ERROR_LOG_LIMITED(HLE, "sceAtracGetRemainFrame(%i, %08x)", atracID, outposAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -199,7 +216,7 @@ u32 sceAtracGetRemainFrame(int atracID, u32 outposAddr) u32 sceAtracGetSecondBufferInfo(int atracID, u32 outposAddr, u32 outBytesAddr) { - ERROR_LOG(HLE, "sceAtracGetSecondBufferInfo(%i, %08x, %08x)", atracID, outposAddr, outBytesAddr); + ERROR_LOG_LIMITED(HLE, "sceAtracGetSecondBufferInfo(%i, %08x, %08x)", atracID, outposAddr, outBytesAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -211,7 +228,7 @@ u32 sceAtracGetSecondBufferInfo(int atracID, u32 outposAddr, u32 outBytesAddr) u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoopStartSampleAddr, u32 outLoopEndSampleAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetSoundSample(%i, %08x, %08x, %08x)", atracID, outEndSampleAddr, outLoopStartSampleAddr, outLoopEndSampleAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetSoundSample(%i, %08x, %08x, %08x)", atracID, outEndSampleAddr, outLoopStartSampleAddr, outLoopEndSampleAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -224,7 +241,7 @@ u32 sceAtracGetSoundSample(int atracID, u32 outEndSampleAddr, u32 outLoopStartSa u32 sceAtracGetStreamDataInfo(int atracID, u32 writePointerAddr, u32 availableBytesAddr, u32 readOffsetAddr) { - ERROR_LOG(HLE, "FAKE sceAtracGetStreamDataInfo(%i, %08x, %08x, %08x)", atracID, writePointerAddr, availableBytesAddr, readOffsetAddr); + ERROR_LOG_LIMITED(HLE, "FAKE sceAtracGetStreamDataInfo(%i, %08x, %08x, %08x)", atracID, writePointerAddr, availableBytesAddr, readOffsetAddr); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -237,13 +254,13 @@ u32 sceAtracGetStreamDataInfo(int atracID, u32 writePointerAddr, u32 availableBy u32 sceAtracReleaseAtracID(int atracID) { - ERROR_LOG(HLE, "UNIMPL sceAtracReleaseAtracID(%i)", atracID); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracReleaseAtracID(%i)", atracID); return 0; } u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf) { - ERROR_LOG(HLE, "UNIMPL sceAtracResetPlayPosition(%i, %i, %i, %i)", atracID, sample, bytesWrittenFirstBuf, bytesWrittenSecondBuf); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracResetPlayPosition(%i, %i, %i, %i)", atracID, sample, bytesWrittenFirstBuf, bytesWrittenSecondBuf); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -253,7 +270,7 @@ u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFirstBuf, u32 sceAtracSetHalfwayBuffer(int atracID, u32 halfBuffer, u32 readSize, u32 halfBufferSize) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetHalfwayBuffer(%i, %08x, %8x, %8x)", atracID, halfBuffer, readSize, halfBufferSize); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetHalfwayBuffer(%i, %08x, %8x, %8x)", atracID, halfBuffer, readSize, halfBufferSize); return 0; } @@ -269,45 +286,45 @@ u32 sceAtracSetSecondBuffer(int atracID, u32 secondBuffer, u32 secondBufferSize) u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetData(%i, %08x, %08x)", atracID, buffer, bufferSize); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetData(%i, %08x, %08x)", atracID, buffer, bufferSize); return 0; } int sceAtracSetDataAndGetID(u32 buffer, u32 bufferSize) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetDataAndGetID(%08x, %08x)", buffer, bufferSize); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetDataAndGetID(%08x, %08x)", buffer, bufferSize); int codecType = getCodecType(buffer); return 1; } int sceAtracSetHalfwayBufferAndGetID(int atracID, u32 halfBuffer, u32 readSize, u32 halfBufferSize) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetHalfwayBufferAndGetID(%i, %08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetHalfwayBufferAndGetID(%i, %08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize); int codecType = getCodecType(halfBuffer); return 1; } u32 sceAtracStartEntry() { - ERROR_LOG(HLE, "UNIMPL sceAtracStartEntry(.)"); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracStartEntry(.)"); return 0; } u32 sceAtracSetLoopNum(int atracID, int loopNum) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetLoopNum(%i, %i)", atracID, loopNum); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetLoopNum(%i, %i)", atracID, loopNum); return 0; } int sceAtracReinit() { - ERROR_LOG(HLE, "UNIMPL sceAtracReinit(..)"); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracReinit(..)"); return 0; } int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) { - ERROR_LOG(HLE, "UNIMPL sceAtracGetOutputChannel(%i, %08x)", atracID, outputChanPtr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracGetOutputChannel(%i, %08x)", atracID, outputChanPtr); if (Memory::IsValidAddress(outputChanPtr)) Memory::Write_U32(2, outputChanPtr); return 0; @@ -315,7 +332,7 @@ int sceAtracGetOutputChannel(int atracID, u32 outputChanPtr) int sceAtracIsSecondBufferNeeded(int atracID) { - ERROR_LOG(HLE, "UNIMPL sceAtracIsSecondBufferNeeded(%i)", atracID); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracIsSecondBufferNeeded(%i)", atracID); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -325,7 +342,7 @@ int sceAtracIsSecondBufferNeeded(int atracID) int sceAtracSetMOutHalfwayBuffer(int atracID, u32 MOutHalfBuffer, int readSize, int MOutHalfBufferSize) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetMOutHalfwayBuffer(%i, %08x, %i, %i)", atracID, MOutHalfBuffer, readSize, MOutHalfBufferSize); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetMOutHalfwayBuffer(%i, %08x, %i, %i)", atracID, MOutHalfBuffer, readSize, MOutHalfBufferSize); Atrac *atrac = getAtrac(atracID); if (!atrac) { //return -1; @@ -335,7 +352,7 @@ int sceAtracSetMOutHalfwayBuffer(int atracID, u32 MOutHalfBuffer, int readSize, int sceAtracSetAA3DataAndGetID(u32 buffer, int bufferSize, int fileSize, u32 metadataSizeAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracSetAA3DataAndGetID(%08x, %i, %i, %08x)", buffer, bufferSize, fileSize, metadataSizeAddr); + ERROR_LOG_LIMITED(HLE, "UNIMPL sceAtracSetAA3DataAndGetID(%08x, %i, %i, %08x)", buffer, bufferSize, fileSize, metadataSizeAddr); int codecType = getCodecType(buffer); return 1; }