3rdParty: update mupen64plus-rsp-parallel

Rosalie241 · Jan 14, 2024 · 5cfe348 · 5cfe348
1 parent 5035c53
commit 5cfe348
Show file tree

Hide file tree

Showing 140 changed files with 23,004 additions and 5,292 deletions.
diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo b/Source/3rdParty/mupen64plus-rsp-parallel/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = [email protected]:/Rosalie241/parallel-rsp.git
 	branch = RMG
-	commit = dbecbe3a120e428436c5972fa7b872cfc2c9db3e
-	parent = cd54058e1af1870904b2db3f342f04405c5ed7c3
+	commit = eb7b30e25ac560e969e6f00b1cd2ba6d93901df0
+	parent = 5035c537840753fcaa237f23eff64ae0284c95c1
 	method = merge
 	cmdver = 0.4.6
diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/CMakeLists.txt b/Source/3rdParty/mupen64plus-rsp-parallel/CMakeLists.txt
@@ -97,5 +97,6 @@ if (PARALLEL_RSP_BAKED_LIGHTNING)
 		target_sources(lightning PRIVATE win32/mman/sys/mman.c)
 		target_include_directories(lightning PRIVATE win32/mman)
 	endif()
+	target_compile_definitions(lightning PUBLIC HAVE_MMAP=1)
 endif()
 target_link_libraries(${NAME_PLUGIN_M64P} PUBLIC lightning)
diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/jit_allocator.cpp b/Source/3rdParty/mupen64plus-rsp-parallel/jit_allocator.cpp
@@ -14,7 +14,11 @@ namespace RSP
 {
 namespace JIT
 {
+#if TARGET_OS_TV // tvOS is 64bit but does not allow an infinite amount of VA space
+static constexpr bool huge_va = false;
+#else
 static constexpr bool huge_va = std::numeric_limits<size_t>::max() > 0x100000000ull;
+#endif
 // On 64-bit systems, we will never allocate more than one block, this is important since we must ensure that
 // relative jumps are reachable in 32-bits.
 // We won't actually allocate 1 GB on 64-bit, but just reserve VA space for it, which we have basically an infinite amount of.

diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/lightning/.gitignore b/Source/3rdParty/mupen64plus-rsp-parallel/lightning/.gitignore
@@ -1,4 +1,15 @@
+/build-aux
 +*
+
+*.o
+*.lo
+*.la
+
+.libs/
+.deps/
+*/.libs/
+*/.deps/
+
 autom4te.cache
 aclocal.m4
 depcomp
@@ -20,14 +31,14 @@ missing
 size
 stamp-h1
 test-driver
-check/.deps
-doc/.deps
-lib/.deps
+
 m4/libtool.m4
 m4/lt~obsolete.m4
 m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
-doc/mdate-sh
-doc/texinfo.tex
+
 lightning.pc
+include/lightning.h
+
+build-aux/
diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/lightning/.gitmodules b/Source/3rdParty/mupen64plus-rsp-parallel/lightning/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gnulib"]
+	path = gnulib
+	url = git://git.sv.gnu.org/gnulib.git
diff --git a/Source/3rdParty/mupen64plus-rsp-parallel/lightning/.gitrepo b/Source/3rdParty/mupen64plus-rsp-parallel/lightning/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://git.savannah.gnu.org/git/lightning.git
 	branch = master
-	commit = b0b8eb5e856c0d29053dc842e1919a2eb58c8cda
-	parent = 9f797430963d9cf0fcef7d963466f9cac7026de2
+	commit = 75e5274ba59feab99a2afcf329d890911ed01eaf
+	parent = b7d23a9d07791c7006d57c58ab1e442103741cd6
 	method = merge
-	cmdver = 0.4.1
+	cmdver = 0.4.5