[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/11] next-cube.c: move static old_scr2 variable to NeXTPC
From: |
Thomas Huth |
Subject: |
[PULL 08/11] next-cube.c: move static old_scr2 variable to NeXTPC |
Date: |
Fri, 22 Dec 2023 14:45:24 +0100 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Move the old_scr2 variable to NeXTPC so that the old SCR2 register state is
stored along with the current SCR2 state.
Since the SCR2 register is 32-bits wide, convert old_scr2 to uint32_t and
update the SCR2 register access code to allow unaligned writes.
Note that this is a migration break, but as nothing will currently boot then
we do not need to worry about this now.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231220131641.592826-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
hw/m68k/next-cube.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index f2222554fa..d53f73fb8b 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -91,6 +91,7 @@ struct NeXTPC {
uint32_t scr1;
uint32_t scr2;
+ uint32_t old_scr2;
uint32_t int_mask;
uint32_t int_status;
uint32_t led;
@@ -125,8 +126,7 @@ static const uint8_t rtc_ram2[32] = {
static void nextscr2_write(NeXTPC *s, uint32_t val, int size)
{
- static uint8_t old_scr2;
- uint8_t scr2_2;
+ uint8_t old_scr2, scr2_2;
NextRtc *rtc = &s->rtc;
if (size == 4) {
@@ -144,6 +144,8 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int
size)
}
}
+ old_scr2 = (s->old_scr2 >> 8) & 0xff;
+
if (scr2_2 & 0x1) {
/* DPRINTF("RTC %x phase %i\n", scr2_2, rtc->phase); */
if (rtc->phase == -1) {
@@ -252,7 +254,6 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int
size)
}
s->scr2 = val & 0xFFFF00FF;
s->scr2 |= scr2_2 << 8;
- old_scr2 = scr2_2;
}
static uint64_t next_mmio_read(void *opaque, hwaddr addr, unsigned size)
@@ -318,7 +319,10 @@ static void next_mmio_write(void *opaque, hwaddr addr,
uint64_t val,
break;
case 0xd000 ... 0xd003:
+ s->scr2 = deposit32(s->scr2, (4 - (addr - 0xd000) - size) << 3,
+ size << 3, val);
nextscr2_write(s, val, size);
+ s->old_scr2 = s->scr2;
break;
default:
@@ -876,6 +880,7 @@ static void next_pc_reset(DeviceState *dev)
/* 0x0000XX00 << vital bits */
s->scr1 = 0x00011102;
s->scr2 = 0x00ff0c80;
+ s->old_scr2 = s->scr2;
s->rtc.status = 0x90;
@@ -932,6 +937,7 @@ static const VMStateDescription next_pc_vmstate = {
.fields = (VMStateField[]) {
VMSTATE_UINT32(scr1, NeXTPC),
VMSTATE_UINT32(scr2, NeXTPC),
+ VMSTATE_UINT32(old_scr2, NeXTPC),
VMSTATE_UINT32(int_mask, NeXTPC),
VMSTATE_UINT32(int_status, NeXTPC),
VMSTATE_UINT32(led, NeXTPC),
--
2.43.0
- [PULL 00/11] m68k next-cube patches, Thomas Huth, 2023/12/22
- [PULL 01/11] next-cube.c: add dummy Ethernet register to allow diagnostic to timeout, Thomas Huth, 2023/12/22
- [PULL 06/11] next-cube.c: move static led variable to NeXTPC, Thomas Huth, 2023/12/22
- [PULL 09/11] next-cube.c: move LED logic to new next_scr2_led_update() function, Thomas Huth, 2023/12/22
- [PULL 11/11] next-cube.c: move machine MemoryRegions into NeXTState, Thomas Huth, 2023/12/22
- [PULL 08/11] next-cube.c: move static old_scr2 variable to NeXTPC,
Thomas Huth <=
- [PULL 02/11] next-cube.c: don't pulse SCSI DMA IRQ upon reception of FLUSH command, Thomas Huth, 2023/12/22
- [PULL 05/11] next-cube.c: update and improve dma_ops, Thomas Huth, 2023/12/22
- [PULL 07/11] next-cube.c: move static phase variable to NextRtc, Thomas Huth, 2023/12/22
- [PULL 10/11] next-cube.c: remove val and size arguments from nextscr2_write(), Thomas Huth, 2023/12/22
- [PULL 03/11] next-cube.c: update mmio_ops to properly use modern memory API, Thomas Huth, 2023/12/22
- [PULL 04/11] next-cube.c: update scr_ops to properly use modern memory API, Thomas Huth, 2023/12/22
- Re: [PULL 00/11] m68k next-cube patches, Stefan Hajnoczi, 2023/12/26