Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Exit with fatal error on duplicated instruction code

Browse source 
Instead of causing SIGABRT which is more confusing.
This commit is contained in:
elsid 2024-06-28 22:22:16 +02:00
parent daada262d7
commit 89bb04e8fd
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/interpreter/interpreter.hpp
View file

@ -1,14 +1,16 @@
#ifndef INTERPRETER_INTERPRETER_H_INCLUDED
#define INTERPRETER_INTERPRETER_H_INCLUDED
#include <cassert>
#include <map>
#include <memory>
#include <stack>
#include <stdexcept>
#include <utility>
#include "components/interpreter/program.hpp"
#include <components/misc/strings/format.hpp>
#include "opcodes.hpp"
#include "program.hpp"
#include "runtime.hpp"
#include "types.hpp"
@ -32,11 +34,13 @@ namespace Interpreter
void end();
template <typename TSeg, typename TOp>
void installSegment(TSeg& seg, int code, TOp&& op)
template <typename T, typename... Args>
void installSegment(auto& segment, std::string_view name, int code, Args&&... args)
{
assert(seg.find(code) == seg.end());
seg.emplace(code, std::move(op));
if (segment.find(code) != segment.end())
throw std::invalid_argument(Misc::StringUtils::format(
"Duplicated interpreter instruction code in segment %s: 0x%x", name, code));
segment.emplace(code, std::make_unique<T>(std::forward<Args>(args)...));
}
public:
@ -48,25 +52,25 @@ namespace Interpreter
template <typename T, typename... TArgs>
void installSegment0(int code, TArgs&&... args)
{
installSegment(mSegment0, code, std::make_unique<T>(std::forward<TArgs>(args)...));
installSegment<T>(mSegment0, "0", code, std::forward<TArgs>(args)...);
}
template <typename T, typename... TArgs>
void installSegment2(int code, TArgs&&... args)
{
installSegment(mSegment2, code, std::make_unique<T>(std::forward<TArgs>(args)...));
installSegment<T>(mSegment2, "2", code, std::forward<TArgs>(args)...);
}
template <typename T, typename... TArgs>
void installSegment3(int code, TArgs&&... args)
{
installSegment(mSegment3, code, std::make_unique<T>(std::forward<TArgs>(args)...));
installSegment<T>(mSegment3, "3", code, std::forward<TArgs>(args)...);
}
template <typename T, typename... TArgs>
void installSegment5(int code, TArgs&&... args)
{
installSegment(mSegment5, code, std::make_unique<T>(std::forward<TArgs>(args)...));
installSegment<T>(mSegment5, "5", code, std::forward<TArgs>(args)...);
}
void run(const Program& program, Context& context);