[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 28/30] q800: add alias for MacOS toolbox ROM at 0x40000000
|
From: |
Mark Cave-Ayland |
|
Subject: |
[PATCH 28/30] q800: add alias for MacOS toolbox ROM at 0x40000000 |
|
Date: |
Wed, 24 May 2023 22:11:02 +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>
---
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 3acdb5dd8d..bf4acb5db7 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -869,6 +869,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 3039b24d30..1a0dbb5ecd 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -33,6 +33,7 @@ struct Q800MachineState {
bool easc;
M68kCPU *cpu;
MemoryRegion rom;
+ MemoryRegion rom_alias;
DeviceState *glue;
DeviceState *djmemc;
MemoryRegion ramio;
--
2.30.2
- Re: [PATCH 18/30] swim: add trace events for IWM and ISM registers, (continued)
- [PATCH 22/30] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Mark Cave-Ayland, 2023/05/24
- [PATCH 21/30] mac_via: work around underflow in TimeDBRA timing loop in SETUPTIMEK, Mark Cave-Ayland, 2023/05/24
- [PATCH 23/30] mac_via: fix rtc command decoding for the PRAM seconds registers, Mark Cave-Ayland, 2023/05/24
- [PATCH 20/30] swim: update IWM/ISM register block decoding, Mark Cave-Ayland, 2023/05/24
- [PATCH 24/30] mac_via: workaround NetBSD ADB bus enumeration issue, Mark Cave-Ayland, 2023/05/24
- [PATCH 25/30] mac_via: implement ADB_STATE_IDLE state if shift register in input mode, Mark Cave-Ayland, 2023/05/24
- [PATCH 16/30] q800: add Apple Sound Chip (ASC) audio to machine, Mark Cave-Ayland, 2023/05/24
- [PATCH 27/30] q800: add ESCC alias at 0xc000, Mark Cave-Ayland, 2023/05/24
- [PATCH 28/30] q800: add alias for MacOS toolbox ROM at 0x40000000,
Mark Cave-Ayland <=
- [PATCH 26/30] mac_via: always clear ADB interrupt when switching to A/UX mode, Mark Cave-Ayland, 2023/05/24
- [PATCH 29/30] mac_via: extend timer calibration hack to work with A/UX, Mark Cave-Ayland, 2023/05/24
- [PATCH 30/30] mac_via: work around QEMU unaligned MMIO access bug, Mark Cave-Ayland, 2023/05/24