Attachment #223956 for bug #252362

View | Details | Raw Unified | Return to bug 252362 | Differences between

and this patch




# Created by: alepulver
# $FreeBSD: head/emulators/mame/Makefile 550258 2020-09-27 08:40:48Z manu $

PORTNAME?=	mame
PORTVERSION=	0.230
CATEGORIES=	emulators

MAINTAINER=	manu@FreeBSD.org


.if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
MAKE_ARGS+=	PTR64=1
EMULATOR=	${MSUBTARGET}64
.else
EMULATOR=	${MSUBTARGET}
.endif
EMULATOR=	${MSUBTARGET}
PLIST_SUB+=	EMULATOR=${EMULATOR}

post-patch:

Lines 1-3 Link Here

(-)mame/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1608936229	1	TIMESTAMP = 1617972627
2	SHA256 (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 7c4c9ec232ba988e65fd29665c9b8e40b5ac3aa9f561eeb107cebbf08ba94baf	2	SHA256 (mamedev-mame-0.230-mame0230_GH0.tar.gz) = 39ea744a9a49acf10990dfc95094663201b8219255c439da4028c57490ab3488
3	SIZE (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 196379874	3	SIZE (mamedev-mame-0.230-mame0230_GH0.tar.gz) = 195819564




--- makefile.orig	2021-03-30 13:19:45.000000000 +0200
+++ makefile	2021-04-09 23:23:37.240952000 +0200
@@ -437,15 +437,15 @@
 ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
 ARCHITECTURE := _x64
 endif
+ifeq ($(firstword $(filter powerpc64,$(UNAME))),powerpc64)
+ARCHITECTURE := _x64
+endif
 ifeq ($(firstword $(filter ppc64le,$(UNAME))),ppc64le)
 ARCHITECTURE := _x64
 endif
@@ -399,6 +402,13 @@ ifndef FORCE_DRC_C_BACKEND
 endif
 endif
 
+# powerpc has inline assembly support but no DRC
+ifeq ($(findstring powerpc,$(UNAME)),powerpc)
+ifndef FORCE_DRC_C_BACKEND
+	FORCE_DRC_C_BACKEND := 1
+endif
+endif
+
 # Autodetect BIGENDIAN
 # MacOSX
 ifndef BIGENDIAN
@@ -416,18 +426,26 @@ endif
 ifneq (,$(findstring s390x,$(UNAME)))
 BIGENDIAN := 1
 endif
+# FreeBSD
+ifneq (,$(findstring powerpc,$(UNAME)))
+ifneq (,$(findstring powerpc64le,$(UNAME)))
+BIGENDIAN := 0
+else
+BIGENDIAN := 1
+endif
+endif
 endif # BIGENDIAN
 
 ifndef PYTHON_EXECUTABLE
-PYTHON := python
+#PYTHON := python

 endif
 
 #-------------------------------------------------
@@ -576,19 +576,19 @@
 ifdef OVERRIDE_CC
 PARAMS += --CC='$(OVERRIDE_CC)'
 ifndef CROSS_BUILD




--- src/osd/eigccx86.h.orig	2021-02-23 16:02:38.000000000 +0100
+++ src/osd/eigccx86.h	2021-03-12 23:48:14.194160000 +0100
@@ -68,7 +68,7 @@
     multiply and return the full 64 bit result
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mul_32x32 _mul_32x32
 inline int64_t ATTR_CONST ATTR_FORCE_INLINE
 _mul_32x32(int32_t a, int32_t b)
@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
     result
 -------------------------------------------------*/
 
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 #define mulu_32x32 _mulu_32x32
 inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
 _mulu_32x32(uint32_t a, uint32_t b)
@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
     result to 32 bits
 -------------------------------------------------*/
 

 #define mul_32x32_shift _mul_32x32_shift
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
@@ -98,7 +98,7 @@
     result to 32 bits
 -------------------------------------------------*/
 

 #define mulu_32x32_shift _mulu_32x32_shift
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
@@ -126,7 +126,7 @@
     divide and return the 32 bit quotient
 -------------------------------------------------*/
 

 #define div_64x32 _div_64x32
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _div_64x32(int64_t a, int32_t b)
@@ -153,7 +153,7 @@
     divide and return the 32 bit quotient
 -------------------------------------------------*/
 

 #define divu_64x32 _divu_64x32
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _divu_64x32(uint64_t a, uint32_t b)
@@ -186,7 +186,7 @@
 _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t &remainder)
 {
 	int32_t quotient;
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 
 	// Throws arithmetic exception if result doesn't fit in 32 bits
 	__asm__ (
 		" idivl  %[divisor] ;"
@@ -226,7 +226,7 @@
 _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t &remainder)
 {
 	uint32_t quotient;
-#ifndef __x86_64__
+#if !defined(__amd64__) && !defined(__x86_64__)
 
 	// Throws arithmetic exception if result doesn't fit in 32 bits
 	__asm__ (
 		" divl  %[divisor] ;"
@@ -262,7 +262,7 @@
     division, and returning the 32 bit quotient
 -------------------------------------------------*/
 

 #define div_32x32_shift _div_32x32_shift
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
@@ -294,7 +294,7 @@
     division, and returning the 32 bit quotient
 -------------------------------------------------*/
 

 #define divu_32x32_shift _divu_32x32_shift
 inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
 _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
@@ -325,7 +325,7 @@
     divide and return the 32 bit remainder
 -------------------------------------------------*/
 

 #define mod_64x32 _mod_64x32
 inline int32_t ATTR_CONST ATTR_FORCE_INLINE
 _mod_64x32(int64_t a, int32_t b)
@@ -352,7 +352,7 @@
     divide and return the 32 bit remainder
 -------------------------------------------------*/
 




%%DATADIR%%/artwork/aperture2x4rb.png
%%DATADIR%%/artwork/aperture4x6.png
%%DATADIR%%/artwork/bgfx/border_blur/default.lay
%%DATADIR%%/artwork/bgfx/chains/crt-geom/add_alpha.py
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png

%%DATADIR%%/artwork/bgfx/chains/hq2x.png
%%DATADIR%%/artwork/bgfx/chains/hq3x.png
%%DATADIR%%/artwork/bgfx/chains/hq4x.png
%%DATADIR%%/artwork/chess/bb.svg
%%DATADIR%%/artwork/chess/bk.svg
%%DATADIR%%/artwork/chess/bn.svg
%%DATADIR%%/artwork/chess/bp.svg
%%DATADIR%%/artwork/chess/bq.svg
%%DATADIR%%/artwork/chess/br.svg
%%DATADIR%%/artwork/chess/README.md
%%DATADIR%%/artwork/chess/wb.svg
%%DATADIR%%/artwork/chess/wk.svg
%%DATADIR%%/artwork/chess/wn.svg
%%DATADIR%%/artwork/chess/wp.svg
%%DATADIR%%/artwork/chess/wq.svg
%%DATADIR%%/artwork/chess/wr.svg
%%DATADIR%%/artwork/dir.txt
%%DATADIR%%/artwork/LICENSE
%%DATADIR%%/artwork/monochrome-chessboard.png

%%DATADIR%%/hash/a800_cass.xml
%%DATADIR%%/hash/a800_flop.xml
%%DATADIR%%/hash/a800.xml
%%DATADIR%%/hash/abc1600_flop.xml
%%DATADIR%%/hash/abc80_cass.xml
%%DATADIR%%/hash/abc80_flop.xml
%%DATADIR%%/hash/abc800_hdd.xml

%%DATADIR%%/hash/aleste.xml
%%DATADIR%%/hash/alice32.xml
%%DATADIR%%/hash/alice90.xml
%%DATADIR%%/hash/alphasmart_kapps.xml
%%DATADIR%%/hash/alphatro_cart.xml
%%DATADIR%%/hash/alphatro_flop.xml
%%DATADIR%%/hash/altos5.xml

%%DATADIR%%/hash/cgenie_flop_rom.xml
%%DATADIR%%/hash/channelf.xml
%%DATADIR%%/hash/chessmstdm.xml
%%DATADIR%%/hash/chip8_quik.xml
%%DATADIR%%/hash/clickstart_cart.xml
%%DATADIR%%/hash/clipper_flop.xml
%%DATADIR%%/hash/coco_cart.xml

%%DATADIR%%/hash/dragon_flop.xml
%%DATADIR%%/hash/dragon_os9.xml
%%DATADIR%%/hash/e01_flop.xml
%%DATADIR%%/hash/easy_karaoke_cart.xml
%%DATADIR%%/hash/ec1841.xml
%%DATADIR%%/hash/einstein.xml
%%DATADIR%%/hash/ekara_japan_a.xml

%%DATADIR%%/hash/fm7_disk.xml
%%DATADIR%%/hash/fm77av.xml
%%DATADIR%%/hash/fmtowns_cd.xml
%%DATADIR%%/hash/fmtowns_flop_cracked.xml
%%DATADIR%%/hash/fmtowns_flop_misc.xml
%%DATADIR%%/hash/fmtowns_flop_orig.xml
%%DATADIR%%/hash/galaxy.xml
%%DATADIR%%/hash/gamate.xml
%%DATADIR%%/hash/gameboy.xml

%%DATADIR%%/hash/gx4000.xml
%%DATADIR%%/hash/h21.xml
%%DATADIR%%/hash/horizon.xml
%%DATADIR%%/hash/hp_ipc_rom.xml
%%DATADIR%%/hash/hp_ipc.xml
%%DATADIR%%/hash/hp85_rom.xml
%%DATADIR%%/hash/hp86_rom.xml

%%DATADIR%%/hash/laser2001_cart.xml
%%DATADIR%%/hash/laser2001_flop.xml
%%DATADIR%%/hash/leapfrog_didj_cart.xml
%%DATADIR%%/hash/leapfrog_iquest_cart.xml
%%DATADIR%%/hash/leapfrog_leappad_cart.xml
%%DATADIR%%/hash/leapfrog_ltleappad_cart.xml
%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
%%DATADIR%%/hash/leapfrog_turboextreme_cart.xml
%%DATADIR%%/hash/leapfrog_turbotwistbrainquest_cart.xml
%%DATADIR%%/hash/leapfrog_zippity_cart.xml
%%DATADIR%%/hash/leapster.xml
%%DATADIR%%/hash/lisa.xml
%%DATADIR%%/hash/lisa2.xml

%%DATADIR%%/hash/nes_ntbrom.xml
%%DATADIR%%/hash/nes.hsi
%%DATADIR%%/hash/nes.xml
%%DATADIR%%/hash/next_cdrom.xml
%%DATADIR%%/hash/next_hdd.xml
%%DATADIR%%/hash/next.xml
%%DATADIR%%/hash/ngp.xml
%%DATADIR%%/hash/ngpc.xml

%%DATADIR%%/hash/rainbow.xml
%%DATADIR%%/hash/README.md
%%DATADIR%%/hash/rwtrntcs.xml
%%DATADIR%%/hash/rx78_cart.xml
%%DATADIR%%/hash/rx78_cass.xml
%%DATADIR%%/hash/sage2.xml
%%DATADIR%%/hash/saitek_egr.xml
%%DATADIR%%/hash/saitek_kso.xml

%%DATADIR%%/hash/vsmile_cd.xml
%%DATADIR%%/hash/vsmileb_cart.xml
%%DATADIR%%/hash/vsmilem_cart.xml
%%DATADIR%%/hash/vtech_innotab_cart.xml
%%DATADIR%%/hash/vtech_innotv_innotabmax_cart.xml
%%DATADIR%%/hash/vtech_storio_cart.xml
%%DATADIR%%/hash/vz_cass.xml
%%DATADIR%%/hash/vz_snap.xml
%%DATADIR%%/hash/wangpc.xml
%%DATADIR%%/hash/waveterm.xml
%%DATADIR%%/hash/wicat.xml
%%DATADIR%%/hash/wizard_cart.xml
%%DATADIR%%/hash/wmbullet.xml
%%DATADIR%%/hash/wscolor.xml
%%DATADIR%%/hash/wswan.xml

Return to bug 252362

Lines 1-7 Link Here

(-)mame/Makefile (-4 / +3 lines)
1	# Created by: alepulver	1	# Created by: alepulver
		2	# $FreeBSD: head/emulators/mame/Makefile 550258 2020-09-27 08:40:48Z manu $
2		3
3	PORTNAME?= mame	4	PORTNAME?= mame
4	PORTVERSION= 0.226	5	PORTVERSION= 0.230
5	CATEGORIES= emulators	6	CATEGORIES= emulators
6		7
7	MAINTAINER= manu@FreeBSD.org	8	MAINTAINER= manu@FreeBSD.org
Lines 62-71 Link Here
62		63
63	.if ${ARCH} == amd64 \|\| ${ARCH:Mpowerpc64*}	64	.if ${ARCH} == amd64 \|\| ${ARCH:Mpowerpc64*}
64	MAKE_ARGS+= PTR64=1	65	MAKE_ARGS+= PTR64=1
65	EMULATOR= ${MSUBTARGET}64
66	.else
67	EMULATOR= ${MSUBTARGET}
68	.endif	66	.endif
		67	EMULATOR= ${MSUBTARGET}
69	PLIST_SUB+= EMULATOR=${EMULATOR}	68	PLIST_SUB+= EMULATOR=${EMULATOR}
70		69
71	post-patch:	70	post-patch:

Lines 1-43 Link Here

(-)mame/files/patch-makefile (-39 / +4 lines)
1	--- makefile.orig 2020-10-27 01:00:36 UTC	1	--- makefile.orig 2021-03-30 13:19:45.000000000 +0200
2	+++ makefile	2	+++ makefile 2021-04-09 23:23:37.240952000 +0200
3	@@ -319,6 +319,9 @@ endif	3	@@ -437,15 +437,15 @@
4	ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
5	ARCHITECTURE := _x64
6	endif	4	endif
7	+ifeq ($(firstword $(filter powerpc64,$(UNAME))),powerpc64)
8	+ARCHITECTURE := _x64
9	+endif
10	ifeq ($(firstword $(filter ppc64le,$(UNAME))),ppc64le)
11	ARCHITECTURE := _x64
12	endif
13	@@ -399,6 +402,13 @@ ifndef FORCE_DRC_C_BACKEND
14	endif
15	endif
16		5
17	+# powerpc has inline assembly support but no DRC
18	+ifeq ($(findstring powerpc,$(UNAME)),powerpc)
19	+ifndef FORCE_DRC_C_BACKEND
20	+ FORCE_DRC_C_BACKEND := 1
21	+endif
22	+endif
23	+
24	# Autodetect BIGENDIAN
25	# MacOSX
26	ifndef BIGENDIAN
27	@@ -416,18 +426,26 @@ endif
28	ifneq (,$(findstring s390x,$(UNAME)))
29	BIGENDIAN := 1
30	endif
31	+# FreeBSD
32	+ifneq (,$(findstring powerpc,$(UNAME)))
33	+ifneq (,$(findstring powerpc64le,$(UNAME)))
34	+BIGENDIAN := 0
35	+else
36	+BIGENDIAN := 1
37	+endif
38	+endif
39	endif # BIGENDIAN
40
41	ifndef PYTHON_EXECUTABLE	6	ifndef PYTHON_EXECUTABLE
42	-PYTHON := python	7	-PYTHON := python
43	+#PYTHON := python	8	+#PYTHON := python
Lines 56-62 Link Here
56	endif	21	endif
57		22
58	#-------------------------------------------------	23	#-------------------------------------------------
59	@@ -558,19 +576,19 @@ endif	24	@@ -576,19 +576,19 @@
60	ifdef OVERRIDE_CC	25	ifdef OVERRIDE_CC
61	PARAMS += --CC='$(OVERRIDE_CC)'	26	PARAMS += --CC='$(OVERRIDE_CC)'
62	ifndef CROSS_BUILD	27	ifndef CROSS_BUILD

Lines 1-24 Link Here

(-)mame/files/patch-src_osd_eigccx86.h (-34 / +16 lines)
1	--- src/osd/eigccx86.h.orig 2019-04-24 05:00:38 UTC	1	--- src/osd/eigccx86.h.orig 2021-02-23 16:02:38.000000000 +0100
2	+++ src/osd/eigccx86.h	2	+++ src/osd/eigccx86.h 2021-03-12 23:48:14.194160000 +0100
3	@@ -31,7 +31,7 @@	3	@@ -68,7 +68,7 @@
4	multiply and return the full 64 bit result
5	-------------------------------------------------*/
6
7	-#ifndef __x86_64__
8	+#if !defined(__amd64__) && !defined(__x86_64__)
9	#define mul_32x32 _mul_32x32
10	inline int64_t ATTR_CONST ATTR_FORCE_INLINE
11	_mul_32x32(int32_t a, int32_t b)
12	@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
13	result
14	-------------------------------------------------*/
15
16	-#ifndef __x86_64__
17	+#if !defined(__amd64__) && !defined(__x86_64__)
18	#define mulu_32x32 _mulu_32x32
19	inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
20	_mulu_32x32(uint32_t a, uint32_t b)
21	@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
22	result to 32 bits	4	result to 32 bits
23	-------------------------------------------------*/	5	-------------------------------------------------*/
24		6
Lines 27-33 Link Here
27	#define mul_32x32_shift _mul_32x32_shift	9	#define mul_32x32_shift _mul_32x32_shift
28	inline int32_t ATTR_CONST ATTR_FORCE_INLINE	10	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
29	_mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)	11	_mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
30	@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)	12	@@ -98,7 +98,7 @@
31	result to 32 bits	13	result to 32 bits
32	-------------------------------------------------*/	14	-------------------------------------------------*/
33		15
Lines 36-42 Link Here
36	#define mulu_32x32_shift _mulu_32x32_shift	18	#define mulu_32x32_shift _mulu_32x32_shift
37	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE	19	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
38	_mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)	20	_mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
39	@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shif	21	@@ -126,7 +126,7 @@
40	divide and return the 32 bit quotient	22	divide and return the 32 bit quotient
41	-------------------------------------------------*/	23	-------------------------------------------------*/
42		24
Lines 45-51 Link Here
45	#define div_64x32 _div_64x32	27	#define div_64x32 _div_64x32
46	inline int32_t ATTR_CONST ATTR_FORCE_INLINE	28	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
47	_div_64x32(int64_t a, int32_t b)	29	_div_64x32(int64_t a, int32_t b)
48	@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b)	30	@@ -153,7 +153,7 @@
49	divide and return the 32 bit quotient	31	divide and return the 32 bit quotient
50	-------------------------------------------------*/	32	-------------------------------------------------*/
51		33
Lines 54-78 Link Here
54	#define divu_64x32 _divu_64x32	36	#define divu_64x32 _divu_64x32
55	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE	37	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
56	_divu_64x32(uint64_t a, uint32_t b)	38	_divu_64x32(uint64_t a, uint32_t b)
57	@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE	39	@@ -186,7 +186,7 @@
58	_div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder)	40	_div_64x32_rem(int64_t dividend, int32_t divisor, int32_t &remainder)
59	{	41	{
60	int32_t quotient;	42	int32_t quotient;
61	-#ifndef __x86_64__	43	-#ifndef __x86_64__
62	+#if !defined(__amd64__) && !defined(__x86_64__)	44	+#if !defined(__amd64__) && !defined(__x86_64__)
63
64	// Throws arithmetic exception if result doesn't fit in 32 bits	45	// Throws arithmetic exception if result doesn't fit in 32 bits
65	__asm__ (	46	__asm__ (
66	@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE	47	" idivl %[divisor] ;"
67	_divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder)	48	@@ -226,7 +226,7 @@
		49	_divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t &remainder)
68	{	50	{
69	uint32_t quotient;	51	uint32_t quotient;
70	-#ifndef __x86_64__	52	-#ifndef __x86_64__
71	+#if !defined(__amd64__) && !defined(__x86_64__)	53	+#if !defined(__amd64__) && !defined(__x86_64__)
72
73	// Throws arithmetic exception if result doesn't fit in 32 bits	54	// Throws arithmetic exception if result doesn't fit in 32 bits
74	__asm__ (	55	__asm__ (
75	@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint32_t divisor, u	56	" divl %[divisor] ;"
		57	@@ -262,7 +262,7 @@
76	division, and returning the 32 bit quotient	58	division, and returning the 32 bit quotient
77	-------------------------------------------------*/	59	-------------------------------------------------*/
78		60
Lines 81-87 Link Here
81	#define div_32x32_shift _div_32x32_shift	63	#define div_32x32_shift _div_32x32_shift
82	inline int32_t ATTR_CONST ATTR_FORCE_INLINE	64	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
83	_div_32x32_shift(int32_t a, int32_t b, uint8_t shift)	65	_div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
84	@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, uint8_t shift)	66	@@ -294,7 +294,7 @@
85	division, and returning the 32 bit quotient	67	division, and returning the 32 bit quotient
86	-------------------------------------------------*/	68	-------------------------------------------------*/
87		69
Lines 90-96 Link Here
90	#define divu_32x32_shift _divu_32x32_shift	72	#define divu_32x32_shift _divu_32x32_shift
91	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE	73	inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
92	_divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)	74	_divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
93	@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shif	75	@@ -325,7 +325,7 @@
94	divide and return the 32 bit remainder	76	divide and return the 32 bit remainder
95	-------------------------------------------------*/	77	-------------------------------------------------*/
96		78
Lines 99-105 Link Here
99	#define mod_64x32 _mod_64x32	81	#define mod_64x32 _mod_64x32
100	inline int32_t ATTR_CONST ATTR_FORCE_INLINE	82	inline int32_t ATTR_CONST ATTR_FORCE_INLINE
101	_mod_64x32(int64_t a, int32_t b)	83	_mod_64x32(int64_t a, int32_t b)
102	@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b)	84	@@ -352,7 +352,7 @@
103	divide and return the 32 bit remainder	85	divide and return the 32 bit remainder
104	-------------------------------------------------*/	86	-------------------------------------------------*/
105		87

Lines 13-18 Link Here

(-)mame/pkg-plist (-15 / +32 lines)
13	%%DATADIR%%/artwork/aperture2x4rb.png	13	%%DATADIR%%/artwork/aperture2x4rb.png
14	%%DATADIR%%/artwork/aperture4x6.png	14	%%DATADIR%%/artwork/aperture4x6.png
15	%%DATADIR%%/artwork/bgfx/border_blur/default.lay	15	%%DATADIR%%/artwork/bgfx/border_blur/default.lay
		16	%%DATADIR%%/artwork/bgfx/chains/crt-geom/add_alpha.py
16	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png	17	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
17	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png	18	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
18	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png	19	%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
Lines 29-47 Link Here
29	%%DATADIR%%/artwork/bgfx/chains/hq2x.png	30	%%DATADIR%%/artwork/bgfx/chains/hq2x.png
30	%%DATADIR%%/artwork/bgfx/chains/hq3x.png	31	%%DATADIR%%/artwork/bgfx/chains/hq3x.png
31	%%DATADIR%%/artwork/bgfx/chains/hq4x.png	32	%%DATADIR%%/artwork/bgfx/chains/hq4x.png
32	%%DATADIR%%/artwork/chess/bb.png	33	%%DATADIR%%/artwork/chess/bb.svg
33	%%DATADIR%%/artwork/chess/bk.png	34	%%DATADIR%%/artwork/chess/bk.svg
34	%%DATADIR%%/artwork/chess/bn.png	35	%%DATADIR%%/artwork/chess/bn.svg
35	%%DATADIR%%/artwork/chess/bp.png	36	%%DATADIR%%/artwork/chess/bp.svg
36	%%DATADIR%%/artwork/chess/bq.png	37	%%DATADIR%%/artwork/chess/bq.svg
37	%%DATADIR%%/artwork/chess/br.png	38	%%DATADIR%%/artwork/chess/br.svg
38	%%DATADIR%%/artwork/chess/README.md	39	%%DATADIR%%/artwork/chess/README.md
39	%%DATADIR%%/artwork/chess/wb.png	40	%%DATADIR%%/artwork/chess/wb.svg
40	%%DATADIR%%/artwork/chess/wk.png	41	%%DATADIR%%/artwork/chess/wk.svg
41	%%DATADIR%%/artwork/chess/wn.png	42	%%DATADIR%%/artwork/chess/wn.svg
42	%%DATADIR%%/artwork/chess/wp.png	43	%%DATADIR%%/artwork/chess/wp.svg
43	%%DATADIR%%/artwork/chess/wq.png	44	%%DATADIR%%/artwork/chess/wq.svg
44	%%DATADIR%%/artwork/chess/wr.png	45	%%DATADIR%%/artwork/chess/wr.svg
45	%%DATADIR%%/artwork/dir.txt	46	%%DATADIR%%/artwork/dir.txt
46	%%DATADIR%%/artwork/LICENSE	47	%%DATADIR%%/artwork/LICENSE
47	%%DATADIR%%/artwork/monochrome-chessboard.png	48	%%DATADIR%%/artwork/monochrome-chessboard.png
Lines 62-68 Link Here
62	%%DATADIR%%/hash/a800_cass.xml	63	%%DATADIR%%/hash/a800_cass.xml
63	%%DATADIR%%/hash/a800_flop.xml	64	%%DATADIR%%/hash/a800_flop.xml
64	%%DATADIR%%/hash/a800.xml	65	%%DATADIR%%/hash/a800.xml
65	%%DATADIR%%/hash/abc1600.xml	66	%%DATADIR%%/hash/abc1600_flop.xml
66	%%DATADIR%%/hash/abc80_cass.xml	67	%%DATADIR%%/hash/abc80_cass.xml
67	%%DATADIR%%/hash/abc80_flop.xml	68	%%DATADIR%%/hash/abc80_flop.xml
68	%%DATADIR%%/hash/abc800_hdd.xml	69	%%DATADIR%%/hash/abc800_hdd.xml
Lines 79-84 Link Here
79	%%DATADIR%%/hash/aleste.xml	80	%%DATADIR%%/hash/aleste.xml
80	%%DATADIR%%/hash/alice32.xml	81	%%DATADIR%%/hash/alice32.xml
81	%%DATADIR%%/hash/alice90.xml	82	%%DATADIR%%/hash/alice90.xml
		83	%%DATADIR%%/hash/alphasmart_kapps.xml
82	%%DATADIR%%/hash/alphatro_cart.xml	84	%%DATADIR%%/hash/alphatro_cart.xml
83	%%DATADIR%%/hash/alphatro_flop.xml	85	%%DATADIR%%/hash/alphatro_flop.xml
84	%%DATADIR%%/hash/altos5.xml	86	%%DATADIR%%/hash/altos5.xml
Lines 173-178 Link Here
173	%%DATADIR%%/hash/cgenie_flop_rom.xml	175	%%DATADIR%%/hash/cgenie_flop_rom.xml
174	%%DATADIR%%/hash/channelf.xml	176	%%DATADIR%%/hash/channelf.xml
175	%%DATADIR%%/hash/chessmstdm.xml	177	%%DATADIR%%/hash/chessmstdm.xml
		178	%%DATADIR%%/hash/chip8_quik.xml
176	%%DATADIR%%/hash/clickstart_cart.xml	179	%%DATADIR%%/hash/clickstart_cart.xml
177	%%DATADIR%%/hash/clipper_flop.xml	180	%%DATADIR%%/hash/clipper_flop.xml
178	%%DATADIR%%/hash/coco_cart.xml	181	%%DATADIR%%/hash/coco_cart.xml
Lines 202-207 Link Here
202	%%DATADIR%%/hash/dragon_flop.xml	205	%%DATADIR%%/hash/dragon_flop.xml
203	%%DATADIR%%/hash/dragon_os9.xml	206	%%DATADIR%%/hash/dragon_os9.xml
204	%%DATADIR%%/hash/e01_flop.xml	207	%%DATADIR%%/hash/e01_flop.xml
		208	%%DATADIR%%/hash/easy_karaoke_cart.xml
205	%%DATADIR%%/hash/ec1841.xml	209	%%DATADIR%%/hash/ec1841.xml
206	%%DATADIR%%/hash/einstein.xml	210	%%DATADIR%%/hash/einstein.xml
207	%%DATADIR%%/hash/ekara_japan_a.xml	211	%%DATADIR%%/hash/ekara_japan_a.xml
Lines 242-248 Link Here
242	%%DATADIR%%/hash/fm7_disk.xml	246	%%DATADIR%%/hash/fm7_disk.xml
243	%%DATADIR%%/hash/fm77av.xml	247	%%DATADIR%%/hash/fm77av.xml
244	%%DATADIR%%/hash/fmtowns_cd.xml	248	%%DATADIR%%/hash/fmtowns_cd.xml
245	%%DATADIR%%/hash/fmtowns_flop.xml	249	%%DATADIR%%/hash/fmtowns_flop_cracked.xml
		250	%%DATADIR%%/hash/fmtowns_flop_misc.xml
		251	%%DATADIR%%/hash/fmtowns_flop_orig.xml
246	%%DATADIR%%/hash/galaxy.xml	252	%%DATADIR%%/hash/galaxy.xml
247	%%DATADIR%%/hash/gamate.xml	253	%%DATADIR%%/hash/gamate.xml
248	%%DATADIR%%/hash/gameboy.xml	254	%%DATADIR%%/hash/gameboy.xml
Lines 273-278 Link Here
273	%%DATADIR%%/hash/gx4000.xml	279	%%DATADIR%%/hash/gx4000.xml
274	%%DATADIR%%/hash/h21.xml	280	%%DATADIR%%/hash/h21.xml
275	%%DATADIR%%/hash/horizon.xml	281	%%DATADIR%%/hash/horizon.xml
		282	%%DATADIR%%/hash/hp_ipc_rom.xml
276	%%DATADIR%%/hash/hp_ipc.xml	283	%%DATADIR%%/hash/hp_ipc.xml
277	%%DATADIR%%/hash/hp85_rom.xml	284	%%DATADIR%%/hash/hp85_rom.xml
278	%%DATADIR%%/hash/hp86_rom.xml	285	%%DATADIR%%/hash/hp86_rom.xml
Lines 337-345 Link Here
337	%%DATADIR%%/hash/laser2001_cart.xml	344	%%DATADIR%%/hash/laser2001_cart.xml
338	%%DATADIR%%/hash/laser2001_flop.xml	345	%%DATADIR%%/hash/laser2001_flop.xml
339	%%DATADIR%%/hash/leapfrog_didj_cart.xml	346	%%DATADIR%%/hash/leapfrog_didj_cart.xml
		347	%%DATADIR%%/hash/leapfrog_iquest_cart.xml
340	%%DATADIR%%/hash/leapfrog_leappad_cart.xml	348	%%DATADIR%%/hash/leapfrog_leappad_cart.xml
341	%%DATADIR%%/hash/leapfrog_ltleappad_cart.xml	349	%%DATADIR%%/hash/leapfrog_ltleappad_cart.xml
342	%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml	350	%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
		351	%%DATADIR%%/hash/leapfrog_turboextreme_cart.xml
		352	%%DATADIR%%/hash/leapfrog_turbotwistbrainquest_cart.xml
		353	%%DATADIR%%/hash/leapfrog_zippity_cart.xml
343	%%DATADIR%%/hash/leapster.xml	354	%%DATADIR%%/hash/leapster.xml
344	%%DATADIR%%/hash/lisa.xml	355	%%DATADIR%%/hash/lisa.xml
345	%%DATADIR%%/hash/lisa2.xml	356	%%DATADIR%%/hash/lisa2.xml
Lines 425-430 Link Here
425	%%DATADIR%%/hash/nes_ntbrom.xml	436	%%DATADIR%%/hash/nes_ntbrom.xml
426	%%DATADIR%%/hash/nes.hsi	437	%%DATADIR%%/hash/nes.hsi
427	%%DATADIR%%/hash/nes.xml	438	%%DATADIR%%/hash/nes.xml
		439	%%DATADIR%%/hash/next_cdrom.xml
		440	%%DATADIR%%/hash/next_hdd.xml
428	%%DATADIR%%/hash/next.xml	441	%%DATADIR%%/hash/next.xml
429	%%DATADIR%%/hash/ngp.xml	442	%%DATADIR%%/hash/ngp.xml
430	%%DATADIR%%/hash/ngpc.xml	443	%%DATADIR%%/hash/ngpc.xml
Lines 519-525 Link Here
519	%%DATADIR%%/hash/rainbow.xml	532	%%DATADIR%%/hash/rainbow.xml
520	%%DATADIR%%/hash/README.md	533	%%DATADIR%%/hash/README.md
521	%%DATADIR%%/hash/rwtrntcs.xml	534	%%DATADIR%%/hash/rwtrntcs.xml
522	%%DATADIR%%/hash/rx78.xml	535	%%DATADIR%%/hash/rx78_cart.xml
		536	%%DATADIR%%/hash/rx78_cass.xml
523	%%DATADIR%%/hash/sage2.xml	537	%%DATADIR%%/hash/sage2.xml
524	%%DATADIR%%/hash/saitek_egr.xml	538	%%DATADIR%%/hash/saitek_egr.xml
525	%%DATADIR%%/hash/saitek_kso.xml	539	%%DATADIR%%/hash/saitek_kso.xml
Lines 649-660 Link Here
649	%%DATADIR%%/hash/vsmile_cd.xml	663	%%DATADIR%%/hash/vsmile_cd.xml
650	%%DATADIR%%/hash/vsmileb_cart.xml	664	%%DATADIR%%/hash/vsmileb_cart.xml
651	%%DATADIR%%/hash/vsmilem_cart.xml	665	%%DATADIR%%/hash/vsmilem_cart.xml
		666	%%DATADIR%%/hash/vtech_innotab_cart.xml
		667	%%DATADIR%%/hash/vtech_innotv_innotabmax_cart.xml
652	%%DATADIR%%/hash/vtech_storio_cart.xml	668	%%DATADIR%%/hash/vtech_storio_cart.xml
653	%%DATADIR%%/hash/vz_cass.xml	669	%%DATADIR%%/hash/vz_cass.xml
654	%%DATADIR%%/hash/vz_snap.xml	670	%%DATADIR%%/hash/vz_snap.xml
655	%%DATADIR%%/hash/wangpc.xml	671	%%DATADIR%%/hash/wangpc.xml
656	%%DATADIR%%/hash/waveterm.xml	672	%%DATADIR%%/hash/waveterm.xml
657	%%DATADIR%%/hash/wicat.xml	673	%%DATADIR%%/hash/wicat.xml
		674	%%DATADIR%%/hash/wizard_cart.xml
658	%%DATADIR%%/hash/wmbullet.xml	675	%%DATADIR%%/hash/wmbullet.xml
659	%%DATADIR%%/hash/wscolor.xml	676	%%DATADIR%%/hash/wscolor.xml
660	%%DATADIR%%/hash/wswan.xml	677	%%DATADIR%%/hash/wswan.xml