lib: Let read_unsigned and friends access the current section

Author: WerWolv

lib/include/pl/core/evaluator.hpp

@@ -159,6 +159,7 @@ namespace pl::core {
         void pushSectionId(u64 id);
         void popSectionId();
         [[nodiscard]] u64 getSectionId() const;
+        [[nodiscard]] u64 getUserSectionId() const;
         [[nodiscard]] u64 createSection(const std::string &name);
         void removeSection(u64 id);
         [[nodiscard]] std::vector<u8>& getSection(u64 id);

lib/source/pl/core/evaluator.cpp

@@ -947,6 +947,19 @@ namespace pl::core {
         return this->m_sectionIdStack.back();
     }
 
+    u64 Evaluator::getUserSectionId() const {
+        if (this->m_sectionIdStack.empty())
+            return 0;
+
+        for (auto it = this->m_sectionIdStack.rbegin(); it != this->m_sectionIdStack.rend(); ++it) {
+            if (*it != ptrn::Pattern::MainSectionId && *it != ptrn::Pattern::HeapSectionId && *it != ptrn::Pattern::PatternLocalSectionId && *it != ptrn::Pattern::InstantiationSectionId)
+                return *it;
+        }
+
+        return 0;
+    }
+
+
     u64 Evaluator::createSection(const std::string &name) {
         auto id = this->m_sectionId;
         this->m_sectionId++;

lib/source/pl/lib/std/mem.cpp

@@ -88,7 +88,7 @@ namespace pl::lib::libstd::mem {
                     sequence.push_back(u8(byte));
                 }
 
-                return findSequence(ctx, occurrenceIndex, offsetFrom, offsetTo, ctx->getSectionId(), sequence).value_or(-1);
+                return findSequence(ctx, occurrenceIndex, offsetFrom, offsetTo, ctx->getUserSectionId(), sequence).value_or(-1);
             });
 
             /* find_string_in_range(occurrence_index, start_offset, end_offset, string) */
@@ -98,15 +98,17 @@ namespace pl::lib::libstd::mem {
                 const u64 offsetTo        = params[2].toUnsigned();
                 const auto string         = params[3].toString(false);
 
-                return findSequence(ctx, occurrenceIndex, offsetFrom, offsetTo, ctx->getSectionId(), std::vector<u8>(string.data(), string.data() + string.size())).value_or(-1);
+                return findSequence(ctx, occurrenceIndex, offsetFrom, offsetTo, ctx->getUserSectionId(), std::vector<u8>(string.data(), string.data() + string.size())).value_or(-1);
             });
 
             /* read_unsigned(address, size, endian, section) */
             runtime.addFunction(nsStdMem, "read_unsigned", FunctionParameterCount::between(3, 4), [](Evaluator *ctx, auto params) -> std::optional<Token::Literal> {
                 const u64 address            = params[0].toUnsigned();
                 const size_t size            = params[1].toSigned();
                 const types::Endian endian   = params[2].toUnsigned();
-                const u64 section            = params.size() == 4 ? params[3].toUnsigned() : ptrn::Pattern::MainSectionId;
+                u64 section                  = params.size() == 4 ? params[3].toUnsigned() : ptrn::Pattern::MainSectionId;
+                if (section == 0xFFFF'FFFF'FFFF'FFFF)
+                    section = ctx->getUserSectionId();
 
                 if (size < 1 || size > 16)
                     err::E0012.throwError(fmt::format("Read size {} is out of range.", size), "Try a value between 1 and 16.");
@@ -123,7 +125,9 @@ namespace pl::lib::libstd::mem {
                 const u64 address            = params[0].toUnsigned();
                 const size_t size            = params[1].toSigned();
                 const types::Endian endian   = params[2].toUnsigned();
-                const u64 section            = params.size() == 4 ? params[3].toUnsigned() : ptrn::Pattern::MainSectionId;
+                u64 section                  = params.size() == 4 ? params[3].toUnsigned() : ptrn::Pattern::MainSectionId;
+                if (section == 0xFFFF'FFFF'FFFF'FFFF)
+                    section = ctx->getUserSectionId();
 
                 if (size < 1 || size > 16)
                     err::E0012.throwError(fmt::format("Read size {} is out of range.", size), "Try a value between 1 and 16.");
@@ -140,7 +144,9 @@ namespace pl::lib::libstd::mem {
             runtime.addFunction(nsStdMem, "read_string", FunctionParameterCount::between(2, 3), [](Evaluator *ctx, auto params) -> std::optional<Token::Literal> {
                 const u64 address            = params[0].toUnsigned();
                 const size_t size            = params[1].toSigned();
-                const u64 section            = params.size() == 3 ? params[2].toUnsigned() : ptrn::Pattern::MainSectionId;
+                u64 section                  = params.size() == 3 ? params[2].toUnsigned() : ptrn::Pattern::MainSectionId;
+                if (section == 0xFFFF'FFFF'FFFF'FFFF)
+                    section = ctx->getUserSectionId();
 
                 std::string result(size, '\x00');
                 ctx->readData(address, result.data(), size, section);