Skip to content

Commit 81f52d3

Browse files
committed
Some reporting cleanups
1 parent e51f7c3 commit 81f52d3

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Core/ELF/ElfReader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ bool ElfReader::LoadRelocations(const Elf32_Rel *rels, int numRelocs) {
164164
// It appears the PSP takes any relocation that is not a HI16.
165165
if (t_type != R_MIPS_LO16) {
166166
if (t_type != R_MIPS_16) {
167-
// Let's play it safe for now and skip. We've only seen this type.
167+
// Let's play it safe for now and skip. We've only seen this type.
168+
// These exists in some popular games like Assassin's Creed: Bloodlines and GTA: VCS: (https://report.ppsspp.org/logs/kind/1187)
168169
ERROR_LOG_REPORT(Log::Loader, "ELF relocation HI16/%d pair (instead of LO16) at %08x / %08x", t_type, addr, corrLoAddr);
169170
continue;
170171
} else {

Core/MIPS/MIPSInt.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ namespace MIPSInt
101101
int func = (op >> 16) & 0x1F;
102102

103103
// Let's only report this once per run to be safe from impacting perf.
104-
static bool reportedAlignment = false;
104+
static bool loggedAlignment = false;
105105

106106
// It appears that a cache line is 0x40 (64) bytes, loops in games
107107
// issue the cache instruction at that interval.
@@ -120,9 +120,10 @@ namespace MIPSInt
120120
int size = 0x40 + (addr & 0x3F);
121121
MIPSComp::jit->InvalidateCacheAt(alignedAddr, size);
122122
// Using a bool to avoid locking/etc. in case it's slow.
123-
if (!reportedAlignment && (addr & 0x3F) != 0) {
124-
WARN_LOG_REPORT(Log::JIT, "Unaligned icache invalidation of %08x (%08x + %d) at PC=%08x", addr, R(rs), imm, PC);
125-
reportedAlignment = true;
123+
if (!loggedAlignment && (addr & 0x3F) != 0) {
124+
// These are seen exclusively in Lego games, and are really no big deal. Reporting removed.
125+
WARN_LOG(Log::JIT, "Unaligned icache invalidation of %08x (%08x + %d) at PC=%08x", addr, R(rs), imm, PC);
126+
loggedAlignment = true;
126127
}
127128
if (alignedAddr <= PC + 4 && alignedAddr + size >= PC - 4) {
128129
// This is probably rare so we don't use a static bool.

GPU/GPUCommon.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,8 +1349,7 @@ void GPUCommon::FlushImm() {
13491349
}
13501350

13511351
void GPUCommon::Execute_Unknown(u32 op, u32 diff) {
1352-
if ((op & 0xFFFFFF) != 0)
1353-
WARN_LOG_REPORT_ONCE(unknowncmd, Log::G3D, "Unknown GE command : %08x ", op);
1352+
// Do nothing. We used to report here, but we're confident we have them all so no need to report unknown.
13541353
}
13551354

13561355
void GPUCommon::FastLoadBoneMatrix(u32 target) {

0 commit comments

Comments
 (0)