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

fix(arc): assembler label collision (#158)

Browse Source
This commit is contained in:
INeedGames 2023-11-30 17:00:40 -06:00 committed by GitHub
parent 9e2dcf8d36
commit cf8a7566be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arc/assembler.cpp
View File

@ -228,6 +228,7 @@ auto assembler::assemble(assembly const& data, std::string const& name) -> buffe
auto assembler::assemble_function(function& func) -> void auto assembler::assemble_function(function& func) -> void
{ {
auto labels = std::unordered_map<u32, std::string>();
func.index = script_.pos(); func.index = script_.pos();
func.size = 0; func.size = 0;
func_ = &func; func_ = &func;
@ -245,11 +246,12 @@ auto assembler::assemble_function(function& func) -> void
if (itr != func.labels.end()) if (itr != func.labels.end())
{ {
func.labels.insert({ inst->index, itr->second }); labels.insert({ inst->index, itr->second });
func.labels.erase(old_idx);
} }
} }
func.labels = std::move(labels);
script_.pos(func.index); script_.pos(func.index);
for (auto const& inst : func.instructions) for (auto const& inst : func.instructions)