mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
More log cleanup
This commit is contained in:
@@ -144,7 +144,7 @@ FILE *OpenCFile(const Path &path, const char *mode) {
|
||||
return nullptr;
|
||||
}
|
||||
} else {
|
||||
INFO_LOG_REPORT_ONCE(openCFileFailedNavigateUp, Log::IO, "Failed to navigate up to create file: %s", path.c_str());
|
||||
INFO_LOG(Log::IO, "Failed to navigate up to create file: %s", path.c_str());
|
||||
return nullptr;
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -430,7 +430,7 @@ void GLQueueRunner::RunInitSteps(const FastVec<GLRInitStep> &steps, bool skipGLC
|
||||
// Calling glGetError() isn't great, but at the end of init, only after creating textures, shouldn't be too bad...
|
||||
GLenum err = glGetError();
|
||||
if (err == GL_OUT_OF_MEMORY) {
|
||||
WARN_LOG_REPORT(Log::G3D, "GL ran out of GPU memory; switching to low memory mode");
|
||||
WARN_LOG(Log::G3D, "GL ran out of GPU memory; switching to low memory mode");
|
||||
sawOutOfMemory_ = true;
|
||||
} else if (err != GL_NO_ERROR) {
|
||||
// We checked the err anyway, might as well log if there is one.
|
||||
|
||||
@@ -499,7 +499,7 @@ int ElfReader::LoadInto(u32 loadAddress, bool fromTop)
|
||||
}
|
||||
|
||||
if (vaddr == (u32)-1) {
|
||||
ERROR_LOG_REPORT(Log::Loader, "Failed to allocate memory for ELF!");
|
||||
ERROR_LOG(Log::Loader, "Failed to allocate memory for ELF!");
|
||||
return SCE_KERNEL_ERROR_MEMBLOCK_ALLOC_FAILED;
|
||||
}
|
||||
|
||||
|
||||
@@ -437,12 +437,12 @@ void DirectoryFileHandle::Close() {
|
||||
#ifdef _WIN32
|
||||
Seek((s32)needsTrunc_, FILEMOVE_BEGIN);
|
||||
if (SetEndOfFile(hFile) == 0) {
|
||||
ERROR_LOG_REPORT(Log::FileSystem, "Failed to truncate file to %d bytes", (int)needsTrunc_);
|
||||
ERROR_LOG(Log::FileSystem, "Failed to truncate file to %d bytes", (int)needsTrunc_);
|
||||
}
|
||||
#elif !PPSSPP_PLATFORM(SWITCH)
|
||||
// Note: it's not great that Switch cannot truncate appropriately...
|
||||
if (ftruncate(hFile, (off_t)needsTrunc_) != 0) {
|
||||
ERROR_LOG_REPORT(Log::FileSystem, "Failed to truncate file to %d bytes", (int)needsTrunc_);
|
||||
ERROR_LOG(Log::FileSystem, "Failed to truncate file to %d bytes", (int)needsTrunc_);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -478,7 +478,7 @@ size_t ISOFileSystem::ReadFile(u32 handle, u8 *pointer, s64 size, int &usec) {
|
||||
OpenFileEntry &e = iter->second;
|
||||
|
||||
if (size < 0) {
|
||||
ERROR_LOG_REPORT(Log::FileSystem, "Invalid read for %lld bytes from umd %s", size, e.file ? e.file->name.c_str() : "device");
|
||||
ERROR_LOG(Log::FileSystem, "Invalid read for %lld bytes from umd %s", size, e.file ? e.file->name.c_str() : "device");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -116,7 +116,7 @@ static u32 sceAacInit(u32 id)
|
||||
|
||||
static u32 sceAacInitResource(u32 numberIds) {
|
||||
// Do nothing here
|
||||
INFO_LOG_REPORT(Log::ME, "sceAacInitResource(%i)", numberIds);
|
||||
WARN_LOG_REPORT(Log::ME, "sceAacInitResource(%i)", numberIds);
|
||||
return hleNoLog(0);
|
||||
}
|
||||
|
||||
|
||||
@@ -705,7 +705,7 @@ static int sceHttpLoadSystemCookie() {
|
||||
static int sceHttpCreateTemplate(const char *userAgent, int httpVer, int autoProxyConf) {
|
||||
WARN_LOG(Log::sceNet, "UNTESTED sceHttpCreateTemplate(%s, %d, %d) at %08x", safe_string(userAgent), httpVer, autoProxyConf, currentMIPS->pc);
|
||||
// Reporting to find more games to be tested
|
||||
DEBUG_LOG_REPORT_ONCE(sceHttpCreateTemplate, Log::sceNet, "UNTESTED sceHttpCreateTemplate(%s, %d, %d)", safe_string(userAgent), httpVer, autoProxyConf);
|
||||
WARN_LOG_REPORT_ONCE(sceHttpCreateTemplate, Log::sceNet, "UNTESTED sceHttpCreateTemplate(%s, %d, %d)", safe_string(userAgent), httpVer, autoProxyConf);
|
||||
std::lock_guard<std::mutex> guard(httpLock);
|
||||
httpObjects.push_back(std::make_shared<HTTPTemplate>(userAgent? userAgent:"", httpVer, autoProxyConf));
|
||||
int retid = (int)httpObjects.size();
|
||||
|
||||
@@ -535,7 +535,12 @@ int sceKernelLockMutex(SceUID id, int count, u32 timeoutPtr)
|
||||
if (__KernelLockMutex(mutex, count, error))
|
||||
return hleLogDebug(Log::sceKernel, 0);
|
||||
else if (error) {
|
||||
return hleLogError(Log::sceKernel, error);
|
||||
if (error == SCE_MUTEX_ERROR_ALREADY_LOCKED) {
|
||||
// Benign it seems.
|
||||
return hleLogDebug(Log::sceKernel, error);
|
||||
} else {
|
||||
return hleLogError(Log::sceKernel, error);
|
||||
}
|
||||
}
|
||||
|
||||
SceUID threadID = __KernelGetCurThread();
|
||||
|
||||
@@ -696,9 +696,10 @@ void Jit::Comp_Generic(MIPSOpcode op) {
|
||||
else
|
||||
ABI_CallFunctionC(func, op.encoding);
|
||||
ApplyRoundingMode();
|
||||
} else {
|
||||
// These are basically always due to some kind of crash or corruption now.
|
||||
ERROR_LOG(Log::JIT, "Trying to compile instruction %08x that can't be interpreted", op.encoding);
|
||||
}
|
||||
else
|
||||
ERROR_LOG_REPORT(Log::JIT, "Trying to compile instruction %08x that can't be interpreted", op.encoding);
|
||||
|
||||
const MIPSInfo info = MIPSGetInfo(op);
|
||||
if ((info & IS_VFPU) != 0 && (info & VFPU_NO_PREFIX) == 0)
|
||||
|
||||
@@ -1615,7 +1615,7 @@ void FramebufferManagerCommon::CopyDisplayToOutput(bool reallyDirty) {
|
||||
if (vfb) {
|
||||
// Okay, we found one above.
|
||||
// Log should be "Displaying from framebuf" but not worth changing the report.
|
||||
INFO_LOG_REPORT_ONCE(displayoffset, Log::FrameBuf, "Rendering from framebuf with offset %08x -> %08x+%dx%d", addr, vfb->fb_address, offsetX, offsetY);
|
||||
INFO_LOG(Log::FrameBuf, "Rendering from framebuf with offset %08x -> %08x+%dx%d", addr, vfb->fb_address, offsetX, offsetY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1087,12 +1087,8 @@ bool GetCurrentDrawAsDebugVertices(DrawEngineCommon *drawEngine, int count, std:
|
||||
}
|
||||
break;
|
||||
case GE_VTYPE_IDX_32BIT:
|
||||
WARN_LOG_REPORT_ONCE(simpleIndexes32, Log::G3D, "SimpleVertices: Decoding 32-bit indexes");
|
||||
for (int i = 0; i < count; ++i) {
|
||||
// These aren't documented and should be rare. Let's bounds check each one.
|
||||
if (inds32[i] != (u16)inds32[i]) {
|
||||
ERROR_LOG_REPORT_ONCE(simpleIndexes32Bounds, Log::G3D, "SimpleVertices: Index outside 16-bit range");
|
||||
}
|
||||
// These are rare. Only the bottom 16 bits are used.
|
||||
indices[i] = (u16)inds32[i];
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user