Memory bank flag fix, broke when ABFLAG_THREADSAFE was added.

diff --git a/debug.cpp b/debug.cpp
index cd2b1c01d258d1edc6f2296d9586f3d018ce3888..17ba80f6fe6ca40ec721a7b746581bb0ca71957e 100644 (file)
--- 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 b54b7cf97f17e1fd6a4bf5e9cb4d40d16ad64691..b28fb977eb69f7f92ab2bb5558e565bd7bc8c173 100644 (file)
--- 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)) {