romload.c: added support for split set to softlist (for cart, cd and hd) [Fabio Priuli]

out of whatsnew: to avoid too much duplicate code, I implemented this as follow: 
for parent, we pass a location tag "list/parentname" to search for the roms (no 
changes in this case); for  clones, we pass a composed location tag 
"list/clonename%list/parentname" (notice the '%' separator) and then it is 
open_rom_file to split it, if it finds a %, before searching for the rom.

out of whatsnew, 2: I also added the same support for cassettes and floppies (in 
devimage.c), but it is still commented out because I had only a few files for testing.
as soon as I'm sure nothing gets broken, I'll enable it.

src/emu/devimage.c

@@ -300,6 +300,7 @@ void legacy_image_device_base::determine_open_plan(int is_create, UINT32 *open_p
 -------------------------------------------------*/
 bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_entry *start)
 {
+	astring locationtag, breakstr("%");
 	const rom_entry *region;
 	astring regiontag;
 	bool retVal = FALSE;
@@ -320,17 +321,64 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent
 				if (has_crc)
 					crc = (crcbytes[0] << 24) | (crcbytes[1] << 16) | (crcbytes[2] << 8) | crcbytes[3];
 
-				astring fname(swlist, PATH_SEPARATOR, swname, PATH_SEPARATOR, ROM_GETNAME(romp));
+#if 1
-				if (has_crc)
+				astring tmp(swlist, PATH_SEPARATOR, swname);
-					filerr = mame_fopen_crc(SEARCHPATH_ROM, fname, crc, OPEN_FLAG_READ, &m_mame_file);
+				locationtag.cpy(tmp);
-				else
+				filerr = common_process_file(locationtag.cstr(), has_crc, crc, romp, &m_mame_file);
-					filerr = mame_fopen(SEARCHPATH_ROM, fname, OPEN_FLAG_READ, &m_mame_file);
-
 				if (filerr == FILERR_NONE)
 				{
 					m_file = mame_core_file(m_mame_file);
 					retVal = TRUE;
 				}
+
+#else
+				// attempt reading up the chain through the parents and create a locationtag astring in the format
+				// " swlist PATHSEPARATOR clonename % swlist PATHSEPARATOR parentname "
+				// below, we have the code to split the two paths and to separately try to load roms from there
+
+				software_list *software_list_ptr = software_list_open(mame_options(), swlist, FALSE, NULL);
+				if (software_list_ptr)
+				{
+					for (software_info *swinfo = software_list_find(software_list_ptr, swname, NULL); swinfo != NULL; )
+					{
+						if (swinfo != NULL)
+						{
+							astring tmp(swlist, PATH_SEPARATOR, swinfo->shortname);
+							locationtag.cat(tmp);
+							locationtag.cat(breakstr);
+							// printf("%s\n", locationtag.cstr());
+						}
+						const char *parentname = software_get_clone(swlist, swinfo->shortname);
+						if (parentname != NULL)
+							swinfo = software_list_find(software_list_ptr, parentname, NULL);
+						else
+							swinfo = NULL;
+					}
+					// strip the final '%'
+					locationtag.del(locationtag.len() - 1, 1);
+					software_list_close(software_list_ptr);
+				}
+
+				// check if locationtag actually contains two locations separated by '%'
+				// (i.e. check if we are dealing with a clone in softwarelist)
+				astring tag1(locationtag), tag2;
+				int separator = tag1.chr(0, '%');
+				if (separator != -1)
+				{
+					// we are loading a clone through softlists, split the second location
+					tag2.cpysubstr(tag1, separator + 1, tag1.len() - separator + 1);
+					tag1.del(separator, tag1.len() - separator);
+				}
+
+				if (tag2.chr(0, '%') != -1)
+					fatalerror("More than two regiontags concatenated!\n");
+
+				// try to load from the available location(s)
+				filerr = common_process_file(tag1.cstr(), has_crc, crc, romp, &m_mame_file);
+				if ((romdata->file == NULL) && (tag2.cstr() != NULL))
+					filerr = common_process_file(tag2.cstr(), has_crc, crc, romp, &m_mame_file);
+#endif
+
 				break; // load first item for start
 			}
 			romp++;	/* something else; skip */

src/emu/romload.c

@@ -76,6 +76,40 @@ struct _romload_private
 
 static void rom_exit(running_machine &machine);
 
+/***************************************************************************
+    HELPERS (also used by devimage.c)
+ ***************************************************************************/
+
+file_error common_process_file_options(core_options *options, const char *location, const char *ext, const rom_entry *romp, mame_file **image_file)
+{
+	if (location != NULL)
+	{
+		astring fname(location, PATH_SEPARATOR, ROM_GETNAME(romp));
+		fname.cat(ext);
+		return mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
+	}
+	else
+	{
+		astring fname(ROM_GETNAME(romp));
+		fname.cat(ext);
+		return mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
+	}
+
+	return FILERR_NOT_FOUND;
+}
+
+file_error common_process_file(const char *location, bool has_crc, UINT32 crc, const rom_entry *romp, mame_file **image_file)
+{
+	file_error filerr;
+	astring fname(location, PATH_SEPARATOR, ROM_GETNAME(romp));
+
+	if (has_crc)
+		filerr = mame_fopen_crc(SEARCHPATH_ROM, fname, crc, OPEN_FLAG_READ, image_file);
+	else
+		filerr = mame_fopen(SEARCHPATH_ROM, fname, OPEN_FLAG_READ, image_file);
+
+	return filerr;
+}
 
 
 /***************************************************************************
@@ -623,22 +657,29 @@ static int open_rom_file(rom_load_data *romdata, const char *regiontag, const ro
 	romdata->file = NULL;
 	for (drv = romdata->machine->gamedrv; romdata->file == NULL && drv != NULL; drv = driver_get_clone(drv))
 		if (drv->name != NULL && *drv->name != 0)
-		{
+			filerr = common_process_file(drv->name, has_crc, crc, romp, &romdata->file);
-			astring fname(drv->name, PATH_SEPARATOR, ROM_GETNAME(romp));
-			if (has_crc)
-				filerr = mame_fopen_crc(SEARCHPATH_ROM, fname, crc, OPEN_FLAG_READ, &romdata->file);
-			else
-				filerr = mame_fopen(SEARCHPATH_ROM, fname, OPEN_FLAG_READ, &romdata->file);
-		}
 
 	/* if the region is load by name, load the ROM from there */
 	if (romdata->file == NULL && regiontag != NULL)
 	{
-		astring fname(regiontag, PATH_SEPARATOR, ROM_GETNAME(romp));
+		// check if locationtag actually contains two locations separated by '%'
-		if (has_crc)
+		// (i.e. check if we are dealing with a clone in softwarelist)
-			filerr = mame_fopen_crc(SEARCHPATH_ROM, fname, crc, OPEN_FLAG_READ, &romdata->file);
+		astring tag1(regiontag), tag2;
-		else
+		int separator = tag1.chr(0, '%');
-			filerr = mame_fopen(SEARCHPATH_ROM, fname, OPEN_FLAG_READ, &romdata->file);
+		if (separator != -1)
+		{
+			// we are loading a clone through softlists, split the second location
+			tag2.cpysubstr(tag1, separator + 1, tag1.len() - separator + 1);
+			tag1.del(separator, tag1.len() - separator);
+		}
+
+		if (tag2.chr(0, '%') != -1)
+			fatalerror("More than two regiontags concatenated!\n");
+
+		// try to load from the available location(s)
+		filerr = common_process_file(tag1.cstr(), has_crc, crc, romp, &romdata->file);
+		if ((romdata->file == NULL) && (tag2.cstr() != NULL))
+			filerr = common_process_file(tag2.cstr(), has_crc, crc, romp, &romdata->file);
 	}
 
 	/* update counters */
@@ -975,22 +1016,13 @@ chd_error open_disk_image_options(core_options *options, const game_driver *game
 	/* attempt to open the properly named file, scanning up through parent directories */
 	filerr = FILERR_NOT_FOUND;
 	for (searchdrv = gamedrv; searchdrv != NULL && filerr != FILERR_NONE; searchdrv = driver_get_clone(searchdrv))
-	{
+		filerr = common_process_file_options(options, searchdrv->name, ".chd", romp, image_file);
-		astring fname(searchdrv->name, PATH_SEPARATOR, ROM_GETNAME(romp), ".chd");
-		filerr = mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
-	}
 
 	if (filerr != FILERR_NONE)
-	{
+		filerr = common_process_file_options(options, NULL, ".chd", romp, image_file);
-		astring fname(ROM_GETNAME(romp), ".chd");
-		filerr = mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
-	}
 
 	if (filerr != FILERR_NONE && locationtag != NULL)
-	{
+		filerr = common_process_file_options(options, locationtag, ".chd", romp, image_file);
-		astring fname(locationtag, PATH_SEPARATOR, ROM_GETNAME(romp), ".chd");
-		filerr = mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
-	}
 
 	/* did the file open succeed? */
 	if (filerr == FILERR_NONE)
@@ -1024,16 +1056,10 @@ chd_error open_disk_image_options(core_options *options, const game_driver *game
 							/* attempt to open the properly named file, scanning up through parent directories */
 							filerr = FILERR_NOT_FOUND;
 							for (searchdrv = drv; searchdrv != NULL && filerr != FILERR_NONE; searchdrv = driver_get_clone(searchdrv))
-							{
+								filerr = common_process_file_options(options, searchdrv->name, ".chd", rom, image_file);
-								astring fname(searchdrv->name, PATH_SEPARATOR, ROM_GETNAME(rom), ".chd");
-								filerr = mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
-							}
 
 							if (filerr != FILERR_NONE)
-							{
+								filerr = common_process_file_options(options, NULL, ".chd", rom, image_file);
-								astring fname(ROM_GETNAME(rom), ".chd");
-								filerr = mame_fopen_options(options, SEARCHPATH_IMAGE, fname, OPEN_FLAG_READ, image_file);
-							}
 
 							/* did the file open succeed? */
 							if (filerr == FILERR_NONE)
@@ -1223,6 +1249,24 @@ static UINT32 normalize_flags_for_device(running_machine *machine, UINT32 startf
 }
 
 
+/*-------------------------------------------------
+    software_get_clone - retrive name string of the
+    parent software, if any
+ -------------------------------------------------*/
+
+const char *software_get_clone(char *swlist, const char *swname)
+{
+	software_list *software_list_ptr = software_list_open(mame_options(), swlist, FALSE, NULL);
+
+	if (software_list_ptr)
+	{
+		software_info *tmp = software_list_find(software_list_ptr, swname, NULL);
+		return tmp->parentname;
+	}
+
+	return NULL;
+}
+
 /*-------------------------------------------------
     load_software_part_region - load a software part
 
@@ -1234,11 +1278,38 @@ static UINT32 normalize_flags_for_device(running_machine *machine, UINT32 startf
 
 void load_software_part_region(device_t *device, char *swlist, char *swname, rom_entry *start_region)
 {
-	astring locationtag(swlist, PATH_SEPARATOR, swname);
+	astring locationtag, breakstr("%");
 	rom_load_data *romdata = device->machine->romload_data;
 	const rom_entry *region;
 	astring regiontag;
 
+	// attempt reading up the chain through the parents and create a locationtag astring in the format
+	// " swlist PATHSEPARATOR clonename % swlist PATHSEPARATOR parentname "
+	// open_rom_file contains the code to split the two paths and to separately try to load roms from there
+
+	software_list *software_list_ptr = software_list_open(mame_options(), swlist, FALSE, NULL);
+	if (software_list_ptr)
+	{
+		for (software_info *swinfo = software_list_find(software_list_ptr, swname, NULL); swinfo != NULL; )
+		{
+			if (swinfo != NULL)
+			{
+				astring tmp(swlist, PATH_SEPARATOR, swinfo->shortname);
+				locationtag.cat(tmp);
+				locationtag.cat(breakstr);
+				// printf("%s\n", locationtag.cstr());
+			}
+			const char *parentname = software_get_clone(swlist, swinfo->shortname);
+			if (parentname != NULL)
+				swinfo = software_list_find(software_list_ptr, parentname, NULL);
+			else
+				swinfo = NULL;
+		}
+		// strip the final '%'
+		locationtag.del(locationtag.len() - 1, 1);
+		software_list_close(software_list_ptr);
+	}
+
 	/* Make sure we are passed a device */
 	assert(device != NULL);
 

src/emu/romload.h

@@ -278,6 +278,11 @@ void rom_init(running_machine *machine);
 int rom_load_warnings(running_machine *machine);
 
 
+/* ----- Helpers ----- */
+
+file_error common_process_file_options(core_options *options, const char *location, const char *ext, const rom_entry *romp, mame_file **image_file);
+file_error common_process_file(const char *location, bool has_crc, UINT32 crc, const rom_entry *romp, mame_file **image_file);
+const char *software_get_clone(char *swlist, const char *swname);
 
 /* ----- ROM iteration ----- */