[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 8/9] q800: add NMI handler
From: |
Laurent Vivier |
Subject: |
[PULL 8/9] q800: add NMI handler |
Date: |
Fri, 22 Oct 2021 09:17:04 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This allows the programmer's switch to be triggered via the monitor for
debugging
purposes. Since the CPU level 7 interrupt is level-triggered, use a timer to
hold
the NMI active for 100ms before releasing it again.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewied-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20211020134131.4392-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 83fde3929834..a081051a8dd5 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -28,6 +28,7 @@
#include "cpu.h"
#include "hw/boards.h"
#include "hw/or-irq.h"
+#include "hw/nmi.h"
#include "elf.h"
#include "hw/loader.h"
#include "ui/console.h"
@@ -102,12 +103,14 @@ struct GLUEState {
uint8_t ipr;
uint8_t auxmode;
qemu_irq irqs[1];
+ QEMUTimer *nmi_release;
};
#define GLUE_IRQ_IN_VIA1 0
#define GLUE_IRQ_IN_VIA2 1
#define GLUE_IRQ_IN_SONIC 2
#define GLUE_IRQ_IN_ESCC 3
+#define GLUE_IRQ_IN_NMI 4
#define GLUE_IRQ_NUBUS_9 0
@@ -167,6 +170,10 @@ static void GLUE_set_irq(void *opaque, int irq, int level)
irq = 3;
break;
+ case GLUE_IRQ_IN_NMI:
+ irq = 6;
+ break;
+
default:
g_assert_not_reached();
}
@@ -189,6 +196,10 @@ static void GLUE_set_irq(void *opaque, int irq, int level)
irq = 3;
break;
+ case GLUE_IRQ_IN_NMI:
+ irq = 6;
+ break;
+
default:
g_assert_not_reached();
}
@@ -216,12 +227,30 @@ static void glue_auxmode_set_irq(void *opaque, int irq,
int level)
s->auxmode = level;
}
+static void glue_nmi(NMIState *n, int cpu_index, Error **errp)
+{
+ GLUEState *s = GLUE(n);
+
+ /* Hold NMI active for 100ms */
+ GLUE_set_irq(s, GLUE_IRQ_IN_NMI, 1);
+ timer_mod(s->nmi_release, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 100);
+}
+
+static void glue_nmi_release(void *opaque)
+{
+ GLUEState *s = GLUE(opaque);
+
+ GLUE_set_irq(s, GLUE_IRQ_IN_NMI, 0);
+}
+
static void glue_reset(DeviceState *dev)
{
GLUEState *s = GLUE(dev);
s->ipr = 0;
s->auxmode = 0;
+
+ timer_del(s->nmi_release);
}
static const VMStateDescription vmstate_glue = {
@@ -231,6 +260,7 @@ static const VMStateDescription vmstate_glue = {
.fields = (VMStateField[]) {
VMSTATE_UINT8(ipr, GLUEState),
VMSTATE_UINT8(auxmode, GLUEState),
+ VMSTATE_TIMER_PTR(nmi_release, GLUEState),
VMSTATE_END_OF_LIST(),
},
};
@@ -246,6 +276,13 @@ static Property glue_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static void glue_finalize(Object *obj)
+{
+ GLUEState *s = GLUE(obj);
+
+ timer_free(s->nmi_release);
+}
+
static void glue_init(Object *obj)
{
DeviceState *dev = DEVICE(obj);
@@ -255,15 +292,20 @@ static void glue_init(Object *obj)
qdev_init_gpio_in_named(dev, glue_auxmode_set_irq, "auxmode", 1);
qdev_init_gpio_out(dev, s->irqs, 1);
+
+ /* NMI release timer */
+ s->nmi_release = timer_new_ms(QEMU_CLOCK_VIRTUAL, glue_nmi_release, s);
}
static void glue_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ NMIClass *nc = NMI_CLASS(klass);
dc->vmsd = &vmstate_glue;
dc->reset = glue_reset;
device_class_set_props(dc, glue_properties);
+ nc->nmi_monitor_handler = glue_nmi;
}
static const TypeInfo glue_info = {
@@ -271,7 +313,12 @@ static const TypeInfo glue_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(GLUEState),
.instance_init = glue_init,
+ .instance_finalize = glue_finalize,
.class_init = glue_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_NMI },
+ { }
+ },
};
static void main_cpu_reset(void *opaque)
--
2.31.1
- [PULL 0/9] Q800 patches, Laurent Vivier, 2021/10/22
- [PULL 3/9] q800: use GLUE IRQ numbers instead of IRQ level for GLUE IRQs, Laurent Vivier, 2021/10/22
- [PULL 4/9] mac_via: add GPIO for A/UX mode, Laurent Vivier, 2021/10/22
- [PULL 2/9] q800: move VIA1 IRQ from level 1 to level 6, Laurent Vivier, 2021/10/22
- [PULL 1/9] mac_via: update comment for VIA1B_vMystery bit, Laurent Vivier, 2021/10/22
- [PULL 5/9] q800: wire up auxmode GPIO to GLUE, Laurent Vivier, 2021/10/22
- [PULL 7/9] q800: wire up remaining IRQs in classic mode, Laurent Vivier, 2021/10/22
- [PULL 6/9] q800: route SONIC on-board Ethernet IRQ via nubus IRQ 9 in classic mode, Laurent Vivier, 2021/10/22
- [PULL 9/9] q800: drop 8-bit graphic_depth check for Apple 21 inch display, Laurent Vivier, 2021/10/22
- [PULL 8/9] q800: add NMI handler,
Laurent Vivier <=
- Re: [PULL 0/9] Q800 patches, Richard Henderson, 2021/10/22