From 7fabd6e7614a8b9554d4d4db41dd46860470c19c Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 11 Sep 2016 18:37:17 +0300 Subject: [PATCH] Do not use direct allocation if uae boot rom is not needed. Direct can conflict with some other expansion in same address space. --- autoconf.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/autoconf.cpp b/autoconf.cpp index 00ba6a8e..44048f25 100644 --- a/autoconf.cpp +++ b/autoconf.cpp @@ -540,6 +540,12 @@ static uae_u32 REGPARAM2 uae_puts (TrapContext *ctx) void rtarea_init_mem (void) { + if (need_uae_boot_rom(&currprefs)) { + rtarea_bank.flags &= ~ABFLAG_ALLOCINDIRECT; + } else { + // not enabled and something else may use same address space + rtarea_bank.flags |= ABFLAG_ALLOCINDIRECT; + } rtarea_bank.reserved_size = RTAREA_SIZE; rtarea_bank.start = rtarea_base; if (!mapped_malloc (&rtarea_bank)) { -- 2.47.3