Fix bug with seq_alloc_sequential not respecting a run-time disabled …

…arena
libriscv · Aug 9, 2024 · ecd15a3 · ecd15a3
1 parent 7383575
commit ecd15a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/engine/src/script/script.cpp b/engine/src/script/script.cpp
@@ -548,7 +548,7 @@ gaddr_t Script::guest_alloc(gaddr_t bytes)
 
 gaddr_t Script::guest_alloc_sequential(gaddr_t bytes)
 {
-	return machine().arena().seq_alloc_aligned(bytes, 8);
+	return machine().arena().seq_alloc_aligned(bytes, 8, machine().memory.initial_rodata_end() != 0x0);
 }
 
 bool Script::guest_free(gaddr_t addr)

diff --git a/engine/src/script/script.hpp b/engine/src/script/script.hpp
@@ -523,6 +523,7 @@ template <typename T> struct GuestObjects
 		other.m_address = 0x0;
 		other.m_count	= 0u;
 	}
+	GuestObjects& operator=(GuestObjects&& other) = delete;
 
 	~GuestObjects()
 	{