mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/m68k/next-cube: Move int_status and int_mask to NeXTPC struct

Browse Source 
All the code which accesses int_status and int_mask is now doing
so via the NeXTPC->NeXTState indirection, so we can move these
fields into the NeXTPC struct where they belong.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210115201206.17347-7-peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
This commit is contained in:
Peter Maydell 2021-01-15 20:12:01 +00:00 committed by Thomas Huth
parent b497f4a1f8
commit ac99317b5f
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/m68k/next-cube.c
View File

@ -73,9 +73,6 @@ typedef struct NextRtc {
struct NeXTState { struct NeXTState {
MachineState parent; MachineState parent;
uint32_t int_mask;
uint32_t int_status;
next_dma dma[10]; next_dma dma[10];
qemu_irq *scsi_irq; qemu_irq *scsi_irq;
qemu_irq scsi_dma; qemu_irq scsi_dma;
@ -104,6 +101,8 @@ struct NeXTPC {
uint32_t scr2; uint32_t scr2;
uint8_t scsi_csr_1; uint8_t scsi_csr_1;
uint8_t scsi_csr_2; uint8_t scsi_csr_2;
uint32_t int_mask;
uint32_t int_status;
}; };
/* Thanks to NeXT forums for this */ /* Thanks to NeXT forums for this */
@ -244,7 +243,7 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int size)
/* clear FTU */ /* clear FTU */
if (rtc->value & 0x04) { if (rtc->value & 0x04) {
rtc->status = rtc->status & (~0x18); rtc->status = rtc->status & (~0x18);
s->ns->int_status = s->ns->int_status & (~0x04); s->int_status = s->int_status & (~0x04);
} }
} }
} }
@ -303,12 +302,12 @@ static uint32_t mmio_readl(NeXTPC *s, hwaddr addr)
{ {
switch (addr) { switch (addr) {
case 0x7000: case 0x7000:
/* DPRINTF("Read INT status: %x\n", s->ns->int_status); */ /* DPRINTF("Read INT status: %x\n", s->int_status); */
return s->ns->int_status; return s->int_status;
case 0x7800: case 0x7800:
DPRINTF("MMIO Read INT mask: %x\n", s->ns->int_mask); DPRINTF("MMIO Read INT mask: %x\n", s->int_mask);
return s->ns->int_mask; return s->int_mask;
case 0xc000: case 0xc000:
return s->scr1; return s->scr1;
@ -343,12 +342,12 @@ static void mmio_writel(NeXTPC *s, hwaddr addr, uint32_t val)
{ {
switch (addr) { switch (addr) {
case 0x7000: case 0x7000:
DPRINTF("INT Status old: %x new: %x\n", s->ns->int_status, val); DPRINTF("INT Status old: %x new: %x\n", s->int_status, val);
s->ns->int_status = val; s->int_status = val;
break; break;
case 0x7800: case 0x7800:
DPRINTF("INT Mask old: %x new: %x\n", s->ns->int_mask, val); DPRINTF("INT Mask old: %x new: %x\n", s->int_mask, val);
s->ns->int_mask = val; s->int_mask = val;
break; break;
case 0xc000: case 0xc000:
DPRINTF("SCR1 Write: %x\n", val); DPRINTF("SCR1 Write: %x\n", val);
@ -505,9 +504,9 @@ static void scr_writeb(NeXTPC *s, hwaddr addr, uint32_t value)
DPRINTF("SCSICSR CPUDMA\n"); DPRINTF("SCSICSR CPUDMA\n");
/* qemu_irq_raise(s->scsi_dma); */ /* qemu_irq_raise(s->scsi_dma); */
s->ns->int_status |= 0x4000000; s->int_status |= 0x4000000;
} else { } else {
s->ns->int_status &= ~(0x4000000); s->int_status &= ~(0x4000000);
} }
if (value & SCSICSR_INTMASK) { if (value & SCSICSR_INTMASK) {
DPRINTF("SCSICSR INTMASK\n"); DPRINTF("SCSICSR INTMASK\n");
@ -799,14 +798,14 @@ static void next_irq(void *opaque, int number, int level)
* this HAS to be wrong, the interrupt handlers in mach and together * this HAS to be wrong, the interrupt handlers in mach and together
* int_status and int_mask and return if there is a hit * int_status and int_mask and return if there is a hit
*/ */
if (s->ns->int_mask & (1 << shift)) { if (s->int_mask & (1 << shift)) {
DPRINTF("%x interrupt masked @ %x\n", 1 << shift, cpu->env.pc); DPRINTF("%x interrupt masked @ %x\n", 1 << shift, cpu->env.pc);
/* return; */ /* return; */
} }
/* second switch triggers the correct interrupt */ /* second switch triggers the correct interrupt */
if (level) { if (level) {
s->ns->int_status |= 1 << shift; s->int_status |= 1 << shift;
switch (number) { switch (number) {
/* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */ /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */
@ -835,7 +834,7 @@ static void next_irq(void *opaque, int number, int level)
break; break;
} }
} else { } else {
s->ns->int_status &= ~(1 << shift); s->int_status &= ~(1 << shift);
cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD); cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
} }
} }