Allocate sequential memory as if virtual paged

This forces allocated objects to be on the same page
libriscv · Dec 19, 2024 · 5640d3d · 5640d3d
1 parent a3d6da4
commit 5640d3d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/engine/src/script/script.cpp b/engine/src/script/script.cpp
@@ -532,9 +532,9 @@ gaddr_t Script::guest_alloc(gaddr_t bytes)
 	return machine().arena().malloc(bytes);
 }
 
-gaddr_t Script::guest_alloc_sequential(gaddr_t bytes)
+gaddr_t Script::guest_alloc_sequential(gaddr_t bytes, bool flat_arena)
 {
-	return machine().arena().seq_alloc_aligned(bytes, 8, machine().memory.initial_rodata_end() != 0x0);
+	return machine().arena().seq_alloc_aligned(bytes, 8, flat_arena && 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
@@ -240,8 +240,9 @@ struct Script
 	/// consecutive array of bytes, allowing it to be used with many (if not most)
 	/// APIs that do not handle fragmented memory.
 	/// @param bytes The number of sequentially allocated 8-byte aligned bytes.
+	/// @param flat_arena If enabled, treat arena memory as sequential.
 	/// @return The address of the sequentially allocated bytes.
-	gaddr_t guest_alloc_sequential(gaddr_t bytes);
+	gaddr_t guest_alloc_sequential(gaddr_t bytes, bool flat_arena = false);
 	bool guest_free(gaddr_t addr);
 
 	/// @brief Create a wrapper object that manages an allocation of n objects of type T
@@ -542,7 +543,7 @@ template <typename T> struct GuestObjects
 
 template <typename T> inline GuestObjects<T> Script::guest_alloc(size_t n)
 {
-	auto addr = this->guest_alloc_sequential(sizeof(T) * n);
+	auto addr = this->guest_alloc_sequential(sizeof(T) * n, false);
 	if (addr != 0x0)
 	{
 		// Gather single writable buffer, making sure memory is not copy-on-write

diff --git a/ext/library b/ext/library
diff --git a/ext/libriscv b/ext/libriscv
+1 −1		CMakeLists.txt
+27 −4		include/library/bitmap/bitmap.hpp
+9 −0		include/library/bitmap/colortools.hpp
+14 −3		include/library/math/toolbox.hpp
+5 −2		include/library/opengl/fbo.hpp
+8 −2		include/library/opengl/input.hpp
+8 −7		include/library/opengl/query.hpp
+5 −3		include/library/opengl/shader.hpp
+6 −0		include/library/opengl/texture.hpp
+46 −38		include/library/opengl/vao.hpp
+11 −15		include/library/voxels/voxelizer.hpp
+13 −11		include/library/voxels/voxelmodel.hpp
+100 −24		library/bitmap/bitmap.cpp
+5 −5		library/bitmap/colortools.cpp
+5,917 −5,504		library/bitmap/lodepng.cpp
+638 −254		library/bitmap/lodepng.h
+6 −5		library/log.cpp
+2 −2		library/math/baseconv.cpp
+32 −2		library/opengl/fbo.cpp
+28 −21		library/opengl/query.cpp
+26 −11		library/opengl/shader.cpp
+0 −5		library/opengl/texture.cpp
+103 −99		library/opengl/vao.cpp
+36 −138		library/voxels/voxelizer.cpp
+14 −9		library/voxels/voxelmodel.cpp