fixes + dependency test

byterun/include/utils.h

@@ -9,6 +9,7 @@
 
 /* The unpacked representation of bytecode file */
 typedef struct {
+  uint main_offset; /* offset of the function 'main'                        */
   char *string_ptr; /* A pointer to the beginning of the string table */
   int *imports_ptr; /* A pointer to the beginning of imports table    */
   int *public_ptr;  /* A pointer to the beginning of publics table    */

byterun/regression/Dep.i

@@ -0,0 +1,2 @@
+I,Std;
+F,f;

byterun/regression/Dep.lama

@@ -0,0 +1 @@
+public fun f(a, b) { a + b }

byterun/regression/Test.lama

@@ -0,0 +1,3 @@
+import Dep;
+
+f(1, 2)

byterun/src/module_manager.cpp

@@ -1,3 +1,4 @@
+#include <iostream>
 extern "C" {
 #include "module_manager.h"
 #include "utils.h"
@@ -33,16 +34,23 @@ static ModuleManager manager;
 
 uint32_t mod_add_impl(Bytefile *bf, bool do_verification,
                       std::optional<const char *> name = std::nullopt) {
+#ifdef DEBUG_VERSION
+  std::cerr << "- add module (impl) '" << std::string{name ? *name : ""}
+            << "'\n";
+#endif
   uint32_t id = manager.modules.size();
   manager.modules.push_back({.name = name ? *name : "", .bf = bf});
   for (size_t i = 0; i < bf->public_symbols_number; ++i) {
-    if (!manager.public_symbols_mods
+    const char *public_name = get_public_name_safe(bf, i);
-             .insert({
+    size_t public_offset = get_public_offset_safe(bf, i);
-                 get_public_name_safe(bf, i),
+    if (strcmp(public_name, "main") == 0) {
-                 {.mod_id = id, .offset = get_public_offset_safe(bf, i)},
+      bf->main_offset = public_offset;
-             })
+    } else if (!manager.public_symbols_mods
+                    .insert(
+                        {public_name, {.mod_id = id, .offset = public_offset}})
                     .second) {
-      failure("public symbol loaded more then once\n");
+      failure("public symbol '%s' loaded more then once\n",
+              get_public_name_safe(bf, i));
     }
   }
   if (name) {
@@ -56,8 +64,11 @@ uint32_t mod_add_impl(Bytefile *bf, bool do_verification,
 
 uint32_t path_mod_load(const char *name, std::filesystem::path &&path,
                        bool do_verification) {
+#ifdef DEBUG_VERSION
+  std::cerr << "- module path load '" << name << "'\n";
+#endif
   Bytefile *module = read_file(path.c_str());
-  return mod_add_impl(module, name);
+  return mod_add_impl(module, do_verification, name);
 }
 extern "C" {
 
@@ -114,6 +125,9 @@ int32_t mod_load(const char *name, bool do_verification) {
 }
 
 uint32_t mod_add(Bytefile *module, bool do_verification) {
+#ifdef DEBUG_VERSION
+  std::cerr << "- add module, no name\n";
+#endif
   return mod_add_impl(module, do_verification);
 }
 

byterun/src/parser.cpp

@@ -52,7 +52,15 @@ Bytefile *read_file(const char *fname) {
   }
 
   long size = ftell(f);
-  long additional_size = sizeof(void *) * 5 + sizeof(int);
+
+  // [uint] stringtab_size
+  // [uint] global_area_size
+  // [uint] imports_number
+  // [uint] public_symbols_number
+  // char[0] buffer
+  long file_header_size = 4 * sizeof(uint) + sizeof(char[0]);
+
+  long additional_size = sizeof(Bytefile) - file_header_size;
   file = (Bytefile *)malloc(size +
                             additional_size); // file itself + additional data
 

byterun/src/types.c

@@ -54,8 +54,8 @@ void init_mod_state(uint mod_id, struct State* s) {
 
   s->fp = NULL;
 
-  s->ip = s->bf->code_ptr;
+  s->ip = s->bf->code_ptr + s->bf->main_offset;
-  s->instr_ip = s->bf->code_ptr;
+  s->instr_ip = s->ip;
 
 #ifdef DEBUG_VERSION
   print_stack(s);