Merge branch 'master' into adding-fpu

Author: Elektraglide

hash/amigaocs_flop.xml

@@ -23969,7 +23969,8 @@ ATK test: failed
 		<publisher>Hollyware</publisher>
 		<notes><![CDATA[
 Locks up after Kickstart (white screen) [FDC] dsksync
-No player sprite on gameplay, [Paula] BGM is too fast?
+[Copper] No player sprite in gameplay
+[Paula] BGM is too fast
 ATK test: failed
 ]]></notes>
 		<part name="flop1" interface="floppy_3_5">

hash/mylife_cart.xml

@@ -8,6 +8,8 @@ license:CC0-1.0
 
     NO ROM:
     Revista - SEEPROM only (was blank)
+	
+	the ROM cartridges appear to be data only
 -->
 
 <!--
@@ -83,5 +85,22 @@ CEi = CE Internal ROM! (set to VCC in Cartridge-PCB)
 			-->
 		</part>
 	</software>
+	
+	<software name="cdisco" supported="no">
+		<description>Club Disco (Italy)</description>
+		<year>200?</year>
+		<publisher>Giochi Preziosi / Playmates</publisher>
+		<part name="cart" interface="mylife_cart">
+			<dataarea name="rom" size="0x800000">
+				<rom name="clubdisco.bin" size="0x800000" crc="d18006e7" sha1="ad2282766899610dc7fb32118b2eb7b434d01d01"/>
+			</dataarea>
+			<!-- blank -->
+			<!--
+			<dataarea name="seeprom" size="0x100">
+			    <rom name="af24bc02.bin" size="0x100" crc="fea8a821" sha1="c744cac6af7621524fc3a2b0a9a135a32b33c81b"/>
+			</dataarea>
+			-->
+		</part>
+	</software>	
 
 </softwarelist>

hash/pc8801_flop.xml

@@ -10618,8 +10618,6 @@ Optional [redbook] audio CD on PC-8801MC, requires dump of the actual OST to fix
 		</part>
 	</software>
 
-	<!-- Hangs when selecting any option -->
-	<!-- FDC stalls [Tries to read CHR=(0b 00 01) with N=6, existing ones have R=8x N=3] -->
 	<software name="dslayed2" supported="no">
 <!--
 ExtractDisk  [01]"START DISK      " -> "dragon slayer eiyu densetsu 2_01.d88"
@@ -10634,6 +10632,11 @@ ExtractDisk  [08]"SCENARIO DISK 4 " -> "dragon slayer eiyu densetsu 2_08.d88"
 		<description>Dragon Slayer - Eiyuu Densetsu 2</description>
 		<year>1992</year>
 		<publisher>日本ファルコム (Nihon Falcom)</publisher>
+		<notes><![CDATA[
+Hangs when selecting any option (TODO: retest me)
+FDC stalls [Tries to read CHR=(0b 00 01) with N=6, existing ones have R=8x N=3]
+Optional [redbook] audio CD on PC-8801MC, requires dump of the actual OST to fix playback there
+]]></notes>
 		<!-- PC8801mk2SR -->
 		<info name="release" value="19920319"/>
 		<info name="alt_title" value="ドラゴンスレイヤー英雄伝説2"/>
@@ -10698,10 +10701,13 @@ ExtractDisk  [08]"SCENARIO DISK 4 " -> "dragon slayer eiyu densetsu 2_08.d88"
 		</part>
 	</software>
 
-	<software name="dslayed2a" cloneof="dslayed2">
+	<software name="dslayed2a" cloneof="dslayed2" supported="no">
 		<description>Dragon Slayer - Eiyuu Densetsu 2 (alt Program Disk)</description>
 		<year>1992</year>
 		<publisher>日本ファルコム (Nihon Falcom)</publisher>
+		<notes><![CDATA[
+(Same as dslayed2)
+]]></notes>
 		<!-- PC8801mk2SR -->
 		<info name="release" value="19920319"/>
 		<info name="alt_title" value="ドラゴンスレイヤー英雄伝説2"/>
@@ -10783,6 +10789,9 @@ but in different order
 		<description>Dragon Slayer - Eiyuu Densetsu 2 (alt Program Disk 2)</description>
 		<year>1992</year>
 		<publisher>日本ファルコム (Nihon Falcom)</publisher>
+		<notes><![CDATA[
+Doesn't boot, needs floppy order to be fixed
+]]></notes>
 		<!-- PC8801mk2SR -->
 		<info name="release" value="19920319"/>
 		<info name="alt_title" value="ドラゴンスレイヤー英雄伝説2"/>
@@ -10791,6 +10800,7 @@ but in different order
 		<!-- Only disks 1 and 8 diff, and disks are shifted -> check! -->
 
 		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Program Disk" />
 			<dataarea name="flop" size="427088">
 				<rom name="eiyu densetsu ii_01.d88" size="427088" crc="c6aad443" sha1="4745e436a0c4e66da2b50c2d0cfc6217cc292827"/>
 			</dataarea>
@@ -10838,6 +10848,7 @@ but in different order
 			</dataarea>
 		</part>
 		<part name="flop8" interface="floppy_5_25">
+			<feature name="part_id" value="Start Disk" />
 			<dataarea name="flop" size="414992">
 				<rom name="eiyu densetsu ii_08.d88" size="414992" crc="8fde9837" sha1="7a7c05c202f15386339a50112609b1fdbb29e012"/>
 			</dataarea>
@@ -13657,11 +13668,13 @@ ExtractDisk  [04]"Data Disk    " -> "formula cms_04.d88"
 		</part>
 	</software>
 
-	<!-- Hangs after Game Arts logo animation, [i8214] spurious irqs -->
 	<software name="gamblerpd" cloneof="gamblerp" supported="no">
 		<description>Gambler Jikochuushinha Mahjong Puzzle Collection Demo</description>
 		<year>1989</year>
 		<publisher>ゲームアーツ (Game Arts)</publisher>
+		<notes><![CDATA[
+Hangs after Game Arts logo animation, [i8214] spurious irqs
+]]></notes>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="392368">
 				<rom name="gambler jikochushin-ha mahjong puzzle demo.d88" size="392368" crc="8a5e4dc6" sha1="e6339abe5cf5cc2f0c774227cb6ce23bcc8b6830"/>
@@ -26928,13 +26941,17 @@ ExtractDisk  [03]"ｼﾅﾘｵ2        " -> "phantasie iv the birth of heroes_03
 		</part>
 	</software>
 
-	<software name="popful">
+	<software name="popful" supported="partial">
 		<description>Popful Mail</description>
 		<year>1991</year>
 		<publisher>日本ファルコム (Nihon Falcom)</publisher>
+		<notes><![CDATA[
+Optional [redbook] audio CD on PC-8801MC, requires dump of the actual OST to fix playback there
+]]></notes>
 		<!-- PC8801mk2SR -->
 		<info name="release" value="19911220"/>
 		<info name="alt_title" value="ぽっぷるめいる"/>
+		<!-- TODO: pinpoint disk combinations for skipping opening -->
 		<!--combined image-->
 		<!--rom name="popful mail.d88" size="2496656" crc="acbb1bc0" sha1="3ef2dea25b96c478469e60fefaad9c083255e6d6"/-->
 
@@ -26981,10 +26998,13 @@ ExtractDisk  [03]"ｼﾅﾘｵ2        " -> "phantasie iv the birth of heroes_03
 		</part>
 	</software>
 
-	<software name="popfula" cloneof="popful">
+	<software name="popfula" cloneof="popful" supported="partial">
 		<description>Popful Mail (alt Program Disk)</description>
 		<year>1991</year>
 		<publisher>日本ファルコム (Nihon Falcom)</publisher>
+		<notes><![CDATA[
+Optional [redbook] audio CD on PC-8801MC, requires dump of the actual OST to fix playback there
+]]></notes>
 		<!-- PC8801mk2SR -->
 		<info name="release" value="19911220"/>
 		<info name="alt_title" value="ぽっぷるめいる"/>
@@ -29023,6 +29043,9 @@ Optional [redbook] audio CD on PC-8801MC
 		<description>Rune Worth</description>
 		<year>1990</year>
 		<publisher>T&amp;E Soft</publisher>
+		<notes><![CDATA[
+Hangs after PCM check (pc8801ma) or at title screen (pc8801mk2sr), spurious [i8214] sound irqs (regression, related to gamblerpd)
+]]></notes>
 		<!-- PC8801mk2SR -->
 		<info name="release" value="199001xx"/>
 		<info name="alt_title" value="ルーンワース"/>
@@ -50965,9 +50988,11 @@ Not extensively tested
 		</part>
 	</software>
 
+	<!-- Looks too old to be an actual floppy release? -->
 	<software name="superbas">
 		<description>Super Baseball</description>
-		<year>19??</year>
+		<year>1982</year>
+		<!-- Tinysoft / Sawaji Sawada -->
 		<publisher>&lt;unknown&gt;</publisher>
 		<info name="usage" value="Needs BASIC V1"/>
 
@@ -57474,7 +57499,9 @@ ExtractDisk  [04]"D DISK          " -> "musium sound board ii_04.d88"
 		<notes><![CDATA[
 Boots with a "Caramity Boy" screen and hangs there
 "第二回作品制作快調!" -> "Sequel being worked on, everything is fine" (wtf?)
+Doesn't seem to have a path for ignoring this screen, incomplete dump?
 ]]></notes>
+
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="425392">
 				<rom name="nformat disk.d88" size="425392" crc="30965674" sha1="eb378b400433b15b3e4c66e1a27615f04056ce60"/>

hash/pc88va.xml

@@ -421,7 +421,6 @@ Display off in places during intro
 [gfx] Requires fractional DOT scrolling (horizontal)
 [gfx] wrong draw mode for status bar in gameplay
 [gfx] needs cliprect at gameplay startup
-Unplayable with [keyboard]
 ]]></notes>
 		<info name="alt_title" value="オルテウス" />
 		<info name="usage" value="Kana Lock on pauses the game"/>

hash/smarttv_cart.xml

@@ -17,13 +17,13 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="enlunait" cloneof="amuseprk" supported="no"> <!-- first bytes of ROM are 0xff, erasing part of the checksum string, but checksum otherwise matches -->
+	<software name="enlunait" cloneof="amuseprk" supported="no"> <!-- checksum matches header -->
 		<description>English Luna Park (Italy)</description>
 		<year>200?</year>
 		<publisher>Clementoni</publisher>
 		<part name="cart" interface="smarttv_cart">
 			<dataarea name="rom" size="0x400000">
-				<rom name="English Luna Park (Italy).bin" size="0x400000" crc="4bfa7b27" sha1="b594844b25f470a7a07a2a4f43d2c2573dfb80aa"/>
+				<rom name="English Luna Park (Italy).bin" size="0x400000" crc="299d0c70" sha1="58ec947f3915f505b428fce18b031226070275f1"/>
 			</dataarea>
 		</part>
 	</software>
@@ -148,5 +148,16 @@ license:CC0-1.0
 			</dataarea>
 		</part>
 	</software>
+	
+	<software name="cars2it" supported="no"> <!-- checksum matches header -->
+		<description>Disney/Pixar Cars 2 (Italy)</description>
+		<year>200?</year>
+		<publisher>Clementoni</publisher>
+		<part name="cart" interface="smarttv_cart">
+			<dataarea name="rom" size="0x400000">
+				<rom name="Cars 2 (Italy).bin" size="0x400000" crc="f01308ba" sha1="1e0253e9de08fe9b9b1832dae6dfe90fcf27d261"/>
+			</dataarea>
+		</part>
+	</software>	
 
 </softwarelist>

scripts/build/complay.py

@@ -470,19 +470,6 @@ def elementStartHandler(self, name, attrs):
             self.have_file = 'file' in attrs
             self.have_data = None
             self.check_component(name, attrs)
-        elif 'reel' == name:
-            # TODO: validate symbollist and improve validation of other attributes
-            self.check_int_attribute(name, attrs, 'stateoffset', None)
-            numsymbolsvisible = self.check_int_attribute(name, attrs, 'numsymbolsvisible', None)
-            if (numsymbolsvisible is not None) and (0 >= numsymbolsvisible):
-                self.handle_error('Element reel attribute numsymbolsvisible "%s" not positive' % (attrs['numsymbolsvisible'], ))
-            reelreversed = self.check_int_attribute(name, attrs, 'reelreversed', None)
-            if (reelreversed is not None) and ((0 > reelreversed) or (1 < reelreversed)):
-                self.handle_error('Element reel attribute reelreversed "%s" not in valid range 0-1' % (attrs['reelreversed'], ))
-            beltreel = self.check_int_attribute(name, attrs, 'beltreel', None)
-            if (beltreel is not None) and ((0 > beltreel) or (1 < beltreel)):
-                self.handle_error('Element reel attribute beltreel "%s" not in valid range 0-1' % (attrs['beltreel'], ))
-            self.check_component(name, attrs)
         else:
             self.handle_error('Encountered unexpected element %s' % (name, ))
             self.ignored_depth = 1

scripts/resources/windows/mame/mame.man

@@ -9,7 +9,7 @@
 	</dependency>
 	<asmv3:application>
 		<asmv3:windowsSettings>
-			<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+			<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
 			<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
 		</asmv3:windowsSettings>
 	</asmv3:application>

scripts/src/bus.lua

@@ -2885,6 +2885,8 @@ if BUSES["ISA"] then
 		MAME_DIR .. "src/devices/bus/isa/ibm_speech.h",
 		MAME_DIR .. "src/devices/bus/isa/ide.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ide.h",
+		MAME_DIR .. "src/devices/bus/isa/dsi32.cpp",
+		MAME_DIR .. "src/devices/bus/isa/dsi32.h",
 		MAME_DIR .. "src/devices/bus/isa/lbaenhancer.cpp",
 		MAME_DIR .. "src/devices/bus/isa/lbaenhancer.h",
 		MAME_DIR .. "src/devices/bus/isa/lpt.cpp",

scripts/src/cpu.lua

@@ -4333,3 +4333,20 @@ if opt_tool(CPUS, "DSP563XX") then
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp563xx/dsp563xxd.cpp")
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp563xx/dsp563xxd.h")
 end
+
+--------------------------------------------------
+-- Mystery CPU architecture used in "My Life"
+--@src/devices/cpu/mylife/mylife.h,CPUS["MYLIFE"] = true
+--------------------------------------------------
+
+if CPUS["MYLIFE"] then
+	files {
+		MAME_DIR .. "src/devices/cpu/mylife/mylife.cpp",
+		MAME_DIR .. "src/devices/cpu/mylife/mylife.h",
+	}
+end
+
+if opt_tool(CPUS, "MYLIFE") then
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mylife/mylifed.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mylife/mylifed.h")
+end

scripts/src/osd/windows.lua

@@ -40,6 +40,7 @@ function maintargetosdoptions(_target,_subtarget)
 		"dinput8",
 		"ole32",
 		"psapi",
+		"shcore",
 		"shlwapi",
 		"uuid",
 	}
@@ -166,6 +167,8 @@ project ("osd_" .. _OPTIONS["osd"])
 		MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h",
+		MAME_DIR .. "src/osd/modules/debugger/win/debuggerprefs.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debuggerprefs.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h",
 		MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",