fix(bytecode reader): update the symbols, values and code method of t…

…he BytecodeReader to avoid multiple reads of the same data

include/Ark/Compiler/BytecodeReader.hpp

@@ -23,6 +23,8 @@
 
 namespace Ark
 {
+    class State;
+
     enum class BytecodeSegment
     {
         All,
@@ -127,16 +129,16 @@ namespace Ark
         [[nodiscard]] Symbols symbols() const;
 
         /**
-         *
+         * @param symbols
          * @return Values
          */
-        [[nodiscard]] Values values() const;
+        [[nodiscard]] Values values(const Symbols& symbols) const;
 
         /**
-         *
+         * @param values
          * @return Code
          */
-        [[nodiscard]] Code code() const;
+        [[nodiscard]] Code code(const Values& values) const;
 
         /**
          * @brief Display the bytecode opcode in a human friendly way.
@@ -151,6 +153,8 @@ namespace Ark
                      std::optional<uint16_t> sEnd = std::nullopt,
                      std::optional<uint16_t> cPage = std::nullopt);
 
+        friend class Ark::State;
+
     private:
         bytecode_t m_bytecode;
 

src/arkreactor/Compiler/BytecodeReader.cpp

@@ -118,22 +118,20 @@ namespace Ark
         return block;
     }
 
-    Values BytecodeReader::values() const
+    Values BytecodeReader::values(const Symbols& symbols) const
     {
         if (!checkMagic())
             return {};
 
-        const auto data = symbols();
-        std::size_t i = data.end;
+        std::size_t i = symbols.end;
         if (m_bytecode[i] != VAL_TABLE_START)
             return {};
         i++;
 
-
         const uint16_t size = readNumber(i);
         i++;
         Values block;
-        block.start = data.end;
+        block.start = symbols.end;
         block.values.reserve(size);
 
         for (uint16_t j = 0; j < size; ++j)
@@ -170,13 +168,12 @@ namespace Ark
         return block;
     }
 
-    Code BytecodeReader::code() const
+    Code BytecodeReader::code(const Values& values) const
     {
         if (!checkMagic())
             return {};
 
-        const auto data = values();
-        std::size_t i = data.end;
+        std::size_t i = values.end;
 
         Code block;
         block.start = i;
@@ -236,8 +233,8 @@ namespace Ark
         }
 
         const auto syms = symbols();
-        const auto vals = values();
-        const auto code_block = code();
+        const auto vals = values(syms);
+        const auto code_block = code(vals);
 
         // symbols table
         {

src/arkreactor/VM/State.cpp

@@ -168,11 +168,13 @@ namespace Ark
 #endif
         }
 
-        // FIXME: we're going to read the symbols 3 times and the values twice
-        // because code calls values which calls symbols
-        m_symbols = bcr.symbols().symbols;
-        m_constants = bcr.values().values;
-        m_pages = bcr.code().pages;
+        const auto syms = bcr.symbols();
+        const auto vals = bcr.values(syms);
+        const auto code = bcr.code(vals);
+
+        m_symbols = syms.symbols;
+        m_constants = vals.values;
+        m_pages = code.pages;
     }
 
     void State::reset() noexcept

tests/unittests/BytecodeReaderSuite.cpp

@@ -1,6 +1,7 @@
 #include <boost/ut.hpp>
 
 #include <Ark/Compiler/BytecodeReader.hpp>
+
 #include <string>
 
 using namespace boost;
@@ -35,9 +36,9 @@ ut::suite<"BytecodeReader"> bcr_suite = [] {
             expect(that % sha256 == expected_sha);
         };
 
-        const auto [pages, start_code] = bcr.code();
-        const auto values_block = bcr.values();
         const auto symbols_block = bcr.symbols();
+        const auto values_block = bcr.values(symbols_block);
+        const auto [pages, start_code] = bcr.code(values_block);
 
         should("list all symbols") = [symbols_block] {
             using namespace std::literals::string_literals;