Skip to content

Commit de3b155

Browse files
holubholub
authored
Merge branch 'mamedev:master' into tsconf2
2 parents 69fdd02 + 16544be commit de3b155

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1139
-526
lines changed

‎hash/duelmast_cart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license:CC0-1.0
1313
<!-- only the single known cart exists for this system -->
1414

1515
<software name="ver1" supported="no">
16-
<description>Duel Masters: Duel Station Ver.1</description>
16+
<description>Duel Masters: Duel Station Senyō Cartridge Ver.1</description>
1717
<year>2003</year>
1818
<publisher>Takara</publisher>
1919
<info name="alt_title" value="デュエルマスターズ　デュエルステーション専用カートリッジ　Ver.1" />

‎hash/kim1_cass.xml

Lines changed: 119 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,119 @@
1-
<?xml version="1.0"?>
2-
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
3-
<!--
4-
license:CC0-1.0
5-
-->
6-
7-
<!--
8-
9-
Most KIM-1 software is complex to use. Refer to the manuals for information.
10-
11-
MAME's KIM-1 driver is not good at loading cassette recordings. So instead,
12-
the ones provided here are re-encodings made with a BIN to WAV conversion tool,
13-
such as KIMTAPE 0.5 (at default speed), eg:
14-
15-
kimtape -m -a0 -da1 a1.bin a1.wav
16-
17-
-->
18-
19-
<softwarelist name="kim1_cass" description="KIM-1 cassettes">
20-
21-
<software name="baseball">
22-
<description>Baseball</description>
23-
<year>1979</year>
24-
<publisher>Robert Leedom</publisher>
25-
<info name="usage" value="Loads in 3 parts. ID 01, ID 02, ID 03, GO 0200" />
26-
<part name="cass" interface="kim1_cass">
27-
<dataarea name="cass" size="26518684">
28-
<rom name="baseball.wav" size="26518684" crc="01e1f702" sha1="7ed49cc17781ca2abfb6496071a88fb8c1f17137"/>
29-
</dataarea>
30-
</part>
31-
</software>
32-
33-
<software name="focal">
34-
<description>FOCAL-65 (V3D)</description>
35-
<year>1977</year>
36-
<publisher>Aresco</publisher>
37-
<info name="usage" value="terminal, Loads in 2 parts. ID 01, ID 02, GO 2000" />
38-
<part name="cass" interface="kim1_cass">
39-
<dataarea name="cass" size="16230584">
40-
<rom name="focal.wav" size="16230584" crc="e8eb2679" sha1="7ef83fa37077987551e4e48f16ba1494b5d827e7"/>
41-
</dataarea>
42-
</part>
43-
</software>
44-
45-
<software name="hexpawn">
46-
<description>Hexpawn</description>
47-
<year>1978</year>
48-
<publisher>Robert Leedom</publisher>
49-
<info name="usage" value="ID 01, GO 0100" />
50-
<part name="cass" interface="kim1_cass">
51-
<dataarea name="cass" size="2361357">
52-
<rom name="hexpawn.wav" size="2361357" crc="2a0810be" sha1="c0656f9e99b071396263d98bbc87d2de9cd68e72"/>
53-
</dataarea>
54-
</part>
55-
</software>
56-
57-
<software name="kimbasic">
58-
<description>MOS TECH 6502 BASIC 9-digit v1.1</description>
59-
<year>1977</year>
60-
<publisher>Microsoft Co.</publisher>
61-
<info name="usage" value="terminal, ID 01, GO 4065" />
62-
<part name="cass" interface="kim1_cass">
63-
<dataarea name="cass" size="23219181">
64-
<rom name="kim basic 911.wav" size="23219181" crc="72470b66" sha1="0d4c00bde405ea491f27b1fffee7f07d45ee09a0"/>
65-
</dataarea>
66-
</part>
67-
</software>
68-
69-
<software name="kb6" cloneof="kimbasic">
70-
<description>MOS TECH 6502 BASIC 6-digit</description>
71-
<year>1977</year>
72-
<publisher>Microsoft Co.</publisher>
73-
<info name="usage" value="terminal, ID 01, GO 3D73" />
74-
<part name="cass" interface="kim1_cass">
75-
<dataarea name="cass" size="21267405">
76-
<rom name="kim basic 6.wav" size="21267405" crc="0ba87eaa" sha1="46f2f23a9a41a9fe95080c87acd7bc8929161717"/>
77-
</dataarea>
78-
</part>
79-
</software>
80-
81-
<software name="microade">
82-
<description>Micro-ADE</description>
83-
<year>1977</year>
84-
<publisher>MicroWare Ltd</publisher>
85-
<info name="usage" value="terminal, ID 01, GO 2000" />
86-
<part name="cass" interface="kim1_cass">
87-
<dataarea name="cass" size="10984941">
88-
<rom name="microade.wav" size="10984941" crc="defbe148" sha1="40ce84727d65f195aa1ef451714781c78b1d2785"/>
89-
</dataarea>
90-
</part>
91-
</software>
92-
93-
<software name="mchess">
94-
<description>Microchess</description>
95-
<year>1976</year>
96-
<publisher>Micro-Ware Ltd.</publisher>
97-
<info name="usage" value="Enter 'R -00F1=00 -17F9=C0 -1873X'. Play tape, pause when display shows 0000 (P). 'R -17F9=C1 -1873X', (P), 'R X'." />
98-
<part name="cass" interface="kim1_cass">
99-
<dataarea name="cass" size="9953338">
100-
<!-- IDs C0,C1 are the main program, IDs 01-05 are optional chess openings -->
101-
<rom name="microchess.wav" size="9953338" crc="c7584ae0" sha1="9f1ac8f439e083dd592664a0f1e6ba1530836120"/>
102-
</dataarea>
103-
</part>
104-
</software>
105-
106-
<software name="kimvent">
107-
<description>KIM-Venture</description>
108-
<year>1979</year>
109-
<publisher>Robert C. Leedom.</publisher>
110-
<info name="usage" value="Enter 'R -00F1=00 -17F9=A1 -1873X'. Play tape, pause when display shows 0000 (P). '-17F9=A2 -1873X', (P), '-17F9=A3 -1873X', (P), '-0100X'." />
111-
<part name="cass" interface="kim1_cass">
112-
<dataarea name="cass" size="9515290">
113-
<!-- IDs A1,A2,A3 are the main program, ID 06 is the K-V SCORE program -->
114-
<rom name="kimventure.wav" size="9515290" crc="bb3fde67" sha1="da525cb544e785d6751d759d905f0f4c7af483d7"/>
115-
</dataarea>
116-
</part>
117-
</software>
118-
119-
</softwarelist>
1+
<?xml version="1.0"?>
2+
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
3+
<!--
4+
license:CC0-1.0
5+
-->
6+
7+
<!--
8+
9+
Most KIM-1 software is complex to use. Refer to the manuals for information.
10+
11+
MAME's KIM-1 driver is not good at loading cassette recordings. So instead,
12+
the ones provided here are re-encodings made with a BIN to WAV conversion tool,
13+
such as KIMTAPE 0.5 (at default speed), eg:
14+
15+
kimtape -m -a0 -da1 a1.bin a1.wav
16+
17+
-->
18+
19+
<softwarelist name="kim1_cass" description="KIM-1 cassettes">
20+
21+
<software name="baseball">
22+
<description>Baseball</description>
23+
<year>1979</year>
24+
<publisher>Robert Leedom</publisher>
25+
<info name="usage" value="Loads in 3 parts. ID 01, ID 02, ID 03, GO 0200" />
26+
<part name="cass" interface="kim1_cass">
27+
<dataarea name="cass" size="26518684">
28+
<rom name="baseball.wav" size="26518684" crc="01e1f702" sha1="7ed49cc17781ca2abfb6496071a88fb8c1f17137"/>
29+
</dataarea>
30+
</part>
31+
</software>
32+
33+
<software name="focal">
34+
<description>FOCAL-65 (V3D)</description>
35+
<year>1977</year>
36+
<publisher>Aresco</publisher>
37+
<info name="usage" value="terminal, Loads in 2 parts. ID 01, ID 02, GO 2000" />
38+
<part name="cass" interface="kim1_cass">
39+
<dataarea name="cass" size="16230584">
40+
<rom name="focal.wav" size="16230584" crc="e8eb2679" sha1="7ef83fa37077987551e4e48f16ba1494b5d827e7"/>
41+
</dataarea>
42+
</part>
43+
</software>
44+
45+
<software name="hexpawn">
46+
<description>Hexpawn</description>
47+
<year>1978</year>
48+
<publisher>Robert Leedom</publisher>
49+
<info name="usage" value="ID 01, GO 0100" />
50+
<part name="cass" interface="kim1_cass">
51+
<dataarea name="cass" size="2361357">
52+
<rom name="hexpawn.wav" size="2361357" crc="2a0810be" sha1="c0656f9e99b071396263d98bbc87d2de9cd68e72"/>
53+
</dataarea>
54+
</part>
55+
</software>
56+
57+
<software name="kimbasic">
58+
<description>MOS TECH 6502 BASIC 9-digit v1.1</description>
59+
<year>1977</year>
60+
<publisher>Microsoft Co.</publisher>
61+
<info name="usage" value="terminal, ID 01, GO 4065" />
62+
<part name="cass" interface="kim1_cass">
63+
<dataarea name="cass" size="23219181">
64+
<rom name="kim basic 911.wav" size="23219181" crc="72470b66" sha1="0d4c00bde405ea491f27b1fffee7f07d45ee09a0"/>
65+
</dataarea>
66+
</part>
67+
</software>
68+
69+
<software name="kb6" cloneof="kimbasic">
70+
<description>MOS TECH 6502 BASIC 6-digit</description>
71+
<year>1977</year>
72+
<publisher>Microsoft Co.</publisher>
73+
<info name="usage" value="terminal, ID 01, GO 3D73" />
74+
<part name="cass" interface="kim1_cass">
75+
<dataarea name="cass" size="21267405">
76+
<rom name="kim basic 6.wav" size="21267405" crc="0ba87eaa" sha1="46f2f23a9a41a9fe95080c87acd7bc8929161717"/>
77+
</dataarea>
78+
</part>
79+
</software>
80+
81+
<software name="microade">
82+
<description>Micro-ADE</description>
83+
<year>1977</year>
84+
<publisher>MicroWare Ltd</publisher>
85+
<info name="usage" value="terminal, ID 01, GO 2000" />
86+
<part name="cass" interface="kim1_cass">
87+
<dataarea name="cass" size="10984941">
88+
<rom name="microade.wav" size="10984941" crc="defbe148" sha1="40ce84727d65f195aa1ef451714781c78b1d2785"/>
89+
</dataarea>
90+
</part>
91+
</software>
92+
93+
<software name="mchess">
94+
<description>Microchess</description>
95+
<year>1976</year>
96+
<publisher>Micro-Ware Ltd.</publisher>
97+
<info name="usage" value="Enter 'R -00F1=00 -17F9=C0 -1873X'. Play tape, pause when display shows 0000 (P). 'R -17F9=C1 -1873X', (P), 'R X'." />
98+
<part name="cass" interface="kim1_cass">
99+
<dataarea name="cass" size="9953338">
100+
<!-- IDs C0,C1 are the main program, IDs 01-05 are optional chess openings -->
101+
<rom name="microchess.wav" size="9953338" crc="c7584ae0" sha1="9f1ac8f439e083dd592664a0f1e6ba1530836120"/>
102+
</dataarea>
103+
</part>
104+
</software>
105+
106+
<software name="kimvent">
107+
<description>KIM-Venture</description>
108+
<year>1979</year>
109+
<publisher>Robert C. Leedom.</publisher>
110+
<info name="usage" value="Enter 'R -00F1=00 -17F9=A1 -1873X'. Play tape, pause when display shows 0000 (P). '-17F9=A2 -1873X', (P), '-17F9=A3 -1873X', (P), '-0100X'." />
111+
<part name="cass" interface="kim1_cass">
112+
<dataarea name="cass" size="9515290">
113+
<!-- IDs A1,A2,A3 are the main program, ID 06 is the K-V SCORE program -->
114+
<rom name="kimventure.wav" size="9515290" crc="bb3fde67" sha1="da525cb544e785d6751d759d905f0f4c7af483d7"/>
115+
</dataarea>
116+
</part>
117+
</software>
118+
119+
</softwarelist>

‎hash/smartcycle_cart.xml

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ NOTE: There is also a newer version of the Smart Cycle with 3D games, this howev
3333

3434
<softwarelist name="smartcycle_cart" description="Fisher Price Smart Cycle cartridges">
3535

36-
<software name="sc0308" supported="no">
36+
<software name="dinos" supported="no">
3737
<description>Discover the Dinosaurs (0308)</description>
3838
<year>2006</year>
3939
<publisher>Fisher Price</publisher>
@@ -44,7 +44,19 @@ NOTE: There is also a newer version of the Smart Cycle with 3D games, this howev
4444
</part>
4545
</software>
4646

47-
<software name="sc0608" supported="no">
47+
<software name="dinosfr" cloneof="dinos" supported="no">
48+
<description>À la Découverte des Dinosaures (France)</description>
49+
<year>2008</year>
50+
<publisher>Fisher Price</publisher>
51+
<info name="serial" value="N5993" />
52+
<part name="cart" interface="smartcycle_cart">
53+
<dataarea name="rom" size="0x800000">
54+
<rom name="N5993 - A la Decouverte des Dinosaures (FR).u1" size="0x800000" crc="e6c66830" sha1="d07b3789ef14a431d86c9fa581a3b76993929ac4"/>
55+
</dataarea>
56+
</part>
57+
</software>
58+
59+
<software name="learnadv" supported="no">
4860
<description>Learning Adventure (0608)</description>
4961
<year>2006</year>
5062
<publisher>Fisher Price</publisher>
@@ -55,7 +67,7 @@ NOTE: There is also a newer version of the Smart Cycle with 3D games, this howev
5567
</part>
5668
</software>
5769

58-
<software name="sc1410" supported="no">
70+
<software name="pengmad" supported="no"> <!-- VBL interrupt is turned off and never back on? and other IRQ issues? -->
5971
<description>The Penguins of Madagascar (1410)</description>
6072
<year>2009</year>
6173
<publisher>Fisher Price</publisher>
@@ -66,7 +78,7 @@ NOTE: There is also a newer version of the Smart Cycle with 3D games, this howev
6678
</part>
6779
</software>
6880

69-
<software name="sc2108" supported="no"> <!-- VBL interrupt is turned off and never back on? -->
81+
<software name="scooby" supported="no"> <!-- VBL interrupt is turned off and never back on? -->
7082
<description>Scooby-Doo! (2108)</description>
7183
<year>2007</year>
7284
<publisher>Fisher Price</publisher>
@@ -77,31 +89,31 @@ NOTE: There is also a newer version of the Smart Cycle with 3D games, this howev
7789
</part>
7890
</software>
7991

80-
<software name="n5992" supported="no">
81-
<description>Dora l'Exploratrice - Dora L'Aventure de l'Amitié (France)</description>
82-
<year>2008</year>
92+
<software name="dora" supported="no"> <!-- might not be UK specific, packaging had 'color' spelling -->
93+
<description>Dora the Explorer - Friendship Adventure (UK)</description>
94+
<year>2006</year>
8395
<publisher>Fisher Price</publisher>
84-
<info name="serial" value="N5992" />
96+
<info name="serial" value="K6689" />
8597
<part name="cart" interface="smartcycle_cart">
8698
<dataarea name="rom" size="0x800000">
87-
<rom name="N5992 - Dora l'Exploratrice - Dora L'Aventure de l'Amitie (FR).u1" size="0x800000" crc="fa590280" sha1="5767536e1781fee06c52671bc7ca7b639a99e50b"/>
99+
<rom name="K6689 - Dora the Explorer - Friendship Adventure (UK).bin" size="0x800000" crc="569acece" sha1="c774da691bb1d5e3ae900449be24e1e598764f26"/>
88100
</dataarea>
89101
</part>
90102
</software>
91103

92-
<software name="n5993" cloneof="sc0308" supported="no">
93-
<description>À la Découverte des Dinosaures (France)</description>
104+
<software name="dorafr" cloneof="dora" supported="no">
105+
<description>Dora l'Exploratrice - Dora L'Aventure de l'Amitié (France)</description>
94106
<year>2008</year>
95107
<publisher>Fisher Price</publisher>
96-
<info name="serial" value="N5993" />
108+
<info name="serial" value="N5992" />
97109
<part name="cart" interface="smartcycle_cart">
98110
<dataarea name="rom" size="0x800000">
99-
<rom name="N5993 - A la Decouverte des Dinosaures (FR).u1" size="0x800000" crc="e6c66830" sha1="d07b3789ef14a431d86c9fa581a3b76993929ac4"/>
111+
<rom name="N5992 - Dora l'Exploratrice - Dora L'Aventure de l'Amitie (FR).u1" size="0x800000" crc="fa590280" sha1="5767536e1781fee06c52671bc7ca7b639a99e50b"/>
100112
</dataarea>
101113
</part>
102114
</software>
103115

104-
<software name="n5994" supported="no"> <!-- VBL interrupt is turned off and never back on? -->
116+
<software name="hotwfr" supported="no"> <!-- VBL interrupt is turned off and never back on? -->
105117
<description>Hot Wheels - Pédale à Toute Vitesse (France)</description>
106118
<year>2008</year>
107119
<publisher>Fisher Price</publisher>
@@ -113,4 +125,28 @@ NOTE: There is also a newer version of the Smart Cycle with 3D games, this howev
113125
</part>
114126
</software>
115127

128+
<software name="spongeb" supported="no"> <!-- might not be UK specific, packaging had 'color' spelling --> <!-- VBL interrupt is turned off and never back on? -->
129+
<description>Spongebob Squarepants - Ocean Adventure (UK)</description>
130+
<year>2007</year>
131+
<publisher>Fisher Price</publisher>
132+
<info name="serial" value="K6690" />
133+
<part name="cart" interface="smartcycle_cart">
134+
<dataarea name="rom" size="0x800000">
135+
<rom name="K6690 - Spongebob Squarepants - Ocean Adventure (UK).bin" size="0x800000" crc="dde4d2d6" sha1="88751c6f57c323f18d3eee89430f32977339398e"/>
136+
</dataarea>
137+
</part>
138+
</software>
139+
140+
<software name="barbie" supported="no"> <!-- might not be UK specific, packaging had 'color' spelling --> <!-- VBL interrupt is turned off and never back on? -->
141+
<description>Barbie - Fairytopia (UK)</description>
142+
<year>2007</year>
143+
<publisher>Fisher Price</publisher>
144+
<info name="serial" value="L0544" />
145+
<part name="cart" interface="smartcycle_cart">
146+
<dataarea name="rom" size="0x800000">
147+
<rom name="L0544 - Barbie - Fairytopia (UK).bin" size="0x800000" crc="453268e1" sha1="4d9b3f27d7b1923178c047945b5598556275a19c"/>
148+
</dataarea>
149+
</part>
150+
</software>
151+
116152
</softwarelist>

‎src/devices/bus/heathzenith/h89/h89bus.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ h89bus::addr_ranges device_heath_io_decoder_interface::scan_io_decoder_rom(u8 se
189189
}
190190
else if (found)
191191
{
192-
ranges.push_back(std::make_pair(first, last));
192+
ranges.emplace_back(first, last);
193193
found = false;
194194
}
195195
}
196196

197197
// make sure to include any ranges that extend to the end.
198198
if (found)
199199
{
200-
ranges.push_back(std::make_pair(first, last));
200+
ranges.emplace_back(first, last);
201201
}
202202

203203
return ranges;

‎src/devices/cpu/i386/i386op16.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,7 @@ void i386_device::i386_groupF7_16() // Opcode 0xf7
29652965
if( src ) {
29662966
remainder = quotient % (int32_t)(int16_t)src;
29672967
result = quotient / (int32_t)(int16_t)src;
2968-
if( result > 0xffff ) {
2968+
if( result > 0x7fff || result < -0x8000 ) {
29692969
/* TODO: Divide error */
29702970
} else {
29712971
REG16(DX) = (uint16_t)remainder;

0 commit comments

Comments
 (0)