Externals: Update xbyak to v7.02 and switch away from fork

The last few patches we need have been upstreamed so we shouldn't need our downstream fork anymore.
FEX-Emu · Dec 21, 2023 · 8b24f7f · 8b24f7f
1 parent 00669a1
commit 8b24f7f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -15,19 +15,19 @@
 	path = External/tiny-json
 	url = https://github.com/Sonicadvance1/tiny-json.git
 [submodule "External/xbyak"]
-        shallow = true
+  shallow = true
 	path = External/xbyak
-	url = https://github.com/FEX-Emu/xbyak.git
+	url = https://github.com/herumi/xbyak.git
 [submodule "External/fex-posixtest-bins"]
-        shallow = true
+  shallow = true
 	path = External/fex-posixtest-bins
 	url = https://github.com/FEX-Emu/fex-posixtest-bins.git
 [submodule "External/fex-gvisor-tests-bins"]
-        shallow = true
+  shallow = true
 	path = External/fex-gvisor-tests-bins
 	url = https://github.com/FEX-Emu/fex-gvisor-tests-bins.git
 [submodule "External/fex-gcc-target-tests-bins"]
-        shallow = true
+  shallow = true
 	path = External/fex-gcc-target-tests-bins
 	url = https://github.com/FEX-Emu/fex-gcc-target-tests-bins.git
 [submodule "External/jemalloc"]

diff --git a/External/xbyak b/External/xbyak
diff --git a/FEXCore/Source/Interface/Core/HostFeatures.cpp b/FEXCore/Source/Interface/Core/HostFeatures.cpp
@@ -9,14 +9,6 @@
 
 #ifdef _M_X86_64
 #define XBYAK64
-#define XBYAK_CUSTOM_ALLOC
-#define XBYAK_CUSTOM_MALLOC FEXCore::Allocator::malloc
-#define XBYAK_CUSTOM_FREE FEXCore::Allocator::free
-#define XBYAK_CUSTOM_SETS
-#define XBYAK_STD_UNORDERED_SET fextl::unordered_set
-#define XBYAK_STD_UNORDERED_MAP fextl::unordered_map
-#define XBYAK_STD_UNORDERED_MULTIMAP fextl::unordered_multimap
-#define XBYAK_STD_LIST fextl::list
 #define XBYAK_NO_EXCEPTION
 #include <FEXCore/fextl/list.h>
 #include <FEXCore/fextl/unordered_map.h>

diff --git a/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp b/Source/Tools/TestHarnessRunner/TestHarnessRunner/HostRunner.cpp
@@ -24,14 +24,8 @@
 #include <vector>
 
 #include <signal.h>
-#define XBYAK_CUSTOM_ALLOC
-#define XBYAK_CUSTOM_MALLOC FEXCore::Allocator::malloc
-#define XBYAK_CUSTOM_FREE FEXCore::Allocator::free
-#define XBYAK_CUSTOM_SETS
-#define XBYAK_STD_UNORDERED_SET fextl::unordered_set
-#define XBYAK_STD_UNORDERED_MAP fextl::unordered_map
-#define XBYAK_STD_UNORDERED_MULTIMAP fextl::unordered_multimap
-#define XBYAK_STD_LIST fextl::list
+#define XBYAK64
+#define XBYAK_NO_EXCEPTION
 #include <xbyak/xbyak.h>
 using namespace Xbyak;
+40 −44		CMakeLists.txt
+10 −0		doc/changelog.md
+18 −0		doc/usage.md
+9 −4		gen/Makefile
+49 −165		gen/avx_type.hpp
+55 −0		gen/avx_type_def.h
+80 −89		gen/gen_avx512.cpp
+458 −314		gen/gen_code.cpp
+1 −1		meson.build
+8 −1		readme.md
+13 −1		readme.txt
+1 −1		sample/Makefile
+1 −1		sample/cpuid/adl.txt
+2 −0		sample/cpuid/arl.txt
+1 −1		sample/cpuid/bdw.txt
+1 −1		sample/cpuid/clx.txt
+1 −1		sample/cpuid/cnl.txt
+17 −3		sample/cpuid/cpuid.sh
+1 −1		sample/cpuid/cpx.txt
+1 −1		sample/cpuid/glm.txt
+1 −1		sample/cpuid/glp.txt
+2 −0		sample/cpuid/gnr.txt
+2 −0		sample/cpuid/grr.txt
+1 −1		sample/cpuid/hsw.txt
+1 −1		sample/cpuid/icl.txt
+1 −1		sample/cpuid/icx.txt
+1 −1		sample/cpuid/ivb.txt
+1 −1		sample/cpuid/knl.txt
+1 −1		sample/cpuid/knm.txt
+2 −0		sample/cpuid/lnl.txt
+2 −0		sample/cpuid/mtl.txt
+2 −0		sample/cpuid/rpl.txt
+1 −1		sample/cpuid/skl.txt
+1 −1		sample/cpuid/skx.txt
+1 −1		sample/cpuid/snb.txt
+1 −1		sample/cpuid/spr.txt
+2 −0		sample/cpuid/srf.txt
+1 −1		sample/cpuid/tgl.txt
+0 −2		sample/cpuid/tmp.txt
+1 −1		sample/cpuid/tnt.txt
+0 −10		sample/cpuid/update-txt.sh
+19 −2		sample/test_util.cpp
+22 −15		test/Makefile
+1,900 −0		test/apx.cpp
+2 −2		test/cvt_test.cpp
+28 −12		test/make_nm.cpp
+124 −0		test/misc.cpp
+13 −2		test/normalize_prefix.cpp
+1 −1		test/test_address.sh
+6 −0		test/test_all.bat
+1 −1		test/test_avx.sh
+1 −1		test/test_avx512.sh
+2 −2		test/test_misc.bat
+1 −1		test/test_nm.sh
+562 −268		xbyak/xbyak.h
+1,349 −1,097		xbyak/xbyak_mnemonic.h
+102 −20		xbyak/xbyak_util.h