Changeset a9861f3 in buchla-emu

Timestamp:

08/20/2017 08:09:56 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

657abdf

Parents:

b48c8a5

Message:

Don't double-lock the CPU mutex.

File:

• emu/vid.c (modified) (5 diffs)

emu/vid.c

@@ -250 +250 @@
         int32_t odtba = mem[REG_ODTBA] & 0xffc0;
 
-        if (SDL_LockMutex(cpu_mutex) < 0) {
-                fail("SDL_LockMutex() failed: %s", SDL_GetError());
-        }
-
         n_bm_objs = 0;
 
@@ -320 +316 @@
         }
 
-        if (SDL_UnlockMutex(cpu_mutex) < 0) {
-                fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
-        }
-
         SDL_AtomicAdd(&frame, 1);
         return false;
@@ -338 +330 @@
         }
 
-        uint32_t res;
-
-        if (SDL_LockMutex(cpu_mutex) < 0) {
-                fail("SDL_LockMutex() failed: %s", SDL_GetError());
-        }
-
         if (off16 >= reg_off && off16 < reg_off + 16) {
-                res = mem[off16 - reg_off];
-        }
-        else {
-                res = mem[bank * WIN_SZ_W + off16];
-        }
-
-        if (SDL_UnlockMutex(cpu_mutex) < 0) {
-                fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
-        }
-
-        return res;
+                return mem[off16 - reg_off];
+        }
+
+        return mem[bank * WIN_SZ_W + off16];
 }
 
@@ -366 +345 @@
         if (sz != 2 || bank >= N_BANKS || off % 2 != 0 || (off16 >= WIN_SZ_W && off16 != PAL_OFF)) {
                 fail("invalid vid wr %d %u:%d", bank, off, sz * 8);
-        }
-
-        if (SDL_LockMutex(cpu_mutex) < 0) {
-                fail("SDL_LockMutex() failed: %s", SDL_GetError());
         }
 
@@ -384 +359 @@
 
                 pal[i_pal] = (r << 24) | (g << 16) | (b << 8) | 0xff;
-        }
-        else if (off16 >= reg_off && off16 < reg_off + 16) {
+                return;
+        }
+
+        if (off16 >= reg_off && off16 < reg_off + 16) {
                 mem[off16 - reg_off] = (uint16_t)val;
-        }
-        else {
-                mem[bank * WIN_SZ_W + off16] = (uint16_t)val;
-        }
-
-        if (SDL_UnlockMutex(cpu_mutex) < 0) {
-                fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
-        }
-}
+                return;
+        }
+
+        mem[bank * WIN_SZ_W + off16] = (uint16_t)val;
+}