KPGPMC/furlang
5
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

fix(furvm): add JustHit executor flag

Browse Source
This commit is contained in:
Aleksander Krajewski
2026-08-17 11:34:37 +02:00
parent 70cbb003f2
commit dd96f95d77
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
furvm/include/furvm/executor.hpp
+8 -1
View File
@@ -14,6 +14,8 @@ namespace furvm {
enum class executor_flags : std::uint32_t { enum class executor_flags : std::uint32_t {
Suspended = (1 << 0), /**< Execution suspended. */ Suspended = (1 << 0), /**< Execution suspended. */
Done = (1 << 1), /**< Execution is finished. */ Done = (1 << 1), /**< Execution is finished. */
JustHit = (1 << 16), /**< Executor just hit a breakpoint. */
}; };
static inline executor_flags operator|(executor_flags lhs, executor_flags rhs) { static inline executor_flags operator|(executor_flags lhs, executor_flags rhs) {
@@ -34,6 +36,8 @@ private:
executor(context* context) executor(context* context)
: m_context(context) {} : m_context(context) {}
public: public:
static constexpr executor_flags STATE_FLAGS = executor_flags::JustHit;
using new_frame_callback = std::function<void(executor&)>; using new_frame_callback = std::function<void(executor&)>;
public: public:
/** /**
@@ -90,7 +94,10 @@ public:
void unsuspend() { m_flags = m_flags & ~executor_flags::Suspended; } void unsuspend() { m_flags = m_flags & ~executor_flags::Suspended; }
void clear_flags() { m_flags = m_frames.empty() ? executor_flags::Done : furvm::executor_flags{ 0 }; } void clear_flags() {
m_flags = m_flags & STATE_FLAGS;
m_flags = m_frames.empty() ? executor_flags::Done : furvm::executor_flags{ 0 };
}
public: public:
/** /**
* @brief Pushes a new frame. * @brief Pushes a new frame.
furvm/src/executor.cpp
+5 -2
View File
@@ -110,6 +110,7 @@ void executor::push_frame(const mod_h& mod, function function) {
} else { } else {
m_flags = m_flags | executor_flags::Done; m_flags = m_flags | executor_flags::Done;
} }
m_flags = m_flags & ~executor_flags::JustHit;
} }
struct executor::frame executor::pop_frame() { struct executor::frame executor::pop_frame() {
@@ -129,6 +130,7 @@ struct executor::frame executor::pop_frame() {
} else { } else {
m_flags = m_flags | executor_flags::Done; m_flags = m_flags | executor_flags::Done;
} }
m_flags = m_flags & ~executor_flags::JustHit;
return frame; return frame;
} }
@@ -189,12 +191,13 @@ void executor::step() {
struct frame& frame = m_frames.top(); struct frame& frame = m_frames.top();
if (frame.mod->has_breakpoint(frame.position)) { if ((m_flags & executor_flags::JustHit) != executor_flags::JustHit && frame.mod->has_breakpoint(frame.position)) {
m_flags = m_flags | executor_flags::Suspended; m_flags = m_flags | executor_flags::Suspended | executor_flags::JustHit;
const auto& bp = frame.mod->breakpoint_at(frame.position); const auto& bp = frame.mod->breakpoint_at(frame.position);
bp.callback(*this, bp.data); bp.callback(*this, bp.data);
return; return;
} }
m_flags = m_flags & ~executor_flags::JustHit;
instruction instr{}; instruction instr{};
frame.position += instr.read(frame.mod->bytecode_view().subview(frame.position)); frame.position += instr.read(frame.mod->bytecode_view().subview(frame.position));