From 48b23f3be7cb97471d5f1f2eff365122796b484e Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sat, 16 Apr 2022 21:24:06 +0100 Subject: [PATCH] comment small unused code --- common/cross_os_debug/xdbg.cpp | 2 +- decompiler/ObjectFile/LinkedObjectFileCreation.cpp | 2 ++ decompiler/level_extractor/extract_tie.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/cross_os_debug/xdbg.cpp b/common/cross_os_debug/xdbg.cpp index f8989b13a..0a336115b 100644 --- a/common/cross_os_debug/xdbg.cpp +++ b/common/cross_os_debug/xdbg.cpp @@ -521,7 +521,7 @@ bool check_stopped(const ThreadID& tid, SignalInfo* out) { out->kind = SignalInfo::DISAPPEARED; break; default: - printf("[Debugger] unhandled debug event %d\n", debugEvent.dwDebugEventCode); + printf("[Debugger] unhandled debug event %lu\n", debugEvent.dwDebugEventCode); out->kind = SignalInfo::UNKNOWN; break; } diff --git a/decompiler/ObjectFile/LinkedObjectFileCreation.cpp b/decompiler/ObjectFile/LinkedObjectFileCreation.cpp index 395b43d95..0eb536f71 100644 --- a/decompiler/ObjectFile/LinkedObjectFileCreation.cpp +++ b/decompiler/ObjectFile/LinkedObjectFileCreation.cpp @@ -562,11 +562,13 @@ static void link_v5(LinkedObjectFile& f, } else if ((reloc & 0x3f) == 0x3f) { ASSERT(false); // todo, does this ever get hit? } else { + /* int n_methods_base = reloc & 0x3f; int n_methods = n_methods_base * 4; if (n_methods_base) { n_methods += 3; } + */ link_ptr += 2; // ghidra misses some aliasing here and would have you think this is +1! const char* sname = (const char*)(&data.at(link_ptr)); link_ptr += strlen(sname) + 1; diff --git a/decompiler/level_extractor/extract_tie.cpp b/decompiler/level_extractor/extract_tie.cpp index 8dbf0597a..341510db3 100644 --- a/decompiler/level_extractor/extract_tie.cpp +++ b/decompiler/level_extractor/extract_tie.cpp @@ -325,7 +325,7 @@ struct TieFrag { u16 tgt_ip1_ptr = 0; u16 tgt_ip2_ptr = 0; u16 kick_addr = 0; - u16 clr_ptr = 0; + // u16 clr_ptr = 0; u16 point_ptr = 0; u16 misc_x = 0; // at 971's x. math::Vector4f gifbufs; @@ -1250,7 +1250,7 @@ void emulate_tie_prototype_program(std::vector& protos) { // iaddi vi15, vi00, 0x0 | nop frag.prog_info.kick_addr = 0; // mtir vi03, vf_clrbuf.x | nop - frag.prog_info.clr_ptr = 198; // just forcing it to one buffer for now + // frag.prog_info.clr_ptr = 198; // just forcing it to one buffer for now // iaddiu vi_point_ptr, vi00, 0x32 | nop frag.prog_info.point_ptr = 0x32; @@ -1315,7 +1315,7 @@ void emulate_tie_instance_program(std::vector& protos) { // we omit the pipeline startup here. // this was set by the previous program that sets up this prototype frag - u16 clr_ptr = frag.prog_info.clr_ptr; + // u16 clr_ptr = frag.prog_info.clr_ptr; u16 tgt_bp1_ptr = frag.prog_info.tgt_bp1_ptr; u16 tgt_bp2_ptr = frag.prog_info.tgt_bp2_ptr; u16 tgt_ip1_ptr = frag.prog_info.tgt_ip1_ptr; @@ -1358,7 +1358,7 @@ void emulate_tie_instance_program(std::vector& protos) { // iaddi vi_clr_ptr, vi_clr_ptr, 0x7 | nop // u16 clr_ptr_base = clr_ptr; - clr_ptr += 6; // it says 7, but we want to point to the first index data. + // clr_ptr += 6; // it says 7, but we want to point to the first index data. // mtir vi_ind, vf_inds.y | addx.w vf_res13, vf_res02, vf00 <- flags crap // div Q, vf00.w, vf_pos02.w | mulaw.xyzw ACC, vf_clr2, vf00