Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-11-28 21:49:33 +00:00
Code Issues Projects Releases Wiki Activity

ConvertObj: make module sorting deterministic

Browse Source
This commit is contained in:
Wolfgang Thaller 2019-01-23 23:09:44 +01:00
parent 3ae4e50fe4
commit 2cf217fb64
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ConvertObj/ConvertObj.cc
View File

@ -2,6 +2,7 @@
#include <iostream> #include <iostream>
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#include <set>
#include <string> #include <string>
#include "BinaryIO.h" #include "BinaryIO.h"
#include <stdint.h> #include <stdint.h>
@ -194,9 +195,9 @@ void Module::write(std::ostream& out)
void sortModules(std::vector<std::shared_ptr<Module>>& modules) void sortModules(std::vector<std::shared_ptr<Module>>& modules)
{ {
std::unordered_set<std::shared_ptr<Module>> unemitted; std::set<std::string> unemitted;
for(auto& m : modules) for(auto& m : modules)
unemitted.insert(m); unemitted.insert(m->name);
std::unordered_map<std::string, std::shared_ptr<Module>> nameMap; std::unordered_map<std::string, std::shared_ptr<Module>> nameMap;
for(auto& m : modules) for(auto& m : modules)
@ -242,7 +243,7 @@ void sortModules(std::vector<std::shared_ptr<Module>>& modules)
{ {
if(std::shared_ptr<Module> m2 = m2weak.lock()) if(std::shared_ptr<Module> m2 = m2weak.lock())
{ {
auto unemittedP = unemitted.find(m2); auto unemittedP = unemitted.find(m2->name);
if(unemittedP != unemitted.end()) if(unemittedP != unemitted.end())
{ {
sorted.push_back(m2); sorted.push_back(m2);
@ -252,7 +253,7 @@ void sortModules(std::vector<std::shared_ptr<Module>>& modules)
} }
++p; ++p;
} }
sorted.push_back(*unemitted.begin()); sorted.push_back(nameMap[*unemitted.begin()]);
unemitted.erase(unemitted.begin()); unemitted.erase(unemitted.begin());
} }