Cut down on outdated/useless REPORTing and logging

This commit is contained in:
Henrik Rydgård committed 2026-10-25 17:33:44 +01:00
1 parent b89a57e9a4
commit 518795e35f
28 files changed
+152 -149

No files matched your search

+13 -11
View File
@@ -353,7 +353,7 @@ void ElfReader::LoadRelocations2(int rel_seg)
flag = ( cmd<<(16-flag_bits))&0xffff;
flag = (flag>>(16-flag_bits))&0xffff;
if (flag >= flag_table_size) {
ERROR_LOG_REPORT(Log::Loader, "Rel2: flag %d out of range (table has %d)", flag, flag_table_size);
ERROR_LOG(Log::Loader, "Rel2: flag %d out of range (table has %d)", flag, flag_table_size);
return;
}
flag = flag_table[flag];
@@ -364,7 +364,7 @@ void ElfReader::LoadRelocations2(int rel_seg)
type = ( cmd<<(16-type_bits-seg_bits-flag_bits))&0xffff;
type = (type>>(16-type_bits))&0xffff;
if (type >= type_table_size) {
ERROR_LOG_REPORT(Log::Loader, "Rel2: type %d out of range (table has %d)", type, type_table_size);
ERROR_LOG(Log::Loader, "Rel2: type %d out of range (table has %d)", type, type_table_size);
return;
}
type = type_table[type];
@@ -379,21 +379,21 @@ void ElfReader::LoadRelocations2(int rel_seg)
rel_base = buf[0] | (buf[1]<<8) | (buf[2]<<16) | (buf[3]<<24);
buf += 4;
}else{
ERROR_LOG_REPORT(Log::Loader, "Rel2: invalid size flag! %x", flag);
ERROR_LOG(Log::Loader, "Rel2: invalid size flag! %x", flag);
rel_base = 0;
}
}else{
addr_seg = seg;
if (!SegmentIsLoaded(addr_seg)) {
if (!loggedBadSegment) {
ERROR_LOG_REPORT(Log::Loader, "Rel2: relocating against segment %d, which we didn't load", addr_seg);
ERROR_LOG(Log::Loader, "Rel2: relocating against segment %d, which we didn't load", addr_seg);
loggedBadSegment = true;
}
continue;
}
relocate_to = segmentVAddr[addr_seg];
if (!Memory::IsValidAddress(relocate_to)) {
ERROR_LOG_REPORT(Log::Loader, "ELF: Bad address to relocate to: %08x (segment %d)", relocate_to, addr_seg);
ERROR_LOG(Log::Loader, "ELF: Bad address to relocate to: %08x (segment %d)", relocate_to, addr_seg);
continue;
}
@@ -423,21 +423,23 @@ void ElfReader::LoadRelocations2(int rel_seg)
rel_base = buf[0] | (buf[1]<<8) | (buf[2]<<16) | (buf[3]<<24);
buf += 4;
}else{
ERROR_LOG_REPORT(Log::Loader, "Rel2: invalid relocat size flag! %x", flag);
ERROR_LOG(Log::Loader, "Rel2: invalid relocat size flag! %x", flag);
}
// seg is seg_bits wide, so it can name more segments than the file actually has - and
// naming one we didn't load leaves nothing to write to.
if (!SegmentIsLoaded(off_seg)) {
if (!loggedBadSegment) {
ERROR_LOG_REPORT(Log::Loader, "Rel2: bad or unloaded offset segment %d", off_seg);
ERROR_LOG(Log::Loader, "Rel2: bad or unloaded offset segment %d", off_seg);
loggedBadSegment = true;
}
continue;
}
rel_offset = rel_base+segmentVAddr[off_seg];
if (!Memory::IsValidAddress(rel_offset)) {
ERROR_LOG_REPORT(Log::Loader, "ELF: Bad rel_offset: %08x", rel_offset);
// We didn't check alignment here before, but it has to be right to do so.
if (!Memory::IsValid4AlignedAddress(rel_offset)) {
ERROR_LOG(Log::Loader, "ELF: Bad rel_offset: %08x", rel_offset);
continue;
}
@@ -459,7 +461,7 @@ void ElfReader::LoadRelocations2(int rel_seg)
lo16 |= 0xffff0000;
buf += 2;
}else{
ERROR_LOG_REPORT(Log::Loader, "Rel2: invalid lo16 type! %x", flag);
ERROR_LOG(Log::Loader, "Rel2: invalid lo16 type! %x", flag);
}
op = Memory::Read_Instruction(rel_offset).encoding;
@@ -496,7 +498,7 @@ void ElfReader::LoadRelocations2(int rel_seg)
op = (op&0xffff0000) | (((op&0xffff)+relocate_to)&0xffff);
break;
default:
ERROR_LOG_REPORT(Log::Loader, "Rel2: unexpected relocation type! %x", type);
ERROR_LOG(Log::Loader, "Rel2: unexpected relocation type! %x", type);
break;
}