- --
Viewing Issue Advanced Details
[ Jump to Notes ]
ID | Category [?] | Severity [?] | Reproducibility | Date Submitted | Last Update |
---|---|---|---|---|---|
04271 | Misc. | Major | Always | Mar 6, 2011, 11:01 | Mar 14, 2011, 21:17 |
Tester | qmc2 | View Status | Public | Platform | SDLMAME |
Assigned To | aaron | Resolution | Fixed | OS | Linux |
Status [?] | Resolved | Driver | |||
Version | 0.141u3 | Fixed in Version | 0.141u4 | Build | 64-bit |
Fixed in Git Commit | Github Pull Request # | ||||
Summary | 04271: Wrong merge data in -listxml output for some sets | ||||
Description |
A number of sets - for example some of the Street Fighter II games - have incorrect merge information in the XML data. For instance, sf2hfu references the file "s9263b.1a" from its 'parent' (romof attribute) for nearly every ROM (which is wrong), especially because this file is marked as "nodump" in the parent set. See the output in additional information. This seems to have been introduced in 0.141u3 (0.141u2 appears correct). |
||||
Steps To Reproduce | |||||
Additional Information |
rene@thunder:~/src/mame0141u3> ./mame64 -lx sf2hfu|grep "<rom" <rom name="s2tu_23.8f" merge="s9263b.1a" size="524288" crc="89a1fc38" sha1="aafb40fc311e318250973be8c6aa0d3f7902cb3c" region="maincpu" offset="0"/> <rom name="s2tu_22.7f" merge="s9263b.1a" size="524288" crc="aea6e035" sha1="ce5fe961b2c1c95d231d1235bfc03b47de489f2a" region="maincpu" offset="80000"/> <rom name="s2tu_21.6f" merge="s9263b.1a" size="524288" crc="fd200288" sha1="3817b67ab77c7b3d4a573a63f18671bea6905e26" region="maincpu" offset="100000"/> <rom name="s92-1m.3a" merge="s9263b.1a" size="524288" crc="03b0d852" sha1="f370f25c96ad2b94f8c53d6b7139100285a25bef" region="gfx" offset="0"/> <rom name="s92-3m.5a" merge="s9263b.1a" size="524288" crc="840289ec" sha1="2fb42a242f60ba7e74009b5a90eb26e035ba1e82" region="gfx" offset="2"/> <rom name="s92-2m.4a" merge="s9263b.1a" size="524288" crc="cdb5f027" sha1="4c7d944fef200fdfcaf57758b901b5511188ed2e" region="gfx" offset="4"/> <rom name="s92-4m.6a" merge="s9263b.1a" size="524288" crc="e2799472" sha1="27d3796429338d82a8de246a0ea06dd487a87768" region="gfx" offset="6"/> <rom name="s92-5m.7a" merge="s9263b.1a" size="524288" crc="ba8a2761" sha1="4b696d66c51611e43522bed752654314e76d33b6" region="gfx" offset="200000"/> <rom name="s92-7m.9a" merge="s9263b.1a" size="524288" crc="e584bfb5" sha1="ebdf1f5e2638eed3a65dda82b1ed9151a355f4c9" region="gfx" offset="200002"/> <rom name="s92-6m.8a" merge="s9263b.1a" size="524288" crc="21e3f87d" sha1="4a4961bb68c3a1ce15f9d393d9c03ecb2466cc29" region="gfx" offset="200004"/> <rom name="s92-8m.10a" merge="s9263b.1a" size="524288" crc="befc47df" sha1="520390420da3a0271ba90b0a933e65143265e5cf" region="gfx" offset="200006"/> <rom name="s92-10m.3c" merge="s9263b.1a" size="524288" crc="960687d5" sha1="2868c31121b1c7564e9767b9a19cdbf655c7ed1d" region="gfx" offset="400000"/> <rom name="s92-12m.5c" merge="s9263b.1a" size="524288" crc="978ecd18" sha1="648a59706b93c84b4206a968ecbdc3e834c476f6" region="gfx" offset="400002"/> <rom name="s92-11m.4c" merge="s9263b.1a" size="524288" crc="d6ec9a0a" sha1="ed6143f8737013b6ef1684e37c05e037e7a80dae" region="gfx" offset="400004"/> <rom name="s92-13m.6c" merge="s9263b.1a" size="524288" crc="ed2c67f6" sha1="0083c0ffaf6fe7659ff0cf822be4346cd6e61329" region="gfx" offset="400006"/> <rom name="s92_09.11a" merge="s9263b.1a" size="65536" crc="08f6b60e" sha1="8258fcaca4ac419312531eec67079b97f471179c" region="audiocpu" offset="0"/> <rom name="s92_18.11c" merge="s9263b.1a" size="131072" crc="7f162009" sha1="346bf42992b4c36c593e21901e22c87ae4a7d86d" region="oki" offset="0"/> <rom name="s92_19.12c" merge="s9263b.1a" size="131072" crc="beade53f" sha1="277c397dc12752719ec6b47d2224750bd1c07f79" region="oki" offset="20000"/> <rom name="buf1" merge="s9263b.1a" size="279" crc="eb122de7" sha1="b26b5bfe258e3e184f069719f9fd008d6b8f6b9b" region="aboardplds" offset="0"/> <rom name="ioa1" merge="s9263b.1a" size="279" crc="59c7ee3b" sha1="fbb887c5b4f5cb8df77cec710eaac2985bc482a6" region="aboardplds" offset="0"/> <rom name="prg1" merge="s9263b.1a" size="279" crc="f1129744" sha1="a5300f301c1a08a7da768f0773fa0fe3f683b237" region="aboardplds" offset="0"/> <rom name="rom1" merge="s9263b.1a" size="279" crc="41dc73b9" sha1="7d4c9f1693c821fbf84e32dd6ef62ddf14967845" region="aboardplds" offset="0"/> <rom name="sou1" merge="s9263b.1a" size="279" crc="84f4b2fe" sha1="dcc9e86cc36316fe42eace02d6df75d08bc8bb6d" region="aboardplds" offset="0"/> <rom name="s9263b.1a" size="279" region="bboardplds" status="nodump" offset="0"/> <rom name="iob1.12d" merge="s9263b.1a" size="279" crc="3abc0700" sha1="973043aa46ec6d5d1db20dc9d5937005a0f9f6ae" region="bboardplds" offset="0"/> <rom name="bprg1.11d" merge="s9263b.1a" size="279" crc="31793da7" sha1="400fa7ac517421c978c1ee7773c30b9ed0c5d3f3" region="bboardplds" offset="0"/> <rom name="ioc1.ic7" merge="ioc1.ic7" size="279" crc="0d182081" sha1="475b3d417785da4bc512cce2b274bb00d4cc6792" region="cboardplds" offset="0"/> <rom name="c632.ic1" merge="c632.ic1" size="279" crc="0fbd9270" sha1="d7e737b20c44d41e29ca94be56114b31934dde81" region="cboardplds" offset="0"/> rene@thunder:~/src/mame0141u3> ./mame64 -lx sf2hf|grep "s9263b.1a" <rom name="s9263b.1a" size="279" region="bboardplds" status="nodump" offset="0"/> |
||||
Github Commit | |||||
Flags | |||||
Regression Version | |||||
Affected Sets / Systems | |||||
Attached Files
|
affected-sets.txt (3,776 bytes) Mar 6, 2011, 17:40 Uploaded by qmc2 [Show Content] [Hide Content]1943b 1943j 1943u 47pie2o 4rosesa 64streetj 8ballact2 8bpm aceattaca airbustrb airbustrj airraid airwolfa altbeast2 altbeast4 altbeast5 altbeastj altbeastj1 altbeastj2 altbeastj3 archrivl2 arknoid2j arknoid2u astronp backfirea bankroba bcstrya begas1 bestleag bestleaw bigfghtr bigstrkb bionicc1 bionicc2 boblbobl bootcamp bottl10b breywood bronx bub68705 bublbobl1 bublboblr bublboblr1 buccanrsa captcommb captcommj captcommjr1 captcommr1 captcommu chasehqj chasehqu chikij chopliftbl chopliftu cmkenospa cobraseg combatscb combatscj combatsct contra1 contrab contraj contrajb countrunb countrunb2 crgolfa crgolfb crgolfbt crgolfc crusnusa21 crusnusa40 crzrallya crzrallyg cshootere csilverj ctchzdlx dassault dassault4 ddp2100 ddp2101 ddp3a ddp3b ddp3blk destroyr1 dietgoe dietgoj dietgou dinohunt dinoj dinopic dinopic2 dinou dlaira dlairb dlairc dlaird dlaire dlairf dland dleuro dlital dmnfrnta drgninja drtoppelj drtoppelu edfbl edfu elephfmb elvact2u elvactrj esha eshb euro2k2a euro2k2s extrmatnj extrmatnu eyesdownd f1dreamb fghthista fghthistj fghthistu fireshrkd fireshrkdh firetrapbl firetrapj freekickb freekickb2 funriverv galaxyrp galgame2 gekitsui getstarj ghoxj gigasb goldnaxe1 goldnaxe2 goldnaxe3 goldnaxeb1 goldnaxeb2 goldnaxej goldnaxeu gprider1 gratiaa gryzor gryzora gsword2 gtg2j gtg2t gtstarb1 gtstarb2 gunbirdj gunbirdk hidctch2a hiimpact1 hiimpact2 hiimpact3 hiimpact4 hiimpactp hrdtimesa iganinju imgfighto indytemp indytemp2 indytemp3 indytemp4 indytempc indytempd intlaser jackrabt2 jackrabts janoha jansoua kangarooa kangaroob keta ketb knightb kodb kodj kodja kodr1 kodu kov100 kov115 kov2p205 kovlsjb kovlsjba kovlsqh2 kovplusa lastmisnj lastmisno lazarian llander1 lohtb lohtb2 lohtj lordofk maddoga majtitl2j marble marble2 marble3 marble4 marble5 mazerblaa mbomberj mbombrdj megadpkrb mercsj mercsu mercsur1 metlhawkj minigolf2 miraxa monkelf mrheli nametune2 nightr20 nkdodge nkdodgeb nspiritj nstocker2 oigas onna34roa oscarj1 oscarj2 oscaru pang3j pang3n pbobble4j pbobble4u peterpak phantasm pool10b pool10c pool10d popnpopj popnpopu powerbals punipic punipic2 punipic3 punisherbz punisherj punisheru puzznici puzznicj quarterha quarterhb quartet2 quartet2a quarteta quidgrid2 quidgrid2d quidgridd racedriv1 racedriv2 racedriv3 racedriv4 racedrivb racedrivb1 racedrivb4 racedrivc racedrivc1 racedrivc2 racedrivc4 racedrivcb racedrivcb4 racedrivcg racedrivcg4 racedrivg racedrivg1 racedrivg4 racedrivpan raidena raidenk raident raidenu raidenua raiga rescraida rimrockn12 rimrockn16 rimrockn20 roadblst roadblst1 roadblst2 roadblst3 roadblstc roadblstc1 roadblstcg roadblstg roadblstg1 roadblstg2 roadrunn roadrunn1 roadrunn2 rocnropek s1945a s1945bl s1945j s1945jn s1945k saeuro saiyugou saiyugoub1 saiyugoub2 samesame samesame2 sblazerp sboblboa sboblbob sf2acc sf2accp2 sf2ceea sf2cej sf2ceua sf2ceub sf2ceuc sf2dkot2 sf2eb sf2ebbl sf2ee sf2hfj sf2hfu sf2j sf2ja sf2jc sf2koryu sf2m1 sf2m2 sf2m3 sf2m4 sf2m5 sf2m6 sf2m7 sf2mdt sf2qp1 sf2rb sf2rb2 sf2rb3 sf2red sf2thndr sf2ua sf2ub sf2ud sf2ue sf2uf sf2ui sf2uk sf2v004 sf2yyc sfish2j sgmastc sgmastj sharrier1 shtngmste shuuz2 sidepcktb sidepcktj skingame skingame2 skywolf skywolf2 skywolf3 slammastu spaceaa spaceaa2 spacedxj spacedxo spcinvdj spectrm4 spinlbrkj spinlbrku spyhunt2a sqixb1 sqixb2 sqixr1 sqixu srdarwinj sslama steeltal1 steeltalg steeltalp streetsm1 streetsmj streetsmw strikeit2 strikeit2d strikeitd superdqa superdqs tarzana tengaij thayersa theglada tigerhb1 tigerhb2 tigerhb3 tigerhj tkdenshoa tknight tokiob tokioo tokiou topsecrt tron2 tron3 tron4 tshingena tturfbl tturfu twrldc94a tx1a undoukai varthj varthr1 varthu vgoalsca vigilant1 vigilantj vigilantu vimana1 vimanan wb31 wb32 wb33 wb34 wb35 wb35a wb3bbl wbeachvl2 wildfangs wrallya wrallyb zerotrgta | ||||
hash.c.diff (380 bytes) Mar 7, 2011, 15:14 Uploaded by qmc2 [Show Content] [Hide Content]--- src/emu/hash.c.orig 2011-03-07 16:11:14.356195777 +0100 +++ src/emu/hash.c 2011-03-07 16:11:41.175195902 +0100 @@ -446,6 +446,8 @@ hash_base *rhs_hash = rhs.hash(hash->id()); if (hash != NULL && rhs_hash != NULL && *hash != *rhs_hash) return false; + else if ( hash == NULL || rhs_hash == NULL ) + return false; } // if all shared hashes match, return true | |||||
Relationships
Notes
6
No.07295
qmc2 Senior Tester
Mar 6, 2011, 13:32
|
I guess there are even more affected sets. I'm currently running a deep analysis over all sets and will let you know my results when it's done. This takes a while, though, as I'm rewriting all sets ('space-efficiently') in order to find the affected ones... |
---|---|
No.07297
qmc2 Senior Tester
Mar 6, 2011, 17:44
edited on: Mar 6, 2011, 17:44 |
I've attached the list of sets (436) that -- according to my analysis -- somehow suffer from this issue. See 'affected-sets.txt'. |
No.07299
qmc2 Senior Tester
Mar 7, 2011, 13:31
|
Judging from the changes made in u3, this might have to do with the new hash_collection class (src/emu/hash[.h|.c]) and/or related changes in src/emu/info.c (get_merge_name()). |
No.07300
qmc2 Senior Tester
Mar 7, 2011, 15:16
edited on: Mar 7, 2011, 15:17 |
I'm not sure if this is a clean fix, but the attached diff appears to correct this (only checked sf2hf/sf2hfu and raiden/raidenk). See 'hash.c.diff'. |
No.07301
hap Developer
Mar 7, 2011, 19:26
|
nah, that diff will probably break other parts that use hash.c "==". Anyway, thanks for investigating =) .. will let Aaron know of the regression. |
No.07315
Tafoid Administrator
Mar 14, 2011, 21:17
|
Also affected cdi.c, viper.c, naomi.c games. |