mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-06 11:20:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decomp] even more res (#529)

Browse Source 
* [decomp] even more `res`

* [decompiler] make `logand` with pointers and constants return pointer

* [decomp] more work

* update offline tests

* fix tests(?)

* `*res-static-buf*`

* fixes

* fix reference

* [opengoal] make `logand` work directly with pointers

* [decomp] `inspect res-lump`

* use the inline methods

* don't use a math mode for pointers

* [compiler] allow optionally setting disassembly output file

* [x86 disasm] Keep casing consistent between instructions and offsets
This commit is contained in:
ManDude
2021-06-01 21:07:45 +01:00
committed by GitHub
parent 3d8013633a
commit 784119188c
20 changed files with 390 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goalc/compiler/compilation/CompilerControl.cpp
+17 -2
View File
@@ -81,6 +81,7 @@ Val* Compiler::compile_asm_file(const goos::Object& form, const goos::Object& re
(void)env;
int i = 0;
std::string filename;
std::string disasm_filename = "";
bool load = false;
bool color = false;
bool write = false;
@@ -91,7 +92,16 @@ Val* Compiler::compile_asm_file(const goos::Object& form, const goos::Object& re
Timer total_timer;
// parse arguments
bool last_was_disasm = false;
for_each_in_list(rest, [&](const goos::Object& o) {
if (last_was_disasm) {
last_was_disasm = false;
if (o.type == goos::ObjectType::STRING) {
disasm_filename = as_string(o);
i++;
return;
}
}
if (i == 0) {
filename = as_string(o);
} else {
@@ -106,6 +116,7 @@ Val* Compiler::compile_asm_file(const goos::Object& form, const goos::Object& re
no_code = true;
} else if (setting == ":disassemble") {
disassemble = true;
last_was_disasm = true;
} else {
throw_compiler_error(form, "The option {} was not recognized for asm-file.", setting);
}
@@ -146,7 +157,11 @@ Val* Compiler::compile_asm_file(const goos::Object& form, const goos::Object& re
std::string disasm;
if (disassemble) {
codegen_and_disassemble_object_file(obj_file, &data, &disasm);
printf("%s\n", disasm.c_str());
if (disasm_filename == "") {
printf("%s\n", disasm.c_str());
} else {
file_util::write_text_file(disasm_filename, disasm);
}
} else {
data = codegen_object_file(obj_file);
}
@@ -541,4 +556,4 @@ Val* Compiler::compile_add_macro_to_autocomplete(const goos::Object& form,
va_check(form, args, {goos::ObjectType::SYMBOL}, {});
m_symbol_info.add_macro(args.unnamed.at(0).as_symbol()->name, form);
return get_none();
}
}