Mirrors/N64Recomp
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64Recomp.git synced 2025-05-14 08:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add TRACE_RETURN (#117)

Browse source
This commit is contained in:
LittleCube 2025-01-04 22:10:29 -05:00 • committed by GitHub
parent 351482e9c6
commit 49bf144b0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LiveRecomp/live_generator.cpp
View file

@ -1590,7 +1590,7 @@ void N64Recomp::LiveGenerator::emit_switch_close() const {
// Nothing to do here, the jump table is built in emit_switch. // Nothing to do here, the jump table is built in emit_switch.
} }
void N64Recomp::LiveGenerator::emit_return() const { void N64Recomp::LiveGenerator::emit_return(const Context& context) const {
sljit_emit_return_void(compiler); sljit_emit_return_void(compiler);
} }

4
include/recompiler/generator.h
View file

@ -48,7 +48,7 @@ namespace N64Recomp {
virtual void emit_case(int case_index, const std::string& target_label) const = 0; virtual void emit_case(int case_index, const std::string& target_label) const = 0;
virtual void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const = 0; virtual void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const = 0;
virtual void emit_switch_close() const = 0; virtual void emit_switch_close() const = 0;
virtual void emit_return() const = 0; virtual void emit_return(const Context& context) const = 0;
virtual void emit_check_fr(int fpr) const = 0; virtual void emit_check_fr(int fpr) const = 0;
virtual void emit_check_nan(int fpr, bool is_double) const = 0; virtual void emit_check_nan(int fpr, bool is_double) const = 0;
virtual void emit_cop0_status_read(int reg) const = 0; virtual void emit_cop0_status_read(int reg) const = 0;
@ -85,7 +85,7 @@ namespace N64Recomp {
void emit_case(int case_index, const std::string& target_label) const final; void emit_case(int case_index, const std::string& target_label) const final;
void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final; void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final;
void emit_switch_close() const final; void emit_switch_close() const final;
void emit_return() const final; void emit_return(const Context& context) const final;
void emit_check_fr(int fpr) const final; void emit_check_fr(int fpr) const final;
void emit_check_nan(int fpr, bool is_double) const final; void emit_check_nan(int fpr, bool is_double) const final;
void emit_cop0_status_read(int reg) const final; void emit_cop0_status_read(int reg) const final;

2
include/recompiler/live_recompiler.h
View file

@ -109,7 +109,7 @@ namespace N64Recomp {
void emit_case(int case_index, const std::string& target_label) const final; void emit_case(int case_index, const std::string& target_label) const final;
void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final; void emit_switch_error(uint32_t instr_vram, uint32_t jtbl_vram) const final;
void emit_switch_close() const final; void emit_switch_close() const final;
void emit_return() const final; void emit_return(const Context& context) const final;
void emit_check_fr(int fpr) const final; void emit_check_fr(int fpr) const final;
void emit_check_nan(int fpr, bool is_double) const final; void emit_check_nan(int fpr, bool is_double) const final;
void emit_cop0_status_read(int reg) const final; void emit_cop0_status_read(int reg) const final;

5
src/cgenerator.cpp
View file

@ -476,7 +476,10 @@ void N64Recomp::CGenerator::emit_switch_error(uint32_t instr_vram, uint32_t jtbl
fmt::print(output_file, "default: switch_error(__func__, 0x{:08X}, 0x{:08X});\n", instr_vram, jtbl_vram); fmt::print(output_file, "default: switch_error(__func__, 0x{:08X}, 0x{:08X});\n", instr_vram, jtbl_vram);
} }
void N64Recomp::CGenerator::emit_return() const { void N64Recomp::CGenerator::emit_return(const Context& context) const {
if (context.trace_mode) {
fmt::print(output_file, "TRACE_RETURN()\n ");
}
fmt::print(output_file, "return;\n"); fmt::print(output_file, "return;\n");
} }

10
src/recompilation.cpp
View file

@ -238,7 +238,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
return false; return false;
} }
print_indent(); print_indent();
generator.emit_return(); generator.emit_return(context);
print_link_branch(); print_link_branch();
return true; return true;
}; };
@ -363,7 +363,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
return false; return false;
} }
print_indent(); print_indent();
generator.emit_return(); generator.emit_return(context);
// TODO check if this branch close should exist. // TODO check if this branch close should exist.
// print_indent(); // print_indent();
// generator.emit_branch_close(); // generator.emit_branch_close();
@ -512,7 +512,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
return false; return false;
} }
print_indent(); print_indent();
generator.emit_return(); generator.emit_return(context);
} }
else { else {
fmt::print(stderr, "Unhandled branch in {} at 0x{:08X} to 0x{:08X}\n", func.name, instr_vram, branch_target); fmt::print(stderr, "Unhandled branch in {} at 0x{:08X} to 0x{:08X}\n", func.name, instr_vram, branch_target);
@ -552,7 +552,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
fmt::print("[Info] Indirect tail call in {}\n", func.name); fmt::print("[Info] Indirect tail call in {}\n", func.name);
print_func_call_by_register(rs); print_func_call_by_register(rs);
print_indent(); print_indent();
generator.emit_return(); generator.emit_return(context);
break; break;
} }
break; break;
@ -561,7 +561,7 @@ bool process_instruction(GeneratorType& generator, const N64Recomp::Context& con
generator.emit_syscall(instr_vram); generator.emit_syscall(instr_vram);
// syscalls don't link, so treat it like a tail call // syscalls don't link, so treat it like a tail call
print_indent(); print_indent();
generator.emit_return(); generator.emit_return(context);
break; break;
case InstrId::cpu_break: case InstrId::cpu_break:
print_indent(); print_indent();