diff mbox series

[05/11] hw/m68k/next-cube: Make next_irq take NeXTPC* as its opaque

Message ID 20210115201206.17347-6-peter.maydell@linaro.org
State Superseded
Headers show
Series hw/m68k/next-cube: refactor to fix Coverity issue | expand

Commit Message

Peter Maydell Jan. 15, 2021, 8:12 p.m. UTC 
Make the next_irq function take a NeXTPC* as its opaque rather than
the M68kCPU*.  This will make it simpler to turn the next_irq
function into a gpio input line of the NeXTPC device in the next
commit.

For this to work we have to pass the CPU to the NeXTPC device via a
link property, in the same way we do in q800.c (and for the same
reason).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/m68k/next-cube.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

-- 
2.20.1

Comments

Thomas Huth Jan. 16, 2021, 8:39 a.m. UTC | #1 
Am Fri, 15 Jan 2021 20:12:00 +0000
schrieb Peter Maydell <peter.maydell@linaro.org>:

> Make the next_irq function take a NeXTPC* as its opaque rather than

> the M68kCPU*.  This will make it simpler to turn the next_irq

> function into a gpio input line of the NeXTPC device in the next

> commit.

> 

> For this to work we have to pass the CPU to the NeXTPC device via a

> link property, in the same way we do in q800.c (and for the same

> reason).

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>  hw/m68k/next-cube.c | 31 +++++++++++++++++++++++--------

>  1 file changed, 23 insertions(+), 8 deletions(-)

> 

> diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c

> index f5575cb43b8..a9e57304e04 100644

> --- a/hw/m68k/next-cube.c

> +++ b/hw/m68k/next-cube.c

> @@ -94,6 +94,8 @@ struct NeXTPC {

>      /* Temporary until all functionality has been moved into this

> device */ NeXTState *ns;

>  

> +    M68kCPU *cpu;

> +

>      MemoryRegion mmiomem;

>      MemoryRegion scrmem;

>  

> @@ -739,9 +741,9 @@ static const MemoryRegionOps dma_ops = {

>   */

>  static void next_irq(void *opaque, int number, int level)

>  {

> -    M68kCPU *cpu = opaque;

> +    NeXTPC *s = NEXT_PC(opaque);

> +    M68kCPU *cpu = s->cpu;

>      int shift = 0;

> -    NeXTState *ns = NEXT_MACHINE(qdev_get_machine());

>  

>      /* first switch sets interupt status */

>      /* DPRINTF("IRQ %i\n",number); */

> @@ -796,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

>       * int_status and int_mask and return if there is a hit

>       */

> -    if (ns->int_mask & (1 << shift)) {

> +    if (s->ns->int_mask & (1 << shift)) {

>          DPRINTF("%x interrupt masked @ %x\n", 1 << shift,

> cpu->env.pc); /* return; */

>      }

>  

>      /* second switch triggers the correct interrupt */

>      if (level) {

> -        ns->int_status |= 1 << shift;

> +        s->ns->int_status |= 1 << shift;

>  

>          switch (number) {

>          /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi,

> clock */ @@ -832,7 +834,7 @@ static void next_irq(void *opaque, int

> number, int level) break;

>          }

>      } else {

> -        ns->int_status &= ~(1 << shift);

> +        s->ns->int_status &= ~(1 << shift);

>          cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);

>      }

>  }

> @@ -847,9 +849,9 @@ static void next_serial_irq(void *opaque, int n,

> int level) }

>  }

>  

> -static void next_escc_init(M68kCPU *cpu)

> +static void next_escc_init(DeviceState *pcdev)

>  {

> -    qemu_irq *ser_irq = qemu_allocate_irqs(next_serial_irq, cpu, 2);

> +    qemu_irq *ser_irq = qemu_allocate_irqs(next_serial_irq, pcdev,

> 2); DeviceState *dev;

>      SysBusDevice *s;

>  

> @@ -893,6 +895,17 @@ static void next_pc_realize(DeviceState *dev,

> Error **errp) sysbus_init_mmio(sbd, &s->scrmem);

>  }

>  

> +/*

> + * If the m68k CPU implemented its inbound irq lines as GPIO lines

> + * rather than via the m68k_set_irq_level() function we would not

> need

> + * this cpu link property and could instead provide outbound IRQ

> lines

> + * that the board could wire up to the CPU.

> + */

> +static Property next_pc_properties[] = {

> +    DEFINE_PROP_LINK("cpu", NeXTPC, cpu, TYPE_M68K_CPU, M68kCPU *),

> +    DEFINE_PROP_END_OF_LIST(),

> +};

> +

>  static void next_pc_class_init(ObjectClass *klass, void *data)

>  {

>      DeviceClass *dc = DEVICE_CLASS(klass);

> @@ -900,6 +913,7 @@ static void next_pc_class_init(ObjectClass

> *klass, void *data) dc->desc = "NeXT Peripheral Controller";

>      dc->realize = next_pc_realize;

>      dc->reset = next_pc_reset;

> +    device_class_set_props(dc, next_pc_properties);

>      /* We will add the VMState in a later commit */

>  }

>  

> @@ -938,6 +952,7 @@ static void next_cube_init(MachineState *machine)

>  

>      /* Peripheral Controller */

>      pcdev = qdev_new(TYPE_NEXT_PC);

> +    object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu),

> &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev),

> &error_fatal); /* Temporary while we refactor this code */

>      NEXT_PC(pcdev)->ns = ns;

> @@ -996,7 +1011,7 @@ static void next_cube_init(MachineState *machine)

>      }

>  

>      /* Serial */

> -    next_escc_init(cpu);

> +    next_escc_init(pcdev);

>  

>      /* TODO: */

>      /* Network */


Reviewed-by: Thomas Huth <huth@tuxfamily.org>
diff mbox series

Patch

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index f5575cb43b8..a9e57304e04 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -94,6 +94,8 @@  struct NeXTPC {
     /* Temporary until all functionality has been moved into this device */
     NeXTState *ns;
 
+    M68kCPU *cpu;
+
     MemoryRegion mmiomem;
     MemoryRegion scrmem;
 
@@ -739,9 +741,9 @@  static const MemoryRegionOps dma_ops = {
  */
 static void next_irq(void *opaque, int number, int level)
 {
-    M68kCPU *cpu = opaque;
+    NeXTPC *s = NEXT_PC(opaque);
+    M68kCPU *cpu = s->cpu;
     int shift = 0;
-    NeXTState *ns = NEXT_MACHINE(qdev_get_machine());
 
     /* first switch sets interupt status */
     /* DPRINTF("IRQ %i\n",number); */
@@ -796,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
      * int_status and int_mask and return if there is a hit
      */
-    if (ns->int_mask & (1 << shift)) {
+    if (s->ns->int_mask & (1 << shift)) {
         DPRINTF("%x interrupt masked @ %x\n", 1 << shift, cpu->env.pc);
         /* return; */
     }
 
     /* second switch triggers the correct interrupt */
     if (level) {
-        ns->int_status |= 1 << shift;
+        s->ns->int_status |= 1 << shift;
 
         switch (number) {
         /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */
@@ -832,7 +834,7 @@  static void next_irq(void *opaque, int number, int level)
             break;
         }
     } else {
-        ns->int_status &= ~(1 << shift);
+        s->ns->int_status &= ~(1 << shift);
         cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD);
     }
 }
@@ -847,9 +849,9 @@  static void next_serial_irq(void *opaque, int n, int level)
     }
 }
 
-static void next_escc_init(M68kCPU *cpu)
+static void next_escc_init(DeviceState *pcdev)
 {
-    qemu_irq *ser_irq = qemu_allocate_irqs(next_serial_irq, cpu, 2);
+    qemu_irq *ser_irq = qemu_allocate_irqs(next_serial_irq, pcdev, 2);
     DeviceState *dev;
     SysBusDevice *s;
 
@@ -893,6 +895,17 @@  static void next_pc_realize(DeviceState *dev, Error **errp)
     sysbus_init_mmio(sbd, &s->scrmem);
 }
 
+/*
+ * If the m68k CPU implemented its inbound irq lines as GPIO lines
+ * rather than via the m68k_set_irq_level() function we would not need
+ * this cpu link property and could instead provide outbound IRQ lines
+ * that the board could wire up to the CPU.
+ */
+static Property next_pc_properties[] = {
+    DEFINE_PROP_LINK("cpu", NeXTPC, cpu, TYPE_M68K_CPU, M68kCPU *),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void next_pc_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -900,6 +913,7 @@  static void next_pc_class_init(ObjectClass *klass, void *data)
     dc->desc = "NeXT Peripheral Controller";
     dc->realize = next_pc_realize;
     dc->reset = next_pc_reset;
+    device_class_set_props(dc, next_pc_properties);
     /* We will add the VMState in a later commit */
 }
 
@@ -938,6 +952,7 @@  static void next_cube_init(MachineState *machine)
 
     /* Peripheral Controller */
     pcdev = qdev_new(TYPE_NEXT_PC);
+    object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu), &error_abort);
     sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev), &error_fatal);
     /* Temporary while we refactor this code */
     NEXT_PC(pcdev)->ns = ns;
@@ -996,7 +1011,7 @@  static void next_cube_init(MachineState *machine)
     }
 
     /* Serial */
-    next_escc_init(cpu);
+    next_escc_init(pcdev);
 
     /* TODO: */
     /* Network */