From 6187a57f5807b618751154dc1cb0e87533f7a33c Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Thu, 11 Sep 2014 19:38:13 +0300 Subject: [PATCH] Memory bank flag fix, broke when ABFLAG_THREADSAFE was added. --- debug.cpp | 6 +++--- inputdevice.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debug.cpp b/debug.cpp index cd2b1c01..17ba80f6 100644 --- a/debug.cpp +++ b/debug.cpp @@ -3161,20 +3161,20 @@ static uaecptr get_base (const uae_char *name, int offset) uaecptr v = get_long_debug (4); addrbank *b = &get_mem_bank(v); - if (!b || !b->check (v, 400) || b->flags != ABFLAG_RAM) + if (!b || !b->check (v, 400) || !(b->flags & ABFLAG_RAM)) return 0; v += offset; while (v = get_long_debug (v)) { uae_u32 v2; uae_u8 *p; b = &get_mem_bank (v); - if (!b || !b->check (v, 32) || (b->flags != ABFLAG_RAM && b->flags != ABFLAG_ROMIN)) + if (!b || !b->check (v, 32) || (!(b->flags & ABFLAG_RAM) && !(b->flags & ABFLAG_ROMIN))) goto fail; v2 = get_long_debug (v + 10); // name b = &get_mem_bank (v2); if (!b || !b->check (v2, 20)) goto fail; - if (b->flags == ABFLAG_ROM || b->flags == ABFLAG_RAM || b->flags == ABFLAG_ROMIN) { + if ((b->flags & ABFLAG_ROM) || (b->flags & ABFLAG_RAM) || (b->flags & ABFLAG_ROMIN)) { p = b->xlateaddr (v2); if (!memcmp (p, name, strlen (name) + 1)) return v; diff --git a/inputdevice.cpp b/inputdevice.cpp index b54b7cf9..b28fb977 100644 --- a/inputdevice.cpp +++ b/inputdevice.cpp @@ -1079,20 +1079,20 @@ static uaecptr get_base (const uae_char *name) uaecptr v = get_long (4); addrbank *b = &get_mem_bank(v); - if (!b || !b->check (v, 400) || b->flags != ABFLAG_RAM) + if (!b || !b->check (v, 400) || !(b->flags & ABFLAG_RAM)) return 0; v += 378; // liblist while (v = get_long (v)) { uae_u32 v2; uae_u8 *p; b = &get_mem_bank (v); - if (!b || !b->check (v, 32) || b->flags != ABFLAG_RAM) + if (!b || !b->check (v, 32) || !(b->flags & ABFLAG_RAM)) goto fail; v2 = get_long (v + 10); // name b = &get_mem_bank (v2); if (!b || !b->check (v2, 20)) goto fail; - if (b->flags != ABFLAG_ROM && b->flags != ABFLAG_RAM) + if (!(b->flags & ABFLAG_ROM) && !(b->flags & ABFLAG_RAM)) return 0; p = b->xlateaddr (v2); if (!memcmp (p, name, strlen (name) + 1)) { -- 2.47.3