izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (#49)

Browse Source 
* Auto debug info generation and some cleanup

* Cleaned dry code from segments

* Fixed gCurrentCompressionType bss bs
This commit is contained in:
Lywx
2024-03-22 09:59:49 -06:00
committed by GitHub
parent 6e9f823121
commit aaa68d2ebc
24 changed files with 51 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Companion.cpp
+10 -15
View File
@@ -250,13 +250,6 @@ void Companion::ExtractNode(YAML::Node& node, std::string& name, SWrapper* binar
file.close();
break;
}
case ExportType::Code: {
endptr = exporter->get()->Export(stream, result.value(), name, node, &name);
if (this->IsDebug() && endptr.has_value() && endptr->index() == 0) {
stream << "// 0x" << std::hex << std::uppercase << std::get<0>(endptr.value()) << "\n\n";
}
break;
}
default: {
endptr = exporter->get()->Export(stream, result.value(), name, node, &name);
break;
@@ -689,7 +682,7 @@ void Companion::Process() {
} else {
const auto offset = assetNode["offset"].as<uint32_t>();
if(gCurrentFileOffset) {
if (IS_SEGMENTED(offset) == false) {
if (!IS_SEGMENTED(offset)) {
assetNode["offset"] = (gCurrentSegmentNumber << 24) | offset;
}
}
@@ -765,16 +758,18 @@ void Companion::Process() {
for (size_t i = 0; i < entries.size(); i++) {
const auto result = entries[i];
const auto hasSize = result.endptr.has_value();
if (hasSize && this->IsDebug()) {
stream << "// 0x" << std::hex << std::uppercase << ASSET_PTR(result.addr) << "\n";
}
stream << result.buffer;
if(i < entries.size() - 1 && this->gConfig.exporterType == ExportType::Code){
auto endptr = result.endptr;
if(!endptr.has_value()){
continue;
}
#define ASSET_PTR(x) IS_SEGMENTED(x) ? SEGMENT_OFFSET(x) : x
if (hasSize && this->IsDebug()) {
stream << "// 0x" << std::hex << std::uppercase << ASSET_PTR(result.endptr.value()) << "\n\n";
}
if(hasSize && i < entries.size() - 1 && this->gConfig.exporterType == ExportType::Code){
uint32_t startptr = ASSET_PTR(result.endptr.value());
uint32_t end = ASSET_PTR(entries[i + 1].addr);