From e82c6cb9774338a927357cabd7a318595eca3f6a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Sep 2021 03:39:27 +1000 Subject: libc++ 6 std::is_invocable_r doesn't work on MFP for incomplete class - disable broken tests when detected. --- src/emu/validity.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index ca3389cde41..18ba2c6fc6b 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -47,10 +47,12 @@ using test_delegate = delegate; // type //------------------------------------------------- +#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) test_delegate make_diamond_class_delegate(char (diamond_inheritance::*func)(void const *&), diamond_inheritance *obj) { return test_delegate(func, obj); } +#endif // !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) //------------------------------------------------- @@ -1391,6 +1393,7 @@ void validate_delegates_mfp() if (&o != addr) osd_printf_error("Error testing delegate this pointer adjustment for virtual member function through base class pointer %p -> %p (expected %p)\n", static_cast(static_cast(&o)), addr, static_cast(&o)); +#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) // test creating delegates for a forward-declared class cb1 = make_diamond_class_delegate(&diamond_inheritance::get_derived_a, &d); cb2 = make_diamond_class_delegate(&diamond_inheritance::get_derived_b, &d); @@ -1409,8 +1412,8 @@ void validate_delegates_mfp() if (static_cast(&d) != addr) osd_printf_error("Error testing delegate this pointer adjustment for incomplete class %p -> %p (expected %p)\n", static_cast(&d), addr, static_cast(static_cast(&d))); - // test MSVC extension allowing casting member pointer types across virtual inheritance relationships #if defined(_MSC_VER) && !defined(__clang__) + // test MSVC extension allowing casting member pointer types across virtual inheritance relationships cb1 = make_diamond_class_delegate(&diamond_inheritance::get_base, &d); addr = nullptr; @@ -1419,7 +1422,8 @@ void validate_delegates_mfp() osd_printf_error("Error testing delegate non-virtual member function dispatch for incomplete class\n"); if (static_cast(&d) != addr) osd_printf_error("Error testing delegate this pointer adjustment for incomplete class %p -> %p (expected %p)\n", static_cast(&d), addr, static_cast(static_cast(&d))); -#endif // defined(_MSC_VER) +#endif // defined(_MSC_VER) && !defined(__clang__) +#endif // !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) } -- cgit v1.2.3 From 55d43402ab25104a60b657b3938496c113a51c4f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Sep 2021 08:30:01 +1000 Subject: Clean up some metadata --- hash/cdi.xml | 18 ++++++++++-------- hash/nes.xml | 2 +- src/mame/drivers/konmedal020.cpp | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hash/cdi.xml b/hash/cdi.xml index d638a17efe9..1eba5394983 100644 --- a/hash/cdi.xml +++ b/hash/cdi.xml @@ -6033,6 +6033,7 @@ license:CC0 + - Getting Ahead - Making Time (Euro)[CD-i-PC] + Getting Ahead - Making Time (Euro) 1994 Temple Millar Multimedia ~ Xdra @@ -10722,7 +10723,7 @@ license:CC0 --> - From The Associated Press: The Best of Photo Journalism [DVC] + From The Associated Press: The Best of Photo Journalism 1993 XDRA Ltd. ~ Asia CD Ltd. @@ -10744,7 +10745,7 @@ license:CC0 value. The info for the original cue is below. --> - Bill Brandt: The Picture Post Years 1938-1951[DVC] + Bill Brandt: The Picture Post Years 1938-1951 1993 XDRA Ltd. @@ -10764,7 +10765,7 @@ license:CC0 value. The info for the original cue is below. --> - CD-i in Schools [DVC] + CD-i in Schools 1994 Scottish Interactive Technology Centre @@ -10785,7 +10786,7 @@ license:CC0 The info for the original cue is below. --> - Depression - The Search For The NaSSA (NL)[DVC] + Depression - The Search For The NaSSA (NL) 1993 N.V. Organon @@ -10807,6 +10808,7 @@ license:CC0 + - Getting Ahead - Making Time (Euro)(Reprint)[CD-i-PC] + Getting Ahead - Making Time (Euro, reprint) 1995 XDRA Ltd. ~ Temple Millar Multimedia @@ -10838,7 +10840,7 @@ license:CC0 The info for the original cue is below. --> - Nijmegen 'n rijk aan mogelijkheden (NL)[DVC] + Nijmegen 'n rijk aan mogelijkheden (NL) 1994 Harlon Publishing @@ -10878,7 +10880,7 @@ license:CC0 Note: This disc is a hybrid CD-i and Windows 3.1 disc. It will boot in a CD-i without issues, and it contains software to play back the disc images on Windows 3.1. --> - Peaches [DVC] + Peaches 1995 Icontact Multimedia Limited diff --git a/hash/nes.xml b/hash/nes.xml index 8cc97a2d7ad..bdcff4f5fc1 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -76876,7 +76876,7 @@ be better to redump them properly. --> - Mortal Kombat 3 (Asia, Alt) + Mortal Kombat 3 (Asia, alt) 19?? Super Games diff --git a/src/mame/drivers/konmedal020.cpp b/src/mame/drivers/konmedal020.cpp index 41346454bf6..d44dcddaa18 100644 --- a/src/mame/drivers/konmedal020.cpp +++ b/src/mame/drivers/konmedal020.cpp @@ -121,4 +121,4 @@ ROM_END } // Anonymous namespace -GAME( 1997, gs471, 0, gs471, gs471, konmedal020_state, empty_init, ROT0, "Konami", "Unknown medal game GS471", MACHINE_NOT_WORKING ) +GAME( 1997, gs471, 0, gs471, gs471, konmedal020_state, empty_init, ROT0, "Konami", "unknown medal game GS471", MACHINE_NOT_WORKING ) -- cgit v1.2.3 From 839d2e69e9584575cd06e7648f9050b9a769d5bd Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Sep 2021 22:08:28 +1000 Subject: debugger/qt, debugger/win: Fixed suppressing trailing whitespace in copied text on completely blank lnes (most noticeable for the console view). --- src/osd/modules/debugger/qt/debuggerview.cpp | 4 ++-- src/osd/modules/debugger/win/debugviewinfo.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp index 263fcfe1e73..f8ffda536b1 100644 --- a/src/osd/modules/debugger/qt/debuggerview.cpp +++ b/src/osd/modules/debugger/qt/debuggerview.cpp @@ -331,8 +331,8 @@ void DebuggerView::copyVisibleSlot() for (uint32_t col = 0; col < visarea.x; ++col) text += wchar_t(viewdata[col].byte); std::string::size_type const nonblank = text.find_last_not_of("\t\n\v\r "); - if ((nonblank != std::string::npos) && (nonblank >= start)) - text.resize(nonblank + 1); + if (nonblank != std::string::npos) + text.resize((std::max)(nonblank + 1, start)); text += "\n"; } diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp index d6e94c1ba3e..6965d032dfa 100644 --- a/src/osd/modules/debugger/win/debugviewinfo.cpp +++ b/src/osd/modules/debugger/win/debugviewinfo.cpp @@ -320,8 +320,8 @@ void debugview_info::handle_context_menu(unsigned command) for (uint32_t col = 0; col < visarea.x; ++col) text += wchar_t(viewdata[col].byte); std::wstring::size_type const nonblank = text.find_last_not_of(L"\t\n\v\r "); - if ((nonblank != std::wstring::npos) && (nonblank >= start)) - text.resize(nonblank + 1); + if (nonblank != std::wstring::npos) + text.resize((std::max)(start, nonblank + 1)); text += L"\r\n"; } -- cgit v1.2.3 From d173b601c301a3c75a5c351bdd623b4d984593a9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 28 Sep 2021 00:47:12 +1000 Subject: Fixed some software list issues: apxen_flop.xml: Marked diag bad and unsupported as the disk image is missing protection data. pc8001mk2_flop.xml, pc8801_flop.xml: Removed some entries that were inadvertently duplicated. --- hash/apxen_flop.xml | 5 +++-- hash/pc8001mk2_flop.xml | 11 ----------- hash/pc8801_flop.xml | 11 ----------- src/osd/modules/debugger/qt/debuggerview.cpp | 2 +- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/hash/apxen_flop.xml b/hash/apxen_flop.xml index cfd9b7d2676..e3b36f700ec 100644 --- a/hash/apxen_flop.xml +++ b/hash/apxen_flop.xml @@ -20,13 +20,14 @@ license:CC0 - + + Various Diags, XEEROM 1986 ACT - + diff --git a/hash/pc8001mk2_flop.xml b/hash/pc8001mk2_flop.xml index a8dd3e69b11..d0ee6448370 100644 --- a/hash/pc8001mk2_flop.xml +++ b/hash/pc8001mk2_flop.xml @@ -81,17 +81,6 @@ Bon Bon, Bon Bon, Compaq, Aug 83, Aug 83, - - N80 Disk BASIC (alt) - 19?? - <unknown> - - - - - - - PC-8001mkII System Disk 19?? diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml index 148ec69b125..8d66982b835 100644 --- a/hash/pc8801_flop.xml +++ b/hash/pc8801_flop.xml @@ -48464,17 +48464,6 @@ loderuna - pc8801 Device Floppy Disk load failed: Invalid image - - Full Fire & Other Old Games - 19?? - <unknown> - - - - - - - Fuyu de Gozaru 19?? diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp index f8ffda536b1..a1c8bcf2aec 100644 --- a/src/osd/modules/debugger/qt/debuggerview.cpp +++ b/src/osd/modules/debugger/qt/debuggerview.cpp @@ -332,7 +332,7 @@ void DebuggerView::copyVisibleSlot() text += wchar_t(viewdata[col].byte); std::string::size_type const nonblank = text.find_last_not_of("\t\n\v\r "); if (nonblank != std::string::npos) - text.resize((std::max)(nonblank + 1, start)); + text.resize((std::max)(start, nonblank + 1)); text += "\n"; } -- cgit v1.2.3