Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-29 15:38:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "romload.cpp: Fix build after e178fbd28127c526b212e5a4998058cebf530567"

Browse Source 
This (mostly) reverts commit 2923923df7.
This commit is contained in:
AJR 2022-10-25 12:35:58 -04:00
parent 2923923df7
commit 8fb6e14c3f
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/emu/romload.cpp
View File

@ -390,7 +390,7 @@ void rom_load_manager::determine_bios_rom(device_t &device, const char *specbios
// if we got neither an empty string nor 'default' then warn the user // if we got neither an empty string nor 'default' then warn the user
if (!found) if (!found)
{ {
util::stream_format(m_errorstream, "%s: invalid BIOS \"%s\", reverting to default\n", device.tag(), specbios); m_errorstring.append(util::string_format("%s: invalid BIOS \"%s\", reverting to default\n", device.tag(), specbios));
m_warnings++; m_warnings++;
} }
} }
@ -461,27 +461,27 @@ void rom_load_manager::handle_missing_file(const rom_entry *romp, const std::vec
const bool is_chd_error(is_chd && chderr != std::errc::no_such_file_or_directory); const bool is_chd_error(is_chd && chderr != std::errc::no_such_file_or_directory);
if (is_chd_error) if (is_chd_error)
util::stream_format(m_errorstream, "%s CHD ERROR: %s\n", name, chderr.message()); m_errorstring.append(string_format("%s CHD ERROR: %s\n", name, chderr.message()));
if (ROM_ISOPTIONAL(romp)) if (ROM_ISOPTIONAL(romp))
{ {
// optional files are okay // optional files are okay
if (!is_chd_error) if (!is_chd_error)
util::stream_format(m_errorstream, "OPTIONAL %s NOT FOUND%s\n", name, tried); m_errorstring.append(string_format("OPTIONAL %s NOT FOUND%s\n", name, tried));
m_warnings++; m_warnings++;
} }
else if (util::hash_collection(romp->hashdata()).flag(util::hash_collection::FLAG_NO_DUMP)) else if (util::hash_collection(romp->hashdata()).flag(util::hash_collection::FLAG_NO_DUMP))
{ {
// no good dumps are okay // no good dumps are okay
if (!is_chd_error) if (!is_chd_error)
util::stream_format(m_errorstream, "%s NOT FOUND (NO GOOD DUMP KNOWN)%s\n", name, tried); m_errorstring.append(string_format("%s NOT FOUND (NO GOOD DUMP KNOWN)%s\n", name, tried));
m_knownbad++; m_knownbad++;
} }
else else
{ {
// anything else is bad // anything else is bad
if (!is_chd_error) if (!is_chd_error)
util::stream_format(m_errorstream, "%s NOT FOUND%s\n", name, tried); m_errorstring.append(string_format("%s NOT FOUND%s\n", name, tried));
m_errors++; m_errors++;
} }
} }
@ -495,8 +495,8 @@ void rom_load_manager::handle_missing_file(const rom_entry *romp, const std::vec
void rom_load_manager::dump_wrong_and_correct_checksums(const util::hash_collection &hashes, const util::hash_collection &acthashes) void rom_load_manager::dump_wrong_and_correct_checksums(const util::hash_collection &hashes, const util::hash_collection &acthashes)
{ {
util::stream_format(m_errorstream, " EXPECTED: %s\n", hashes.macro_string()); m_errorstring.append(string_format(" EXPECTED: %s\n", hashes.macro_string()));
util::stream_format(m_errorstream, " FOUND: %s\n", acthashes.macro_string()); m_errorstring.append(string_format(" FOUND: %s\n", acthashes.macro_string()));
} }
@ -515,14 +515,14 @@ void rom_load_manager::verify_length_and_hash(emu_file *file, std::string_view n
u64 const actlength = file->size(); u64 const actlength = file->size();
if (explength != actlength) if (explength != actlength)
{ {
util::stream_format(m_errorstream, "%s WRONG LENGTH (expected: %08x found: %08x)\n", name, explength, actlength); m_errorstring.append(string_format("%s WRONG LENGTH (expected: %08x found: %08x)\n", name, explength, actlength));
m_warnings++; m_warnings++;
} }
if (hashes.flag(util::hash_collection::FLAG_NO_DUMP)) if (hashes.flag(util::hash_collection::FLAG_NO_DUMP))
{ {
// If there is no good dump known, write it // If there is no good dump known, write it
util::stream_format(m_errorstream, "%s NO GOOD DUMP KNOWN\n", name); m_errorstring.append(string_format("%s NO GOOD DUMP KNOWN\n", name));
m_knownbad++; m_knownbad++;
} }
else else
@ -535,14 +535,14 @@ void rom_load_manager::verify_length_and_hash(emu_file *file, std::string_view n
util::hash_collection const &all_acthashes = (acthashes.hash_types() == util::hash_collection::HASH_TYPES_ALL) util::hash_collection const &all_acthashes = (acthashes.hash_types() == util::hash_collection::HASH_TYPES_ALL)
? acthashes ? acthashes
: file->hashes(util::hash_collection::HASH_TYPES_ALL); : file->hashes(util::hash_collection::HASH_TYPES_ALL);
util::stream_format(m_errorstream, "%s WRONG CHECKSUMS:\n", name); m_errorstring.append(string_format("%s WRONG CHECKSUMS:\n", name));
dump_wrong_and_correct_checksums(hashes, all_acthashes); dump_wrong_and_correct_checksums(hashes, all_acthashes);
m_warnings++; m_warnings++;
} }
else if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP)) else if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP))
{ {
// If it matches, but it is actually a bad dump, write it // If it matches, but it is actually a bad dump, write it
util::stream_format(m_errorstream, "%s ROM NEEDS REDUMP\n", name); m_errorstring.append(string_format("%s ROM NEEDS REDUMP\n", name));
m_knownbad++; m_knownbad++;
} }
} }
@ -581,15 +581,15 @@ void rom_load_manager::display_rom_load_results(bool from_list)
if (m_errors != 0) if (m_errors != 0)
{ {
/* create the error message and exit fatally */ /* create the error message and exit fatally */
osd_printf_error("%s", m_errorstream.str()); osd_printf_error("%s", m_errorstring);
throw emu_fatalerror(EMU_ERR_MISSING_FILES, "Required files are missing, the machine cannot be run."); throw emu_fatalerror(EMU_ERR_MISSING_FILES, "Required files are missing, the machine cannot be run.");
} }
/* if we had warnings, output them, but continue */ /* if we had warnings, output them, but continue */
if ((m_warnings) || (m_knownbad)) if ((m_warnings) || (m_knownbad))
{ {
m_errorstream << "WARNING: the machine might not run correctly."; m_errorstring.append("WARNING: the machine might not run correctly.");
osd_printf_warning("%s\n", m_errorstream.str()); osd_printf_warning("%s\n", m_errorstring);
} }
} }
@ -1092,13 +1092,13 @@ void rom_load_manager::process_disk_entries(std::initializer_list<std::reference
const util::hash_collection hashes(romp->hashdata()); const util::hash_collection hashes(romp->hashdata());
if (hashes != acthashes) if (hashes != acthashes)
{ {
util::stream_format(m_errorstream, "%s WRONG CHECKSUMS:\n", filename); m_errorstring.append(string_format("%s WRONG CHECKSUMS:\n", filename));
dump_wrong_and_correct_checksums(hashes, acthashes); dump_wrong_and_correct_checksums(hashes, acthashes);
m_warnings++; m_warnings++;
} }
else if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP)) else if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP))
{ {
util::stream_format(m_errorstream, "%s CHD NEEDS REDUMP\n", filename); m_errorstring.append(string_format("%s CHD NEEDS REDUMP\n", filename));
m_knownbad++; m_knownbad++;
} }
@ -1109,7 +1109,7 @@ void rom_load_manager::process_disk_entries(std::initializer_list<std::reference
err = open_disk_diff(machine().options(), romp, chd->orig_chd(), chd->diff_chd()); err = open_disk_diff(machine().options(), romp, chd->orig_chd(), chd->diff_chd());
if (err) if (err)
{ {
util::stream_format(m_errorstream, "%s DIFF CHD ERROR: %s\n", filename, err.message()); m_errorstring.append(string_format("%s DIFF CHD ERROR: %s\n", filename, err.message()));
m_errors++; m_errors++;
chd = nullptr; chd = nullptr;
continue; continue;
@ -1217,8 +1217,8 @@ void rom_load_manager::normalize_flags_for_device(std::string_view rgntag, u8 &w
void rom_load_manager::load_software_part_region(device_t &device, software_list_device &swlist, std::string_view swname, const rom_entry *start_region) void rom_load_manager::load_software_part_region(device_t &device, software_list_device &swlist, std::string_view swname, const rom_entry *start_region)
{ {
m_errorstream.str(""); m_errorstring.clear();
m_softwarningstream.str(""); m_softwarningstring.clear();
m_romstotal = 0; m_romstotal = 0;
m_romstotalsize = 0; m_romstotalsize = 0;
@ -1233,15 +1233,13 @@ void rom_load_manager::load_software_part_region(device_t &device, software_list
// TODO: list supported clones like we do for machines? // TODO: list supported clones like we do for machines?
if (swinfo->supported() == software_support::PARTIALLY_SUPPORTED) if (swinfo->supported() == software_support::PARTIALLY_SUPPORTED)
{ {
util::stream_format(m_errorstream, "WARNING: support for software %s (in list %s) is only partial\n", swname, swlist.list_name()); m_errorstring.append(string_format("WARNING: support for software %s (in list %s) is only partial\n", swname, swlist.list_name()));
util::stream_format(m_softwarningstream, "Support for software %s (in list %s) is only partial\n", swname, swlist.list_name()); m_softwarningstring.append(string_format("Support for software %s (in list %s) is only partial\n", swname, swlist.list_name()));
m_software_warnings++;
} }
else if (swinfo->supported() == software_support::UNSUPPORTED) else if (swinfo->supported() == software_support::UNSUPPORTED)
{ {
util::stream_format(m_errorstream, "WARNING: support for software %s (in list %s) is only preliminary\n", swname, swlist.list_name()); m_errorstring.append(string_format("WARNING: support for software %s (in list %s) is only preliminary\n", swname, swlist.list_name()));
util::stream_format(m_softwarningstream, "Support for software %s (in list %s) is only preliminary\n", swname, swlist.list_name()); m_softwarningstring.append(string_format("Support for software %s (in list %s) is only preliminary\n", swname, swlist.list_name()));
m_software_warnings++;
} }
// walk the chain of parents and add them to the search path // walk the chain of parents and add them to the search path
@ -1430,7 +1428,6 @@ void rom_load_manager::process_region_list()
rom_load_manager::rom_load_manager(running_machine &machine) rom_load_manager::rom_load_manager(running_machine &machine)
: m_machine(machine) : m_machine(machine)
, m_warnings(0) , m_warnings(0)
, m_software_warnings(0)
, m_knownbad(0) , m_knownbad(0)
, m_errors(0) , m_errors(0)
, m_romsloaded(0) , m_romsloaded(0)
@ -1439,6 +1436,8 @@ rom_load_manager::rom_load_manager(running_machine &machine)
, m_romstotalsize(0) , m_romstotalsize(0)
, m_chd_list() , m_chd_list()
, m_region(nullptr) , m_region(nullptr)
, m_errorstring()
, m_softwarningstring()
{ {
// figure out which BIOS we are using // figure out which BIOS we are using
std::map<std::string_view, std::string> card_bios; std::map<std::string_view, std::string> card_bios;