Attachment #214813 for bug #246698

Lines 2-8 Link Here

(-)mame/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/emulators/mame/Makefile 529280 2020-03-27 20:31:33Z makc $	2	# $FreeBSD: head/emulators/mame/Makefile 529280 2020-03-27 20:31:33Z makc $
3		3
4	PORTNAME?= mame	4	PORTNAME?= mame
5	PORTVERSION= 0.212	5	PORTVERSION= 0.220
6	CATEGORIES= emulators	6	CATEGORIES= emulators
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 113-119 Link Here
113	.endif	113	.endif
114	.if ${MSUBTARGET:Mmess}	114	.if ${MSUBTARGET:Mmess}
115	(cd ${WRKSRC} && ${INSTALL_PROGRAM} castool chdman floptool imgtool jedutil \	115	(cd ${WRKSRC} && ${INSTALL_PROGRAM} castool chdman floptool imgtool jedutil \
116	ldresample ldverify nltool nlwav pngcmp regrep romcmp split src2html \	116	ldresample ldverify nltool nlwav pngcmp regrep romcmp split \
117	srcclean unidasm \	117	srcclean unidasm \
118	${STAGEDIR}${PREFIX}/libexec/mess)	118	${STAGEDIR}${PREFIX}/libexec/mess)
119	.endif	119	.endif

Lines 1-3 Link Here

(-)mame/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1565317830	1	TIMESTAMP = 1587832200
2	SHA256 (mamedev-mame-0.212-mame0212_GH0.tar.gz) = 3d3599c49626b240e98b1433c0813e11e471846154e8d29261d345cc78fc9a21	2	SHA256 (mamedev-mame-0.220-mame0220_GH0.tar.gz) = 8150bc8c60e4704ec222a22a8d4dc89c2de92781d0e52e2820126b4357c36c12
3	SIZE (mamedev-mame-0.212-mame0212_GH0.tar.gz) = 148502748	3	SIZE (mamedev-mame-0.220-mame0220_GH0.tar.gz) = 183042822




--- 3rdparty/bx/include/bx/inline/endian.inl.orig	2019-04-24 05:00:38 UTC
+++ 3rdparty/bx/include/bx/inline/endian.inl
@@ -46,7 +46,7 @@ namespace bx
 	}
 
 	template <typename Ty>
-	inline Ty toLittleEndian(const Ty _in)
+	inline Ty toLittleEndian(Ty _in)
 	{
 #if BX_CPU_ENDIAN_BIG
 		return endianSwap(_in);
@@ -56,7 +56,7 @@ namespace bx
 	}
 
 	template <typename Ty>
-	inline Ty toBigEndian(const Ty _in)
+	inline Ty toBigEndian(Ty _in)
 	{
 #if BX_CPU_ENDIAN_LITTLE
 		return endianSwap(_in);
@@ -66,7 +66,7 @@ namespace bx
 	}
 
 	template <typename Ty>
-	inline Ty toHostEndian(const Ty _in, bool _fromLittleEndian)
+	inline Ty toHostEndian(Ty _in, bool _fromLittleEndian)
 	{
 #if BX_CPU_ENDIAN_LITTLE
 		return _fromLittleEndian ? _in : endianSwap(_in);




--- 3rdparty/bx/include/bx/inline/readerwriter.inl.orig	2019-04-24 05:00:38 UTC
+++ 3rdparty/bx/include/bx/inline/readerwriter.inl
@@ -273,7 +273,7 @@ namespace bx
 	}
 
 	template<typename Ty>
-	int32_t read(ReaderI* _reader, Ty& _value, Error* _err)
+	inline int32_t read(ReaderI* _reader, Ty& _value, Error* _err)
 	{
 		BX_ERROR_SCOPE(_err);
 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
@@ -281,7 +281,7 @@ namespace bx
 	}
 
 	template<typename Ty>
-	int32_t readHE(ReaderI* _reader, Ty& _value, bool _fromLittleEndian, Error* _err)
+	inline int32_t readHE(ReaderI* _reader, Ty& _value, bool _fromLittleEndian, Error* _err)
 	{
 		BX_ERROR_SCOPE(_err);
 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
@@ -329,7 +329,7 @@ namespace bx
 	}
 
 	template<typename Ty>
-	int32_t write(WriterI* _writer, const Ty& _value, Error* _err)
+	inline int32_t write(WriterI* _writer, const Ty& _value, Error* _err)
 	{
 		BX_ERROR_SCOPE(_err);
 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
@@ -337,7 +337,7 @@ namespace bx
 	}
 
 	template<typename Ty>
-	int32_t writeLE(WriterI* _writer, const Ty& _value, Error* _err)
+	inline int32_t writeLE(WriterI* _writer, const Ty& _value, Error* _err)
 	{
 		BX_ERROR_SCOPE(_err);
 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
@@ -346,8 +346,14 @@ namespace bx
 		return result;
 	}
 
+	template<>
+	inline int32_t writeLE(WriterI* _writer, const float& _value, Error* _err)
+	{
+		return writeLE(_writer, floatToBits(_value), _err);
+	}
+
 	template<typename Ty>
-	int32_t writeBE(WriterI* _writer, const Ty& _value, Error* _err)
+	inline int32_t writeBE(WriterI* _writer, const Ty& _value, Error* _err)
 	{
 		BX_ERROR_SCOPE(_err);
 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
@@ -356,6 +362,12 @@ namespace bx
 		return result;
 	}
 
+	template<>
+	inline int32_t writeBE(WriterI* _writer, const float& _value, Error* _err)
+	{
+		return writeBE(_writer, floatToBits(_value), _err);
+	}
+
 	inline int64_t skip(SeekerI* _seeker, int64_t _offset)
 	{
 		return _seeker->seek(_offset, Whence::Current);
@@ -392,7 +404,7 @@ namespace bx
 	}
 
 	template<typename Ty>
-	int32_t peek(ReaderSeekerI* _reader, Ty& _value, Error* _err)
+	inline int32_t peek(ReaderSeekerI* _reader, Ty& _value, Error* _err)
 	{
 		BX_ERROR_SCOPE(_err);
 		BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );




--- 3rdparty/bx/include/bx/platform.h.orig	2019-04-24 05:00:38 UTC
+++ 3rdparty/bx/include/bx/platform.h
@@ -35,6 +35,7 @@
 #define BX_CRT_MINGW  0
 #define BX_CRT_MSVC   0
 #define BX_CRT_NEWLIB 0
+#define BX_CRT_BSD    0
 
 #ifndef BX_CRT_MUSL
 #	define BX_CRT_MUSL 0
@@ -232,6 +233,9 @@
 #	elif defined(__apple_build_version__) || defined(__ORBIS__) || defined(__EMSCRIPTEN__) || defined(__llvm__)
 #		undef  BX_CRT_LIBCXX
 #		define BX_CRT_LIBCXX 1
+#	elif BX_PLATFORM_BSD
+#		undef  BX_CRT_BSD
+#		define BX_CRT_BSD 1
 #	endif //
 
 #	if !BX_CRT_BIONIC \
@@ -240,7 +244,8 @@
 	&& !BX_CRT_MINGW  \
 	&& !BX_CRT_MSVC   \
 	&& !BX_CRT_MUSL   \
-	&& !BX_CRT_NEWLIB
+	&& !BX_CRT_NEWLIB \
+	&& !BX_CRT_BSD
 #		undef  BX_CRT_NONE
 #		define BX_CRT_NONE 1
 #	endif // BX_CRT_*
@@ -371,6 +376,8 @@
 #	define BX_CRT_NAME "Newlib"
 #elif BX_CRT_MUSL
 #	define BX_CRT_NAME "musl libc"
+#elif BX_CRT_BSD
+#	define BX_CRT_NAME "BSD"
 #elif BX_CRT_NONE
 #	define BX_CRT_NAME "None"
 #else

Lines 1-10 Link Here

(-)mame/files/patch-3rdparty_bx_include_bx_readerwriter.h (-10 lines)
1	--- 3rdparty/bx/include/bx/readerwriter.h.orig 2019-04-24 05:00:38 UTC
2	+++ 3rdparty/bx/include/bx/readerwriter.h
3	@@ -10,6 +10,7 @@
4	#include "endian.h"
5	#include "error.h"
6	#include "filepath.h"
7	+#include "math.h"
8	#include "string.h"
9	#include "uint32_t.h"
10

Lines 1-10 Link Here

(-)mame/files/patch-3rdparty_bx_src_mutex.cpp (-10 lines)
1	--- 3rdparty/bx/src/mutex.cpp.orig 2019-04-24 05:00:38 UTC
2	+++ 3rdparty/bx/src/mutex.cpp
3	@@ -16,6 +16,7 @@
4	\|\| BX_PLATFORM_IOS \
5	\|\| BX_PLATFORM_OSX \
6	\|\| BX_PLATFORM_PS4 \
7	+ \|\| BX_PLATFORM_BSD \
8	\|\| BX_PLATFORM_RPI
9	# include <pthread.h>
10	#elif BX_PLATFORM_WINDOWS \

Lines 1-10 Link Here

(-)mame/files/patch-3rdparty_bx_src_thread.cpp (-10 lines)
1	--- 3rdparty/bx/src/thread.cpp.orig 2019-04-24 05:00:38 UTC
2	+++ 3rdparty/bx/src/thread.cpp
3	@@ -15,6 +15,7 @@
4	\|\| BX_PLATFORM_IOS \
5	\|\| BX_PLATFORM_OSX \
6	\|\| BX_PLATFORM_PS4 \
7	+ \|\| BX_PLATFORM_BSD \
8	\|\| BX_PLATFORM_RPI
9	# include <pthread.h>
10	# if defined(__FreeBSD__)




--- 3rdparty/bx/tests/readerwriter_test.cpp.orig	2019-07-24 09:54:15 UTC
+++ 3rdparty/bx/tests/readerwriter_test.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2019 Branimir Karadzic. All rights reserved.
+ * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
+ */
+
+#include "test.h"
+#include <bx/readerwriter.h>
+
+TEST_CASE("writeLE", "")
+{
+	bx::SizerWriter writer;
+
+	bx::Error err;
+
+	int32_t total = bx::writeLE(&writer, 1.0f, &err);
+
+	REQUIRE(err.isOk() );
+	REQUIRE(total == 4);
+}
+
+TEST_CASE("writeBE", "")
+{
+	bx::SizerWriter writer;
+
+	bx::Error err;
+
+	int32_t total = bx::writeBE(&writer, 1.0f, &err);
+
+	REQUIRE(err.isOk() );
+	REQUIRE(total == 4);
+}

Lines 5-74 Link Here

(-)mame/pkg-plist (-56 / +104 lines)
5	libexec/mame/ldverify	5	libexec/mame/ldverify
6	libexec/mame/romcmp	6	libexec/mame/romcmp
7	libexec/mame/unidasm	7	libexec/mame/unidasm
		8	%%DATADIR%%/artwork/monochrome-chessboard.png
		9	%%DATADIR%%/artwork/dir.txt
		10	%%DATADIR%%/artwork/aperture4x6.png
8	%%DATADIR%%/artwork/LICENSE	11	%%DATADIR%%/artwork/LICENSE
9	%%DATADIR%%/artwork/README.md	12	%%DATADIR%%/artwork/README.md
10	%%DATADIR%%/artwork/aperture-grille.png	13	%%DATADIR%%/artwork/aperture2x4rb.png
11	%%DATADIR%%/artwork/aperture.png	14	%%DATADIR%%/artwork/slot-mask.png
		15	%%DATADIR%%/artwork/slot-mask-aligned.png
12	%%DATADIR%%/artwork/aperture1x2rb.png	16	%%DATADIR%%/artwork/aperture1x2rb.png
		17	%%DATADIR%%/artwork/scanlines.png
		18	%%DATADIR%%/artwork/shadow-mask.png
13	%%DATADIR%%/artwork/aperture1x3rb.png	19	%%DATADIR%%/artwork/aperture1x3rb.png
14	%%DATADIR%%/artwork/aperture2x4bg.png
15	%%DATADIR%%/artwork/aperture2x4rb.png
16	%%DATADIR%%/artwork/aperture4x6.png
17	%%DATADIR%%/artwork/bgfx/border_blur/default.lay	20	%%DATADIR%%/artwork/bgfx/border_blur/default.lay
18	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
19	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
20	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
21	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
22	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png
23	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png	21	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png
24	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png	22	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png
25	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png	23	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
		24	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
26	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png	25	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png
27	%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png	26	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
		27	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
		28	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png
28	%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png	29	%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png
29	%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png	30	%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png
30	%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png	31	%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png
		32	%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png
		33	%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png
31	%%DATADIR%%/artwork/bgfx/chains/hq2x.png	34	%%DATADIR%%/artwork/bgfx/chains/hq2x.png
32	%%DATADIR%%/artwork/bgfx/chains/hq3x.png	35	%%DATADIR%%/artwork/bgfx/chains/hq3x.png
33	%%DATADIR%%/artwork/bgfx/chains/hq4x.png	36	%%DATADIR%%/artwork/bgfx/chains/hq4x.png
		37	%%DATADIR%%/artwork/aperture.png
		38	%%DATADIR%%/artwork/monochrome-matrix.png
		39	%%DATADIR%%/artwork/chess/wn.png
		40	%%DATADIR%%/artwork/chess/wr.png
		41	%%DATADIR%%/artwork/chess/bn.png
		42	%%DATADIR%%/artwork/chess/br.png
34	%%DATADIR%%/artwork/chess/README.md	43	%%DATADIR%%/artwork/chess/README.md
		44	%%DATADIR%%/artwork/chess/bp.png
35	%%DATADIR%%/artwork/chess/bb.png	45	%%DATADIR%%/artwork/chess/bb.png
36	%%DATADIR%%/artwork/chess/bk.png	46	%%DATADIR%%/artwork/chess/bk.png
37	%%DATADIR%%/artwork/chess/bn.png	47	%%DATADIR%%/artwork/chess/wp.png
38	%%DATADIR%%/artwork/chess/bp.png
39	%%DATADIR%%/artwork/chess/bq.png
40	%%DATADIR%%/artwork/chess/br.png
41	%%DATADIR%%/artwork/chess/wb.png	48	%%DATADIR%%/artwork/chess/wb.png
42	%%DATADIR%%/artwork/chess/wk.png	49	%%DATADIR%%/artwork/chess/wk.png
43	%%DATADIR%%/artwork/chess/wn.png	50	%%DATADIR%%/artwork/chess/bq.png
44	%%DATADIR%%/artwork/chess/wp.png
45	%%DATADIR%%/artwork/chess/wq.png	51	%%DATADIR%%/artwork/chess/wq.png
46	%%DATADIR%%/artwork/chess/wr.png
47	%%DATADIR%%/artwork/dir.txt
48	%%DATADIR%%/artwork/monochrome-chessboard.png
49	%%DATADIR%%/artwork/monochrome-matrix.png
50	%%DATADIR%%/artwork/scanlines.png
51	%%DATADIR%%/artwork/shadow-mask.png
52	%%DATADIR%%/artwork/slot-mask-aligned.png
53	%%DATADIR%%/artwork/slot-mask.png
54	%%DATADIR%%/artwork/white.png	52	%%DATADIR%%/artwork/white.png
		53	%%DATADIR%%/artwork/aperture2x4bg.png
		54	%%DATADIR%%/artwork/aperture-grille.png
55	%%DATADIR%%/hash/32x.xml	55	%%DATADIR%%/hash/32x.xml
56	%%DATADIR%%/hash/3do_m2.xml	56	%%DATADIR%%/hash/3do_m2.xml
57	%%DATADIR%%/hash/LICENSE
58	%%DATADIR%%/hash/README.md
59	%%DATADIR%%/hash/a2600.xml
60	%%DATADIR%%/hash/a2600_cass.xml	57	%%DATADIR%%/hash/a2600_cass.xml
		58	%%DATADIR%%/hash/a2600.xml
61	%%DATADIR%%/hash/a5200.hsi	59	%%DATADIR%%/hash/a5200.hsi
62	%%DATADIR%%/hash/a5200.xml	60	%%DATADIR%%/hash/a5200.xml
63	%%DATADIR%%/hash/a7800.xml	61	%%DATADIR%%/hash/a7800.xml
64	%%DATADIR%%/hash/a800.xml	62	%%DATADIR%%/hash/a800_cass.xml
65	%%DATADIR%%/hash/a800_flop.xml	63	%%DATADIR%%/hash/a800_flop.xml
		64	%%DATADIR%%/hash/a800.xml
66	%%DATADIR%%/hash/abc1600.xml	65	%%DATADIR%%/hash/abc1600.xml
67	%%DATADIR%%/hash/abc800.xml
68	%%DATADIR%%/hash/abc800_hdd.xml
69	%%DATADIR%%/hash/abc806.xml
70	%%DATADIR%%/hash/abc80_cass.xml	66	%%DATADIR%%/hash/abc80_cass.xml
71	%%DATADIR%%/hash/abc80_flop.xml	67	%%DATADIR%%/hash/abc80_flop.xml
		68	%%DATADIR%%/hash/abc800_hdd.xml
		69	%%DATADIR%%/hash/abc800.xml
		70	%%DATADIR%%/hash/abc806.xml
72	%%DATADIR%%/hash/acrnsys_flop.xml	71	%%DATADIR%%/hash/acrnsys_flop.xml
73	%%DATADIR%%/hash/acrnsys_rom.xml	72	%%DATADIR%%/hash/acrnsys_rom.xml
74	%%DATADIR%%/hash/adam_cart.xml	73	%%DATADIR%%/hash/adam_cart.xml
Lines 83-88 Link Here
83	%%DATADIR%%/hash/alphatro_cart.xml	82	%%DATADIR%%/hash/alphatro_cart.xml
84	%%DATADIR%%/hash/alphatro_flop.xml	83	%%DATADIR%%/hash/alphatro_flop.xml
85	%%DATADIR%%/hash/altos5.xml	84	%%DATADIR%%/hash/altos5.xml
		85	%%DATADIR%%/hash/altos8600.xml
86	%%DATADIR%%/hash/amiga_a1000.xml	86	%%DATADIR%%/hash/amiga_a1000.xml
87	%%DATADIR%%/hash/amiga_a3000.xml	87	%%DATADIR%%/hash/amiga_a3000.xml
88	%%DATADIR%%/hash/amiga_apps.xml	88	%%DATADIR%%/hash/amiga_apps.xml
Lines 105-110 Link Here
105	%%DATADIR%%/hash/apple2_flop_orig.xml	105	%%DATADIR%%/hash/apple2_flop_orig.xml
106	%%DATADIR%%/hash/apple2gs.xml	106	%%DATADIR%%/hash/apple2gs.xml
107	%%DATADIR%%/hash/apple3.xml	107	%%DATADIR%%/hash/apple3.xml
		108	%%DATADIR%%/hash/applix_flop.xml
108	%%DATADIR%%/hash/apricot_flop.xml	109	%%DATADIR%%/hash/apricot_flop.xml
109	%%DATADIR%%/hash/aquarius.xml	110	%%DATADIR%%/hash/aquarius.xml
110	%%DATADIR%%/hash/arb.xml	111	%%DATADIR%%/hash/arb.xml
Lines 115-120 Link Here
115	%%DATADIR%%/hash/atom_flop.xml	116	%%DATADIR%%/hash/atom_flop.xml
116	%%DATADIR%%/hash/atom_rom.xml	117	%%DATADIR%%/hash/atom_rom.xml
117	%%DATADIR%%/hash/attache.xml	118	%%DATADIR%%/hash/attache.xml
		119	%%DATADIR%%/hash/aussiebyte.xml
118	%%DATADIR%%/hash/b2m.xml	120	%%DATADIR%%/hash/b2m.xml
119	%%DATADIR%%/hash/bbc_flop_32016.xml	121	%%DATADIR%%/hash/bbc_flop_32016.xml
120	%%DATADIR%%/hash/bbc_flop_6502.xml	122	%%DATADIR%%/hash/bbc_flop_6502.xml
Lines 126-143 Link Here
126	%%DATADIR%%/hash/bbc_flop_z80.xml	128	%%DATADIR%%/hash/bbc_flop_z80.xml
127	%%DATADIR%%/hash/bbc_rom.xml	129	%%DATADIR%%/hash/bbc_rom.xml
128	%%DATADIR%%/hash/bbca_cass.xml	130	%%DATADIR%%/hash/bbca_cass.xml
129	%%DATADIR%%/hash/bbcb_cass.xml
130	%%DATADIR%%/hash/bbcb_cass_de.xml	131	%%DATADIR%%/hash/bbcb_cass_de.xml
131	%%DATADIR%%/hash/bbcb_flop.xml	132	%%DATADIR%%/hash/bbcb_cass.xml
132	%%DATADIR%%/hash/bbcb_flop_orig.xml	133	%%DATADIR%%/hash/bbcb_flop_orig.xml
133	%%DATADIR%%/hash/bbcb_flop_us.xml	134	%%DATADIR%%/hash/bbcb_flop_us.xml
		135	%%DATADIR%%/hash/bbcb_flop.xml
134	%%DATADIR%%/hash/bbcbc.xml	136	%%DATADIR%%/hash/bbcbc.xml
135	%%DATADIR%%/hash/bbcm_cart.xml	137	%%DATADIR%%/hash/bbcm_cart.xml
136	%%DATADIR%%/hash/bbcm_cass.xml	138	%%DATADIR%%/hash/bbcm_cass.xml
137	%%DATADIR%%/hash/bbcm_flop.xml	139	%%DATADIR%%/hash/bbcm_flop.xml
138	%%DATADIR%%/hash/bbcmc_flop.xml	140	%%DATADIR%%/hash/bbcmc_flop.xml
		141	%%DATADIR%%/hash/bdesignm_design_cart.xml
		142	%%DATADIR%%/hash/bdesignm_game_cart.xml
139	%%DATADIR%%/hash/bk0010.xml	143	%%DATADIR%%/hash/bk0010.xml
		144	%%DATADIR%%/hash/bkrankp_cart.xml
140	%%DATADIR%%/hash/bml3_flop.xml	145	%%DATADIR%%/hash/bml3_flop.xml
		146	%%DATADIR%%/hash/buzztime_cart.xml
141	%%DATADIR%%/hash/bw12.xml	147	%%DATADIR%%/hash/bw12.xml
142	%%DATADIR%%/hash/bw14.xml	148	%%DATADIR%%/hash/bw14.xml
143	%%DATADIR%%/hash/bw2.xml	149	%%DATADIR%%/hash/bw2.xml
Lines 148-157 Link Here
148	%%DATADIR%%/hash/c2color_cart.xml	154	%%DATADIR%%/hash/c2color_cart.xml
149	%%DATADIR%%/hash/c64_cart.xml	155	%%DATADIR%%/hash/c64_cart.xml
150	%%DATADIR%%/hash/c64_cass.xml	156	%%DATADIR%%/hash/c64_cass.xml
151	%%DATADIR%%/hash/c64_flop.xml	157	%%DATADIR%%/hash/c64_flop_clcracked.xml
		158	%%DATADIR%%/hash/c64_flop_misc.xml
		159	%%DATADIR%%/hash/c64_flop_orig.xml
152	%%DATADIR%%/hash/c65_flop.xml	160	%%DATADIR%%/hash/c65_flop.xml
153	%%DATADIR%%/hash/camplynx_cass.xml	161	%%DATADIR%%/hash/camplynx_cass.xml
154	%%DATADIR%%/hash/camplynx_flop.xml	162	%%DATADIR%%/hash/camplynx_flop.xml
		163	%%DATADIR%%/hash/casio_rompack.xml
155	%%DATADIR%%/hash/casloopy.xml	164	%%DATADIR%%/hash/casloopy.xml
156	%%DATADIR%%/hash/cbm2_cart.xml	165	%%DATADIR%%/hash/cbm2_cart.xml
157	%%DATADIR%%/hash/cbm2_flop.xml	166	%%DATADIR%%/hash/cbm2_flop.xml
Lines 173-178 Link Here
173	%%DATADIR%%/hash/compclr2_flop.xml	182	%%DATADIR%%/hash/compclr2_flop.xml
174	%%DATADIR%%/hash/compis.xml	183	%%DATADIR%%/hash/compis.xml
175	%%DATADIR%%/hash/comx35_flop.xml	184	%%DATADIR%%/hash/comx35_flop.xml
		185	%%DATADIR%%/hash/conchess_plymate.xml
		186	%%DATADIR%%/hash/conchess_standard.xml
176	%%DATADIR%%/hash/copera.xml	187	%%DATADIR%%/hash/copera.xml
177	%%DATADIR%%/hash/cpc_cass.xml	188	%%DATADIR%%/hash/cpc_cass.xml
178	%%DATADIR%%/hash/cpc_flop.xml	189	%%DATADIR%%/hash/cpc_flop.xml
Lines 194-200 Link Here
194	%%DATADIR%%/hash/e01_flop.xml	205	%%DATADIR%%/hash/e01_flop.xml
195	%%DATADIR%%/hash/ec1841.xml	206	%%DATADIR%%/hash/ec1841.xml
196	%%DATADIR%%/hash/einstein.xml	207	%%DATADIR%%/hash/einstein.xml
197	%%DATADIR%%/hash/ekara_japan.xml
198	%%DATADIR%%/hash/ekara_japan_a.xml	208	%%DATADIR%%/hash/ekara_japan_a.xml
199	%%DATADIR%%/hash/ekara_japan_ac.xml	209	%%DATADIR%%/hash/ekara_japan_ac.xml
200	%%DATADIR%%/hash/ekara_japan_bh.xml	210	%%DATADIR%%/hash/ekara_japan_bh.xml
Lines 207-212 Link Here
207	%%DATADIR%%/hash/ekara_japan_s.xml	217	%%DATADIR%%/hash/ekara_japan_s.xml
208	%%DATADIR%%/hash/ekara_japan_sp.xml	218	%%DATADIR%%/hash/ekara_japan_sp.xml
209	%%DATADIR%%/hash/ekara_japan_web.xml	219	%%DATADIR%%/hash/ekara_japan_web.xml
		220	%%DATADIR%%/hash/ekara_japan.xml
210	%%DATADIR%%/hash/ekara_pal.xml	221	%%DATADIR%%/hash/ekara_pal.xml
211	%%DATADIR%%/hash/ekara_us.xml	222	%%DATADIR%%/hash/ekara_us.xml
212	%%DATADIR%%/hash/electron_cart.xml	223	%%DATADIR%%/hash/electron_cart.xml
Lines 217-231 Link Here
217	%%DATADIR%%/hash/ep64_cass.xml	228	%%DATADIR%%/hash/ep64_cass.xml
218	%%DATADIR%%/hash/ep64_flop.xml	229	%%DATADIR%%/hash/ep64_flop.xml
219	%%DATADIR%%/hash/epson_cpm.xml	230	%%DATADIR%%/hash/epson_cpm.xml
		231	%%DATADIR%%/hash/evio.xml
220	%%DATADIR%%/hash/ews286_flop.xml	232	%%DATADIR%%/hash/ews286_flop.xml
221	%%DATADIR%%/hash/exl100.xml	233	%%DATADIR%%/hash/exl100.xml
222	%%DATADIR%%/hash/famicom_cass.xml	234	%%DATADIR%%/hash/famicom_cass.xml
223	%%DATADIR%%/hash/famicom_flop.xml	235	%%DATADIR%%/hash/famicom_flop.xml
224	%%DATADIR%%/hash/fidel_sc6.xml	236	%%DATADIR%%/hash/fidel_sc6.xml
225	%%DATADIR%%/hash/fidel_scc.xml	237	%%DATADIR%%/hash/fidel_scc.xml
226	%%DATADIR%%/hash/fm77av.xml
227	%%DATADIR%%/hash/fm7_cass.xml	238	%%DATADIR%%/hash/fm7_cass.xml
228	%%DATADIR%%/hash/fm7_disk.xml	239	%%DATADIR%%/hash/fm7_disk.xml
		240	%%DATADIR%%/hash/fm77av.xml
229	%%DATADIR%%/hash/fmtowns_cd.xml	241	%%DATADIR%%/hash/fmtowns_cd.xml
230	%%DATADIR%%/hash/fmtowns_flop.xml	242	%%DATADIR%%/hash/fmtowns_flop.xml
231	%%DATADIR%%/hash/g7400.xml	243	%%DATADIR%%/hash/g7400.xml
Lines 237-273 Link Here
237	%%DATADIR%%/hash/gameking.xml	249	%%DATADIR%%/hash/gameking.xml
238	%%DATADIR%%/hash/gameking3.xml	250	%%DATADIR%%/hash/gameking3.xml
239	%%DATADIR%%/hash/gamepock.xml	251	%%DATADIR%%/hash/gamepock.xml
240	%%DATADIR%%/hash/gba.xml
241	%%DATADIR%%/hash/gba_ereader.xml	252	%%DATADIR%%/hash/gba_ereader.xml
		253	%%DATADIR%%/hash/gba.xml
242	%%DATADIR%%/hash/gbcolor.xml	254	%%DATADIR%%/hash/gbcolor.xml
243	%%DATADIR%%/hash/genius.xml	255	%%DATADIR%%/hash/gcslottv.xml
244	%%DATADIR%%/hash/ggm.xml	256	%%DATADIR%%/hash/ggm.xml
245	%%DATADIR%%/hash/gimix.xml	257	%%DATADIR%%/hash/gimix.xml
		258	%%DATADIR%%/hash/gj4000.xml
246	%%DATADIR%%/hash/gjmovie.xml	259	%%DATADIR%%/hash/gjmovie.xml
		260	%%DATADIR%%/hash/gjrstar.xml
247	%%DATADIR%%/hash/gl2000.xml	261	%%DATADIR%%/hash/gl2000.xml
248	%%DATADIR%%/hash/gl6000sl.xml	262	%%DATADIR%%/hash/gl6000sl.xml
249	%%DATADIR%%/hash/glcolor.xml	263	%%DATADIR%%/hash/glcolor.xml
		264	%%DATADIR%%/hash/glcx.xml
		265	%%DATADIR%%/hash/gln.xml
		266	%%DATADIR%%/hash/gls.xml
250	%%DATADIR%%/hash/gmaster.xml	267	%%DATADIR%%/hash/gmaster.xml
251	%%DATADIR%%/hash/gp32.xml	268	%%DATADIR%%/hash/gp32.xml
		269	%%DATADIR%%/hash/gtfore.xml
252	%%DATADIR%%/hash/guab.xml	270	%%DATADIR%%/hash/guab.xml
253	%%DATADIR%%/hash/gx4000.xml	271	%%DATADIR%%/hash/gx4000.xml
254	%%DATADIR%%/hash/h21.xml	272	%%DATADIR%%/hash/h21.xml
255	%%DATADIR%%/hash/horizon.xml	273	%%DATADIR%%/hash/horizon.xml
		274	%%DATADIR%%/hash/hp_ipc.xml
256	%%DATADIR%%/hash/hp85_rom.xml	275	%%DATADIR%%/hash/hp85_rom.xml
		276	%%DATADIR%%/hash/hp86_rom.xml
		277	%%DATADIR%%/hash/hp9825b_rom.xml
257	%%DATADIR%%/hash/hp9835a_rom.xml	278	%%DATADIR%%/hash/hp9835a_rom.xml
258	%%DATADIR%%/hash/hp9845a_rom.xml	279	%%DATADIR%%/hash/hp9845a_rom.xml
259	%%DATADIR%%/hash/hp9845b_rom.xml	280	%%DATADIR%%/hash/hp9845b_rom.xml
260	%%DATADIR%%/hash/hp9k3xx_flop.xml	281	%%DATADIR%%/hash/hp9k3xx_flop.xml
261	%%DATADIR%%/hash/hp_ipc.xml
262	%%DATADIR%%/hash/ht68k.xml	282	%%DATADIR%%/hash/ht68k.xml
263	%%DATADIR%%/hash/hx20_rom.xml	283	%%DATADIR%%/hash/hx20_rom.xml
264	%%DATADIR%%/hash/hyperscan.xml	284	%%DATADIR%%/hash/hyperscan.xml
265	%%DATADIR%%/hash/i7000_card.xml	285	%%DATADIR%%/hash/i7000_card.xml
266	%%DATADIR%%/hash/ibm5140.xml	286	%%DATADIR%%/hash/ibm5140.xml
267	%%DATADIR%%/hash/ibm5150.xml
268	%%DATADIR%%/hash/ibm5150_cass.xml	287	%%DATADIR%%/hash/ibm5150_cass.xml
269	%%DATADIR%%/hash/ibm5170.xml	288	%%DATADIR%%/hash/ibm5150.xml
270	%%DATADIR%%/hash/ibm5170_cdrom.xml	289	%%DATADIR%%/hash/ibm5170_cdrom.xml
		290	%%DATADIR%%/hash/ibm5170.xml
271	%%DATADIR%%/hash/ibm6580.xml	291	%%DATADIR%%/hash/ibm6580.xml
272	%%DATADIR%%/hash/ibmpcjr_cart.xml	292	%%DATADIR%%/hash/ibmpcjr_cart.xml
273	%%DATADIR%%/hash/ibmpcjr_flop.xml	293	%%DATADIR%%/hash/ibmpcjr_flop.xml
Lines 282-287 Link Here
282	%%DATADIR%%/hash/iq128.xml	302	%%DATADIR%%/hash/iq128.xml
283	%%DATADIR%%/hash/iq151_cart.xml	303	%%DATADIR%%/hash/iq151_cart.xml
284	%%DATADIR%%/hash/iq151_flop.xml	304	%%DATADIR%%/hash/iq151_flop.xml
		305	%%DATADIR%%/hash/ique.xml
		306	%%DATADIR%%/hash/iqunlim_cart.xml
285	%%DATADIR%%/hash/jaguar.xml	307	%%DATADIR%%/hash/jaguar.xml
286	%%DATADIR%%/hash/jakks_gamekey_dp.xml	308	%%DATADIR%%/hash/jakks_gamekey_dp.xml
287	%%DATADIR%%/hash/jakks_gamekey_dy.xml	309	%%DATADIR%%/hash/jakks_gamekey_dy.xml
Lines 289-298 Link Here
289	%%DATADIR%%/hash/jakks_gamekey_nk.xml	311	%%DATADIR%%/hash/jakks_gamekey_nk.xml
290	%%DATADIR%%/hash/jakks_gamekey_nm.xml	312	%%DATADIR%%/hash/jakks_gamekey_nm.xml
291	%%DATADIR%%/hash/jakks_gamekey_sw.xml	313	%%DATADIR%%/hash/jakks_gamekey_sw.xml
		314	%%DATADIR%%/hash/jazz.xml
292	%%DATADIR%%/hash/jb3000_flop.xml	315	%%DATADIR%%/hash/jb3000_flop.xml
293	%%DATADIR%%/hash/jpopira_jp.xml	316	%%DATADIR%%/hash/jpopira_jp.xml
294	%%DATADIR%%/hash/juicebox.xml	317	%%DATADIR%%/hash/juicebox.xml
		318	%%DATADIR%%/hash/juku.xml
295	%%DATADIR%%/hash/jupace_cass.xml	319	%%DATADIR%%/hash/jupace_cass.xml
		320	%%DATADIR%%/hash/jupace_snap.xml
296	%%DATADIR%%/hash/k28m2.xml	321	%%DATADIR%%/hash/k28m2.xml
297	%%DATADIR%%/hash/kayproii.xml	322	%%DATADIR%%/hash/kayproii.xml
298	%%DATADIR%%/hash/kc_cart.xml	323	%%DATADIR%%/hash/kc_cart.xml
Lines 303-308 Link Here
303	%%DATADIR%%/hash/lantutor.xml	328	%%DATADIR%%/hash/lantutor.xml
304	%%DATADIR%%/hash/laser2001_cart.xml	329	%%DATADIR%%/hash/laser2001_cart.xml
305	%%DATADIR%%/hash/leapfrog_leappad_cart.xml	330	%%DATADIR%%/hash/leapfrog_leappad_cart.xml
		331	%%DATADIR%%/hash/leapfrog_ltleappad_cart.xml
306	%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml	332	%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
307	%%DATADIR%%/hash/leapster.xml	333	%%DATADIR%%/hash/leapster.xml
308	%%DATADIR%%/hash/lisa.xml	334	%%DATADIR%%/hash/lisa.xml
Lines 328-338 Link Here
328	%%DATADIR%%/hash/megaduck.xml	354	%%DATADIR%%/hash/megaduck.xml
329	%%DATADIR%%/hash/megapc.xml	355	%%DATADIR%%/hash/megapc.xml
330	%%DATADIR%%/hash/megatech.xml	356	%%DATADIR%%/hash/megatech.xml
331	%%DATADIR%%/hash/mephisto.xml	357	%%DATADIR%%/hash/mephisto_mm1.xml
		358	%%DATADIR%%/hash/mephisto_mm2.xml
		359	%%DATADIR%%/hash/mephisto_mm4.xml
		360	%%DATADIR%%/hash/mephisto_mm5.xml
		361	%%DATADIR%%/hash/mephisto_smondial2.xml
332	%%DATADIR%%/hash/microvision.xml	362	%%DATADIR%%/hash/microvision.xml
		363	%%DATADIR%%/hash/midi_flop.xml
333	%%DATADIR%%/hash/mikro80.xml	364	%%DATADIR%%/hash/mikro80.xml
334	%%DATADIR%%/hash/mikrosha_cart.xml	365	%%DATADIR%%/hash/mikrosha_cart.xml
335	%%DATADIR%%/hash/mikrosha_cass.xml	366	%%DATADIR%%/hash/mikrosha_cass.xml
		367	%%DATADIR%%/hash/mindset_flop.xml
336	%%DATADIR%%/hash/misterx.xml	368	%%DATADIR%%/hash/misterx.xml
337	%%DATADIR%%/hash/mm1_flop.xml	369	%%DATADIR%%/hash/mm1_flop.xml
338	%%DATADIR%%/hash/mo5_cart.xml	370	%%DATADIR%%/hash/mo5_cart.xml
Lines 341-346 Link Here
341	%%DATADIR%%/hash/mo5_qd.xml	373	%%DATADIR%%/hash/mo5_qd.xml
342	%%DATADIR%%/hash/mo6_cass.xml	374	%%DATADIR%%/hash/mo6_cass.xml
343	%%DATADIR%%/hash/mo6_flop.xml	375	%%DATADIR%%/hash/mo6_flop.xml
		376	%%DATADIR%%/hash/mobigo_cart.xml
344	%%DATADIR%%/hash/monon_color.xml	377	%%DATADIR%%/hash/monon_color.xml
345	%%DATADIR%%/hash/mpu1000.xml	378	%%DATADIR%%/hash/mpu1000.xml
346	%%DATADIR%%/hash/mpz80.xml	379	%%DATADIR%%/hash/mpz80.xml
Lines 348-357 Link Here
348	%%DATADIR%%/hash/msx1_cart.xml	381	%%DATADIR%%/hash/msx1_cart.xml
349	%%DATADIR%%/hash/msx1_cass.xml	382	%%DATADIR%%/hash/msx1_cass.xml
350	%%DATADIR%%/hash/msx1_flop.xml	383	%%DATADIR%%/hash/msx1_flop.xml
351	%%DATADIR%%/hash/msx2.hsi
352	%%DATADIR%%/hash/msx2_cart.xml	384	%%DATADIR%%/hash/msx2_cart.xml
353	%%DATADIR%%/hash/msx2_cass.xml	385	%%DATADIR%%/hash/msx2_cass.xml
354	%%DATADIR%%/hash/msx2_flop.xml	386	%%DATADIR%%/hash/msx2_flop.xml
		387	%%DATADIR%%/hash/msx2.hsi
355	%%DATADIR%%/hash/msx2p_flop.xml	388	%%DATADIR%%/hash/msx2p_flop.xml
356	%%DATADIR%%/hash/msxr_flop.xml	389	%%DATADIR%%/hash/msxr_flop.xml
357	%%DATADIR%%/hash/mt65_cass.xml	390	%%DATADIR%%/hash/mt65_cass.xml
Lines 364-369 Link Here
364	%%DATADIR%%/hash/myvision.xml	397	%%DATADIR%%/hash/myvision.xml
365	%%DATADIR%%/hash/mz2000_cass.xml	398	%%DATADIR%%/hash/mz2000_cass.xml
366	%%DATADIR%%/hash/mz2000_flop.xml	399	%%DATADIR%%/hash/mz2000_flop.xml
		400	%%DATADIR%%/hash/mz2200_cass.xml
367	%%DATADIR%%/hash/mz2500.xml	401	%%DATADIR%%/hash/mz2500.xml
368	%%DATADIR%%/hash/mz700_cass.xml	402	%%DATADIR%%/hash/mz700_cass.xml
369	%%DATADIR%%/hash/mz800_cass.xml	403	%%DATADIR%%/hash/mz800_cass.xml
Lines 374-385 Link Here
374	%%DATADIR%%/hash/nascom_socket.xml	408	%%DATADIR%%/hash/nascom_socket.xml
375	%%DATADIR%%/hash/neocd.xml	409	%%DATADIR%%/hash/neocd.xml
376	%%DATADIR%%/hash/neogeo.xml	410	%%DATADIR%%/hash/neogeo.xml
377	%%DATADIR%%/hash/nes.hsi
378	%%DATADIR%%/hash/nes.xml
379	%%DATADIR%%/hash/nes_ade.xml	411	%%DATADIR%%/hash/nes_ade.xml
380	%%DATADIR%%/hash/nes_datach.xml	412	%%DATADIR%%/hash/nes_datach.xml
381	%%DATADIR%%/hash/nes_kstudio.xml	413	%%DATADIR%%/hash/nes_kstudio.xml
382	%%DATADIR%%/hash/nes_ntbrom.xml	414	%%DATADIR%%/hash/nes_ntbrom.xml
		415	%%DATADIR%%/hash/nes.hsi
		416	%%DATADIR%%/hash/nes.xml
383	%%DATADIR%%/hash/next.xml	417	%%DATADIR%%/hash/next.xml
384	%%DATADIR%%/hash/ngp.xml	418	%%DATADIR%%/hash/ngp.xml
385	%%DATADIR%%/hash/ngpc.xml	419	%%DATADIR%%/hash/ngpc.xml
Lines 398-403 Link Here
398	%%DATADIR%%/hash/partner_cass.xml	432	%%DATADIR%%/hash/partner_cass.xml
399	%%DATADIR%%/hash/partner_flop.xml	433	%%DATADIR%%/hash/partner_flop.xml
400	%%DATADIR%%/hash/pasogo.xml	434	%%DATADIR%%/hash/pasogo.xml
		435	%%DATADIR%%/hash/pasopia_cass.xml
401	%%DATADIR%%/hash/pb2000c.xml	436	%%DATADIR%%/hash/pb2000c.xml
402	%%DATADIR%%/hash/pc1000.xml	437	%%DATADIR%%/hash/pc1000.xml
403	%%DATADIR%%/hash/pc1512_flop.xml	438	%%DATADIR%%/hash/pc1512_flop.xml
Lines 408-417 Link Here
408	%%DATADIR%%/hash/pc8801_cass.xml	443	%%DATADIR%%/hash/pc8801_cass.xml
409	%%DATADIR%%/hash/pc8801_flop.xml	444	%%DATADIR%%/hash/pc8801_flop.xml
410	%%DATADIR%%/hash/pc88va.xml	445	%%DATADIR%%/hash/pc88va.xml
411	%%DATADIR%%/hash/pc98.xml
412	%%DATADIR%%/hash/pc98_cd.xml	446	%%DATADIR%%/hash/pc98_cd.xml
413	%%DATADIR%%/hash/pce.xml	447	%%DATADIR%%/hash/pc98.xml
414	%%DATADIR%%/hash/pce_tourvision.xml	448	%%DATADIR%%/hash/pce_tourvision.xml
		449	%%DATADIR%%/hash/pce.xml
415	%%DATADIR%%/hash/pcecd.xml	450	%%DATADIR%%/hash/pcecd.xml
416	%%DATADIR%%/hash/pcfx.xml	451	%%DATADIR%%/hash/pcfx.xml
417	%%DATADIR%%/hash/pcw.xml	452	%%DATADIR%%/hash/pcw.xml
Lines 427-436 Link Here
427	%%DATADIR%%/hash/pet_quik.xml	462	%%DATADIR%%/hash/pet_quik.xml
428	%%DATADIR%%/hash/pet_rom.xml	463	%%DATADIR%%/hash/pet_rom.xml
429	%%DATADIR%%/hash/phc25_cass.xml	464	%%DATADIR%%/hash/phc25_cass.xml
		465	%%DATADIR%%/hash/pi_storyreader_cart.xml
		466	%%DATADIR%%/hash/pi_storyreader_v2_cart.xml
430	%%DATADIR%%/hash/picno.xml	467	%%DATADIR%%/hash/picno.xml
431	%%DATADIR%%/hash/pico.xml	468	%%DATADIR%%/hash/pico.xml
432	%%DATADIR%%/hash/pippin.xml
433	%%DATADIR%%/hash/pippin_flop.xml	469	%%DATADIR%%/hash/pippin_flop.xml
		470	%%DATADIR%%/hash/pippin.xml
434	%%DATADIR%%/hash/plus4_cart.xml	471	%%DATADIR%%/hash/plus4_cart.xml
435	%%DATADIR%%/hash/plus4_cass.xml	472	%%DATADIR%%/hash/plus4_cass.xml
436	%%DATADIR%%/hash/plus4_flop.xml	473	%%DATADIR%%/hash/plus4_flop.xml
Lines 467-498 Link Here
467	%%DATADIR%%/hash/radio86_cart.xml	504	%%DATADIR%%/hash/radio86_cart.xml
468	%%DATADIR%%/hash/radio86_cass.xml	505	%%DATADIR%%/hash/radio86_cass.xml
469	%%DATADIR%%/hash/rainbow.xml	506	%%DATADIR%%/hash/rainbow.xml
		507	%%DATADIR%%/hash/README.md
470	%%DATADIR%%/hash/rwtrntcs.xml	508	%%DATADIR%%/hash/rwtrntcs.xml
471	%%DATADIR%%/hash/rx78.xml	509	%%DATADIR%%/hash/rx78.xml
472	%%DATADIR%%/hash/sage2.xml	510	%%DATADIR%%/hash/sage2.xml
473	%%DATADIR%%/hash/saitek_egr.xml	511	%%DATADIR%%/hash/saitek_egr.xml
		512	%%DATADIR%%/hash/saitek_kso.xml
474	%%DATADIR%%/hash/samcoupe_cass.xml	513	%%DATADIR%%/hash/samcoupe_cass.xml
475	%%DATADIR%%/hash/samcoupe_flop.xml	514	%%DATADIR%%/hash/samcoupe_flop.xml
476	%%DATADIR%%/hash/sat_cart.xml	515	%%DATADIR%%/hash/sat_cart.xml
477	%%DATADIR%%/hash/sat_vccart.xml	516	%%DATADIR%%/hash/sat_vccart.xml
478	%%DATADIR%%/hash/saturn.xml	517	%%DATADIR%%/hash/saturn.xml
479	%%DATADIR%%/hash/sawatte.xml	518	%%DATADIR%%/hash/sawatte.xml
		519	%%DATADIR%%/hash/sbrain.xml
480	%%DATADIR%%/hash/sc3000_cart.xml	520	%%DATADIR%%/hash/sc3000_cart.xml
481	%%DATADIR%%/hash/sc3000_cass.xml	521	%%DATADIR%%/hash/sc3000_cass.xml
482	%%DATADIR%%/hash/scv.xml	522	%%DATADIR%%/hash/scv.xml
		523	%%DATADIR%%/hash/sdk85.xml
483	%%DATADIR%%/hash/sega_beena_cart.xml	524	%%DATADIR%%/hash/sega_beena_cart.xml
484	%%DATADIR%%/hash/segacd.xml	525	%%DATADIR%%/hash/segacd.xml
485	%%DATADIR%%/hash/sf7000.xml	526	%%DATADIR%%/hash/sf7000.xml
486	%%DATADIR%%/hash/sg1000.xml	527	%%DATADIR%%/hash/sg1000.xml
487	%%DATADIR%%/hash/sgx.xml	528	%%DATADIR%%/hash/sgx.xml
488	%%DATADIR%%/hash/sitcom.xml	529	%%DATADIR%%/hash/sitcom.xml
		530	%%DATADIR%%/hash/smarttv_cart.xml
489	%%DATADIR%%/hash/smc777.xml	531	%%DATADIR%%/hash/smc777.xml
490	%%DATADIR%%/hash/smondial2.xml
491	%%DATADIR%%/hash/sms.xml	532	%%DATADIR%%/hash/sms.xml
492	%%DATADIR%%/hash/snes.xml
493	%%DATADIR%%/hash/snes_bspack.xml	533	%%DATADIR%%/hash/snes_bspack.xml
494	%%DATADIR%%/hash/snes_strom.xml	534	%%DATADIR%%/hash/snes_strom.xml
495	%%DATADIR%%/hash/snes_vkun.xml	535	%%DATADIR%%/hash/snes_vkun.xml
		536	%%DATADIR%%/hash/snes.xml
496	%%DATADIR%%/hash/snotec.xml	537	%%DATADIR%%/hash/snotec.xml
497	%%DATADIR%%/hash/snread.xml	538	%%DATADIR%%/hash/snread.xml
498	%%DATADIR%%/hash/snspell.xml	539	%%DATADIR%%/hash/snspell.xml
Lines 508-516 Link Here
508	%%DATADIR%%/hash/special_cass.xml	549	%%DATADIR%%/hash/special_cass.xml
509	%%DATADIR%%/hash/special_flop.xml	550	%%DATADIR%%/hash/special_flop.xml
510	%%DATADIR%%/hash/specpls3_flop.xml	551	%%DATADIR%%/hash/specpls3_flop.xml
		552	%%DATADIR%%/hash/spectrum_betadisc_flop.xml
511	%%DATADIR%%/hash/spectrum_cart.xml	553	%%DATADIR%%/hash/spectrum_cart.xml
512	%%DATADIR%%/hash/spectrum_cass.xml	554	%%DATADIR%%/hash/spectrum_cass.xml
513	%%DATADIR%%/hash/spectrum_flop_opus.xml	555	%%DATADIR%%/hash/spectrum_flop_opus.xml
		556	%%DATADIR%%/hash/spectrum_mgt_flop.xml
		557	%%DATADIR%%/hash/spectrum_microdrive.xml
		558	%%DATADIR%%/hash/spectrum_wafadrive.xml
514	%%DATADIR%%/hash/squale_cart.xml	559	%%DATADIR%%/hash/squale_cart.xml
515	%%DATADIR%%/hash/st_cart.xml	560	%%DATADIR%%/hash/st_cart.xml
516	%%DATADIR%%/hash/st_flop.xml	561	%%DATADIR%%/hash/st_flop.xml
Lines 534-539 Link Here
534	%%DATADIR%%/hash/tc4.xml	579	%%DATADIR%%/hash/tc4.xml
535	%%DATADIR%%/hash/tdv2324.xml	580	%%DATADIR%%/hash/tdv2324.xml
536	%%DATADIR%%/hash/tek4052_cart.xml	581	%%DATADIR%%/hash/tek4052_cart.xml
		582	%%DATADIR%%/hash/telestory_cart.xml
537	%%DATADIR%%/hash/tg16.xml	583	%%DATADIR%%/hash/tg16.xml
538	%%DATADIR%%/hash/ti74_cart.xml	584	%%DATADIR%%/hash/ti74_cart.xml
539	%%DATADIR%%/hash/ti95_cart.xml	585	%%DATADIR%%/hash/ti95_cart.xml
Lines 541-554 Link Here
541	%%DATADIR%%/hash/tiki100.xml	587	%%DATADIR%%/hash/tiki100.xml
542	%%DATADIR%%/hash/timex_dock.xml	588	%%DATADIR%%/hash/timex_dock.xml
543	%%DATADIR%%/hash/tntell.xml	589	%%DATADIR%%/hash/tntell.xml
544	%%DATADIR%%/hash/to770_cart.xml	590	%%DATADIR%%/hash/to_flop.xml
545	%%DATADIR%%/hash/to770a_cart.xml
546	%%DATADIR%%/hash/to7_cart.xml	591	%%DATADIR%%/hash/to7_cart.xml
547	%%DATADIR%%/hash/to7_cass.xml	592	%%DATADIR%%/hash/to7_cass.xml
548	%%DATADIR%%/hash/to7_qd.xml	593	%%DATADIR%%/hash/to7_qd.xml
		594	%%DATADIR%%/hash/to770_cart.xml
		595	%%DATADIR%%/hash/to770a_cart.xml
549	%%DATADIR%%/hash/to8_cass.xml	596	%%DATADIR%%/hash/to8_cass.xml
550	%%DATADIR%%/hash/to8_qd.xml	597	%%DATADIR%%/hash/to8_qd.xml
551	%%DATADIR%%/hash/to_flop.xml
552	%%DATADIR%%/hash/trs80m2.xml	598	%%DATADIR%%/hash/trs80m2.xml
553	%%DATADIR%%/hash/trsm100.xml	599	%%DATADIR%%/hash/trsm100.xml
554	%%DATADIR%%/hash/tutor.xml	600	%%DATADIR%%/hash/tutor.xml
Lines 561-566 Link Here
561	%%DATADIR%%/hash/uzebox.xml	607	%%DATADIR%%/hash/uzebox.xml
562	%%DATADIR%%/hash/v1050_flop.xml	608	%%DATADIR%%/hash/v1050_flop.xml
563	%%DATADIR%%/hash/v1050_hdd.xml	609	%%DATADIR%%/hash/v1050_hdd.xml
		610	%%DATADIR%%/hash/vbaby_cart.xml
564	%%DATADIR%%/hash/vboy.xml	611	%%DATADIR%%/hash/vboy.xml
565	%%DATADIR%%/hash/vc4000.xml	612	%%DATADIR%%/hash/vc4000.xml
566	%%DATADIR%%/hash/vector06_cart.xml	613	%%DATADIR%%/hash/vector06_cart.xml
Lines 584-589 Link Here
584	%%DATADIR%%/hash/vsmilem_cart.xml	631	%%DATADIR%%/hash/vsmilem_cart.xml
585	%%DATADIR%%/hash/vtech_storio_cart.xml	632	%%DATADIR%%/hash/vtech_storio_cart.xml
586	%%DATADIR%%/hash/vz_cass.xml	633	%%DATADIR%%/hash/vz_cass.xml
		634	%%DATADIR%%/hash/vz_snap.xml
587	%%DATADIR%%/hash/wangpc.xml	635	%%DATADIR%%/hash/wangpc.xml
588	%%DATADIR%%/hash/waveterm.xml	636	%%DATADIR%%/hash/waveterm.xml
589	%%DATADIR%%/hash/wicat.xml	637	%%DATADIR%%/hash/wicat.xml

Return to bug 246698

Lines 1-29 Link Here

(-)mame/files/patch-3rdparty_bx_include_bx_inline_endian.inl (-29 lines)
1	--- 3rdparty/bx/include/bx/inline/endian.inl.orig 2019-04-24 05:00:38 UTC
2	+++ 3rdparty/bx/include/bx/inline/endian.inl
3	@@ -46,7 +46,7 @@ namespace bx
4	}
5
6	template <typename Ty>
7	- inline Ty toLittleEndian(const Ty _in)
8	+ inline Ty toLittleEndian(Ty _in)
9	{
10	#if BX_CPU_ENDIAN_BIG
11	return endianSwap(_in);
12	@@ -56,7 +56,7 @@ namespace bx
13	}
14
15	template <typename Ty>
16	- inline Ty toBigEndian(const Ty _in)
17	+ inline Ty toBigEndian(Ty _in)
18	{
19	#if BX_CPU_ENDIAN_LITTLE
20	return endianSwap(_in);
21	@@ -66,7 +66,7 @@ namespace bx
22	}
23
24	template <typename Ty>
25	- inline Ty toHostEndian(const Ty _in, bool _fromLittleEndian)
26	+ inline Ty toHostEndian(Ty _in, bool _fromLittleEndian)
27	{
28	#if BX_CPU_ENDIAN_LITTLE
29	return _fromLittleEndian ? _in : endianSwap(_in);

Lines 1-76 Link Here

(-)mame/files/patch-3rdparty_bx_include_bx_inline_readerwriter.inl (-76 lines)
1	--- 3rdparty/bx/include/bx/inline/readerwriter.inl.orig 2019-04-24 05:00:38 UTC
2	+++ 3rdparty/bx/include/bx/inline/readerwriter.inl
3	@@ -273,7 +273,7 @@ namespace bx
4	}
5
6	template<typename Ty>
7	- int32_t read(ReaderI* _reader, Ty& _value, Error* _err)
8	+ inline int32_t read(ReaderI* _reader, Ty& _value, Error* _err)
9	{
10	BX_ERROR_SCOPE(_err);
11	BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
12	@@ -281,7 +281,7 @@ namespace bx
13	}
14
15	template<typename Ty>
16	- int32_t readHE(ReaderI* _reader, Ty& _value, bool _fromLittleEndian, Error* _err)
17	+ inline int32_t readHE(ReaderI* _reader, Ty& _value, bool _fromLittleEndian, Error* _err)
18	{
19	BX_ERROR_SCOPE(_err);
20	BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
21	@@ -329,7 +329,7 @@ namespace bx
22	}
23
24	template<typename Ty>
25	- int32_t write(WriterI* _writer, const Ty& _value, Error* _err)
26	+ inline int32_t write(WriterI* _writer, const Ty& _value, Error* _err)
27	{
28	BX_ERROR_SCOPE(_err);
29	BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
30	@@ -337,7 +337,7 @@ namespace bx
31	}
32
33	template<typename Ty>
34	- int32_t writeLE(WriterI* _writer, const Ty& _value, Error* _err)
35	+ inline int32_t writeLE(WriterI* _writer, const Ty& _value, Error* _err)
36	{
37	BX_ERROR_SCOPE(_err);
38	BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
39	@@ -346,8 +346,14 @@ namespace bx
40	return result;
41	}
42
43	+ template<>
44	+ inline int32_t writeLE(WriterI* _writer, const float& _value, Error* _err)
45	+ {
46	+ return writeLE(_writer, floatToBits(_value), _err);
47	+ }
48	+
49	template<typename Ty>
50	- int32_t writeBE(WriterI* _writer, const Ty& _value, Error* _err)
51	+ inline int32_t writeBE(WriterI* _writer, const Ty& _value, Error* _err)
52	{
53	BX_ERROR_SCOPE(_err);
54	BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );
55	@@ -356,6 +362,12 @@ namespace bx
56	return result;
57	}
58
59	+ template<>
60	+ inline int32_t writeBE(WriterI* _writer, const float& _value, Error* _err)
61	+ {
62	+ return writeBE(_writer, floatToBits(_value), _err);
63	+ }
64	+
65	inline int64_t skip(SeekerI* _seeker, int64_t _offset)
66	{
67	return _seeker->seek(_offset, Whence::Current);
68	@@ -392,7 +404,7 @@ namespace bx
69	}
70
71	template<typename Ty>
72	- int32_t peek(ReaderSeekerI* _reader, Ty& _value, Error* _err)
73	+ inline int32_t peek(ReaderSeekerI* _reader, Ty& _value, Error* _err)
74	{
75	BX_ERROR_SCOPE(_err);
76	BX_STATIC_ASSERT(isTriviallyCopyable<Ty>() );

Lines 1-39 Link Here

(-)mame/files/patch-3rdparty_bx_include_bx_platform.h (-39 lines)
1	--- 3rdparty/bx/include/bx/platform.h.orig 2019-04-24 05:00:38 UTC
2	+++ 3rdparty/bx/include/bx/platform.h
3	@@ -35,6 +35,7 @@
4	#define BX_CRT_MINGW 0
5	#define BX_CRT_MSVC 0
6	#define BX_CRT_NEWLIB 0
7	+#define BX_CRT_BSD 0
8
9	#ifndef BX_CRT_MUSL
10	# define BX_CRT_MUSL 0
11	@@ -232,6 +233,9 @@
12	# elif defined(__apple_build_version__) \|\| defined(__ORBIS__) \|\| defined(__EMSCRIPTEN__) \|\| defined(__llvm__)
13	# undef BX_CRT_LIBCXX
14	# define BX_CRT_LIBCXX 1
15	+# elif BX_PLATFORM_BSD
16	+# undef BX_CRT_BSD
17	+# define BX_CRT_BSD 1
18	# endif //
19
20	# if !BX_CRT_BIONIC \
21	@@ -240,7 +244,8 @@
22	&& !BX_CRT_MINGW \
23	&& !BX_CRT_MSVC \
24	&& !BX_CRT_MUSL \
25	- && !BX_CRT_NEWLIB
26	+ && !BX_CRT_NEWLIB \
27	+ && !BX_CRT_BSD
28	# undef BX_CRT_NONE
29	# define BX_CRT_NONE 1
30	# endif // BX_CRT_*
31	@@ -371,6 +376,8 @@
32	# define BX_CRT_NAME "Newlib"
33	#elif BX_CRT_MUSL
34	# define BX_CRT_NAME "musl libc"
35	+#elif BX_CRT_BSD
36	+# define BX_CRT_NAME "BSD"
37	#elif BX_CRT_NONE
38	# define BX_CRT_NAME "None"
39	#else

Lines 1-34 Link Here

(-)mame/files/patch-3rdparty_bx_tests_readerwriter__test.cpp (-34 lines)
1	--- 3rdparty/bx/tests/readerwriter_test.cpp.orig 2019-07-24 09:54:15 UTC
2	+++ 3rdparty/bx/tests/readerwriter_test.cpp
3	@@ -0,0 +1,31 @@
4	+/*
5	+ * Copyright 2010-2019 Branimir Karadzic. All rights reserved.
6	+ * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
7	+ */
8	+
9	+#include "test.h"
10	+#include <bx/readerwriter.h>
11	+
12	+TEST_CASE("writeLE", "")
13	+{
14	+ bx::SizerWriter writer;
15	+
16	+ bx::Error err;
17	+
18	+ int32_t total = bx::writeLE(&writer, 1.0f, &err);
19	+
20	+ REQUIRE(err.isOk() );
21	+ REQUIRE(total == 4);
22	+}
23	+
24	+TEST_CASE("writeBE", "")
25	+{
26	+ bx::SizerWriter writer;
27	+
28	+ bx::Error err;
29	+
30	+ int32_t total = bx::writeBE(&writer, 1.0f, &err);
31	+
32	+ REQUIRE(err.isOk() );
33	+ REQUIRE(total == 4);
34	+}