From 09e3fefeadb13d96cdb583a1291077addb5c60c5 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 May 2022 12:59:59 +1000 Subject: machine/cps2comm.cpp: Worked around missing deduction guides for std::array in libc++ 6. --- src/mame/machine/cps2comm.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mame/machine/cps2comm.cpp b/src/mame/machine/cps2comm.cpp index a7fe8f2ac65..95701ef264d 100644 --- a/src/mame/machine/cps2comm.cpp +++ b/src/mame/machine/cps2comm.cpp @@ -638,8 +638,8 @@ void cps2_comm_device::usart_control_w(offs_t offset, u16 data, u16 mem_mask) LOG("%s: USART mode = 0x%02X: Synchronous, %d-bit, %s Parity, %s Sync Detect, %d Sync Characters\n", machine().describe_context(), m_usart_mode, - std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)], - std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)], + std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)], + std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)], BIT(m_usart_mode, 6) ? "External" : "Internal", BIT(m_usart_mode, 7) ? 1 : 2); m_usart_control_phase = CTRL_SYNC1; @@ -649,10 +649,10 @@ void cps2_comm_device::usart_control_w(offs_t offset, u16 data, u16 mem_mask) LOG("%s: USART mode = 0x%02X: Asynchronous, x %d Clock, %d-bit, %s Parity, %s Transmit Stop Bits\n", machine().describe_context(), m_usart_mode, - std::array{ -1, 1, 16, 64 }[BIT(m_usart_mode, 0, 2)], - std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)], - std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)], - std::array{ "Illegal", "1", "1-1/2", "2" }[BIT(m_usart_mode, 6, 2)]); + std::array{ -1, 1, 16, 64 }[BIT(m_usart_mode, 0, 2)], + std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)], + std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)], + std::array{ "Illegal", "1", "1-1/2", "2" }[BIT(m_usart_mode, 6, 2)]); m_usart_control_phase = CTRL_COMMAND; m_usart_status |= 0x01U; } @@ -715,9 +715,9 @@ void cps2_comm_device::route_w(offs_t offset, u16 data, u16 mem_mask) machine().describe_context(), m_route, BIT(m_route, 4) ? "low" : "high", - std::array{ "1", "TxD & OUT", "1", "TxD" }[BIT(m_route, 0, 2)], - std::array{ "1", "IN", "TxD", "1" }[BIT(m_route, 0, 2)], - std::array{ "1", "IN", "OUT", "IN" }[BIT(m_route, 0, 2)]); + std::array{ "1", "TxD & OUT", "1", "TxD" }[BIT(m_route, 0, 2)], + std::array{ "1", "IN", "TxD", "1" }[BIT(m_route, 0, 2)], + std::array{ "1", "IN", "OUT", "IN" }[BIT(m_route, 0, 2)]); } } -- cgit v1.2.3 From 6e54ab76fcfffb8b1efc7d9209ece4f938ba5306 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Mon, 23 May 2022 11:12:00 +0700 Subject: z80: bug fix for 16-bit operands --- src/devices/cpu/z80/z80.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp index 86a65ed3169..a43fec45327 100644 --- a/src/devices/cpu/z80/z80.cpp +++ b/src/devices/cpu/z80/z80.cpp @@ -555,7 +555,9 @@ uint8_t z80_device::arg() uint16_t z80_device::arg16() { - return arg() | (arg() << 8); + u8 const res = arg(); + + return (u16(arg()) << 8) | res; } /*************************************************************** -- cgit v1.2.3 From 3a648248c27777b9a8e4802e09b2a7d4336fd3d0 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 24 May 2022 00:47:07 +1000 Subject: pc98_cd.xml: Marked Master of Magic as unsupported due to issues with 256 colour mode. --- hash/pc98_cd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/pc98_cd.xml b/hash/pc98_cd.xml index 018302b46ee..2a7aff03afa 100644 --- a/hash/pc98_cd.xml +++ b/hash/pc98_cd.xml @@ -4279,7 +4279,7 @@ license:CC0 - +