mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
b56025412b
- Recognize new type definitions/parents/type flags in the decompiler - Analyze autogenerated inspect methods and dump guesses at fields to a file - Utility functions for accessing static data by label - Better ordering in the decompiler to go through functions in the order they appeared in the source - Added a decent number of types to `all-types.gc` based on the new field analyzer - Correct a few `int`/`integer` mistakes in `gcommon.gc` (this should really be a warning) - Correct a few type issues in `gcommon` and `gkernel-h` - Option in the decompiler to be strict about `define-extern` redefining a type of a symbol - Add a test to check consistency in types between `all-types.gc` (used by decompiler) and `goal_src` (used by the compiler)
54 lines
1.7 KiB
C++
54 lines
1.7 KiB
C++
#ifndef JAK_DECOMPILERTYPESYSTEM_H
|
|
#define JAK_DECOMPILERTYPESYSTEM_H
|
|
|
|
#include "common/type_system/TypeSystem.h"
|
|
#include "third-party/fmt/format.h"
|
|
|
|
class DecompilerTypeSystem {
|
|
public:
|
|
DecompilerTypeSystem();
|
|
TypeSystem ts;
|
|
std::unordered_map<std::string, TypeSpec> symbol_types;
|
|
std::unordered_set<std::string> symbols;
|
|
std::vector<std::string> symbol_add_order;
|
|
std::unordered_map<std::string, u64> type_flags;
|
|
std::unordered_map<std::string, std::string> type_parents;
|
|
|
|
void add_symbol(const std::string& name) {
|
|
if (symbols.find(name) == symbols.end()) {
|
|
symbols.insert(name);
|
|
symbol_add_order.push_back(name);
|
|
}
|
|
}
|
|
|
|
void add_symbol(const std::string& name, const std::string& base_type) {
|
|
add_symbol(name, TypeSpec(base_type));
|
|
}
|
|
|
|
void add_symbol(const std::string& name, const TypeSpec& type_spec) {
|
|
add_symbol(name);
|
|
auto skv = symbol_types.find(name);
|
|
if (skv == symbol_types.end() || skv->second == type_spec) {
|
|
symbol_types[name] = type_spec;
|
|
} else {
|
|
if (ts.typecheck(type_spec, skv->second, "", false, false)) {
|
|
} else {
|
|
fmt::print("Attempting to redefine type of symbol {} from {} to {}\n", name,
|
|
skv->second.print(), type_spec.print());
|
|
throw std::runtime_error("Type redefinition");
|
|
}
|
|
}
|
|
}
|
|
|
|
void parse_type_defs(const std::vector<std::string>& file_path);
|
|
|
|
void add_type_flags(const std::string& name, u64 flags);
|
|
void add_type_parent(const std::string& child, const std::string& parent);
|
|
|
|
std::string dump_symbol_types();
|
|
std::string lookup_parent_from_inspects(const std::string& child) const;
|
|
bool lookup_flags(const std::string& type, u64* dest) const;
|
|
};
|
|
|
|
#endif // JAK_DECOMPILERTYPESYSTEM_H
|