[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000
|
From: |
Laurent Vivier |
|
Subject: |
[PULL 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000 |
|
Date: |
Sun, 8 Oct 2023 08:23:48 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Message-ID: <20231004083806.757242-20-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/m68k/q800.h | 1 +
hw/m68k/q800.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 348eaf4703d0..a9661f65f695 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;
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 27a0b3c08a98..1d7cd5ff1c31 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);
--
2.41.0
- [PULL 10/20] q800: add easc bool machine class property to switch between ASC and EASC, (continued)
- [PULL 10/20] q800: add easc bool machine class property to switch between ASC and EASC, Laurent Vivier, 2023/10/08
- [PULL 11/20] swim: add trace events for IWM and ISM registers, Laurent Vivier, 2023/10/08
- [PULL 12/20] swim: split into separate IWM and ISM register blocks, Laurent Vivier, 2023/10/08
- [PULL 13/20] swim: update IWM/ISM register block decoding, Laurent Vivier, 2023/10/08
- [PULL 14/20] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Laurent Vivier, 2023/10/08
- [PULL 15/20] mac_via: workaround NetBSD ADB bus enumeration issue, Laurent Vivier, 2023/10/08
- [PULL 16/20] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Laurent Vivier, 2023/10/08
- [PULL 18/20] q800: add ESCC alias at 0xc000, Laurent Vivier, 2023/10/08
- [PULL 17/20] mac_via: always clear ADB interrupt when switching to A/UX mode, Laurent Vivier, 2023/10/08
- [PULL 20/20] mac_via: extend timer calibration hack to work with A/UX, Laurent Vivier, 2023/10/08
- [PULL 19/20] q800: add alias for MacOS toolbox ROM at 0x40000000,
Laurent Vivier <=
- Re: [PULL 00/20] Q800 for 8.2 patches, Stefan Hajnoczi, 2023/10/09