Rim/gsc-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

prepare iw5 sp/so symbols

Browse Source
This commit is contained in:
xensik 2022-07-14 15:31:58 +02:00
parent ec91109cc3
commit 05fc8a7421
5 changed files with 33391 additions and 6276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/iw5/xsk/assembler.cpp
View File

@ -428,7 +428,7 @@ void assembler::assemble_far_call(const instruction::ptr& inst, bool thread)
script_->write<std::uint8_t>(static_cast<std::uint8_t>(std::stoi(inst->data[2]))); script_->write<std::uint8_t>(static_cast<std::uint8_t>(std::stoi(inst->data[2])));
} }
const auto file_id = resolver::file_id(inst->data[0]); const auto file_id = resolver::token_id(inst->data[0]);
const auto func_id = resolver::token_id(inst->data[1]); const auto func_id = resolver::token_id(inst->data[1]);
stack_->write<std::uint16_t>(file_id); stack_->write<std::uint16_t>(file_id);

2
src/iw5/xsk/disassembler.cpp
View File

@ -337,7 +337,7 @@ void disassembler::disassemble_far_call(const instruction::ptr& inst, bool threa
} }
const auto file_id = stack_->read<std::uint16_t>(); const auto file_id = stack_->read<std::uint16_t>();
const auto file_name = file_id == 0 ? stack_->read_c_string() : resolver::file_name(file_id); const auto file_name = file_id == 0 ? stack_->read_c_string() : resolver::token_name(file_id);
const auto func_id = stack_->read<std::uint16_t>(); const auto func_id = stack_->read<std::uint16_t>();
const auto func_name = func_id == 0 ? stack_->read_c_string() : resolver::token_name(func_id); const auto func_name = func_id == 0 ? stack_->read_c_string() : resolver::token_name(func_id);

39658
src/iw5/xsk/resolver.cpp
View File

File diff suppressed because it is too large Load Diff

3
src/iw5/xsk/resolver.hpp
View File

@ -23,9 +23,6 @@ public:
static auto method_id(const std::string& name) -> std::uint16_t; static auto method_id(const std::string& name) -> std::uint16_t;
static auto method_name(std::uint16_t id) -> std::string; static auto method_name(std::uint16_t id) -> std::string;
static auto file_id(const std::string& name) -> std::uint16_t;
static auto file_name(std::uint16_t id) -> std::string;
static auto token_id(const std::string& name) -> std::uint16_t; static auto token_id(const std::string& name) -> std::uint16_t;
static auto token_name(std::uint16_t id) -> std::string; static auto token_name(std::uint16_t id) -> std::string;

2
src/tool/xsk/main.cpp
View File

@ -99,7 +99,7 @@ auto choose_resolver_file_name(uint32_t id, game& game) -> std::string
switch (game) switch (game)
{ {
case game::IW5: case game::IW5:
return iw5::resolver::file_name(static_cast<std::uint16_t>(id)); return iw5::resolver::token_name(static_cast<std::uint16_t>(id));
case game::IW6: case game::IW6:
return iw6::resolver::file_name(static_cast<std::uint16_t>(id)); return iw6::resolver::file_name(static_cast<std::uint16_t>(id));
case game::IW7: case game::IW7: