2 files changed, 12 insertions(+), 2 deletions(-)

M new/src/tools/exec/repl.cpp
M new/src/vm/ins.cpp

@@ 369,9 369,19 @@ auto evaluate_asm_expression(std::string const source_text) -> void
         return;
     }
 
+    auto fn_offsets = std::map<std::string, size_t>{};
+    {
+        for (auto const& [mod_name, mod] : REPL_STATE->core.modules) {
+            for (auto const& [fn_off, fn] : mod.elf.function_table()) {
+                auto const fn_id = (mod_name.empty() ? "" : (mod_name + "::"))
+                                   + std::get<0>(fn);
+                fn_offsets[fn_id] = fn_off;
+            }
+        }
+    }
+
     auto strings_table = std::vector<uint8_t>{};
     auto var_offsets   = std::map<std::string, size_t>{};
-    auto fn_offsets    = std::map<std::string, size_t>{};
     auto cooked        = std::vector<viua::libs::parser::ast::Instruction>{};
     try {
         cooked = viua::libs::stage::cook_long_immediates(

@@ 1272,7 1272,7 @@ auto execute(CALL const op, Stack& stack, ip_type const ip) -> ip_type
         throw abort_execution{ip, "invalid IP after call"};
     }
 
-    auto const fr_return = (ip + 1);
+    auto const fr_return = (stack.ip + 1);
     auto const fr_entry  = (stack.proc.module.ip_base
                            + (fn_addr / sizeof(viua::arch::instruction_type)));