[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000 |
Date: |
Wed, 4 Oct 2023 09:38:05 +0100 |
According to the Apple Quadra 800 Developer Note document, the Quadra 800 ROM
consists of 2 ROM code sections based at offsets 0x0 and 0x800000. A/UX attempts
to access the toolbox ROM at the lower offset during startup, so provide a
memory alias to allow the access to succeed.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/m68k/q800.c | 5 +++++
include/hw/m68k/q800.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 27a0b3c08a..1d7cd5ff1c 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -660,6 +660,11 @@ static void q800_machine_init(MachineState *machine)
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
memory_region_add_subregion(get_system_memory(), MACROM_ADDR, &m->rom);
+ memory_region_init_alias(&m->rom_alias, NULL, "m68k_mac.rom-alias",
+ &m->rom, 0, MACROM_SIZE);
+ memory_region_add_subregion(get_system_memory(), 0x40000000,
+ &m->rom_alias);
+
/* Load MacROM binary */
if (filename) {
bios_size = load_image_targphys(filename, MACROM_ADDR,
MACROM_SIZE);
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 348eaf4703..a9661f65f6 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -50,6 +50,7 @@ struct Q800MachineState {
bool easc;
M68kCPU cpu;
MemoryRegion rom;
+ MemoryRegion rom_alias;
GLUEState glue;
MOS6522Q800VIA1State via1;
MOS6522Q800VIA2State via2;
--
2.39.2
- [PATCH v4 09/20] q800: add Apple Sound Chip (ASC) audio to machine, (continued)
- [PATCH v4 09/20] q800: add Apple Sound Chip (ASC) audio to machine, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 10/20] q800: add easc bool machine class property to switch between ASC and EASC, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 11/20] swim: add trace events for IWM and ISM registers, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 12/20] swim: split into separate IWM and ISM register blocks, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 13/20] swim: update IWM/ISM register block decoding, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 14/20] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 15/20] mac_via: workaround NetBSD ADB bus enumeration issue, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 16/20] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 17/20] mac_via: always clear ADB interrupt when switching to A/UX mode, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 18/20] q800: add ESCC alias at 0xc000, Mark Cave-Ayland, 2023/10/04
- [PATCH v4 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000,
Mark Cave-Ayland <=
- [PATCH v4 20/20] mac_via: extend timer calibration hack to work with A/UX, Mark Cave-Ayland, 2023/10/04
- Re: [PATCH v4 00/20] q800: add support for booting MacOS Classic - part 2, Laurent Vivier, 2023/10/06