Changeset bdd5a63 in buchla-emu for emu/cpu.c

Timestamp:

08/01/2017 10:32:52 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

6e313dd

Parents:

ea878ba

Message:

Separate thread for rendering.

File:

• emu/cpu.c (modified) (4 diffs)

emu/cpu.c

@@ -52 +52 @@
 } hw_t;
 
+static uint64_t freq;
+static uint64_t quan;
+
+SDL_mutex *cpu_mutex;
+
 static bool reset = true;
 
@@ -620 +625 @@
 }
 
-void cpu_loop(void)
-{
+void cpu_init(void)
+{
+        cpu_mutex = SDL_CreateMutex();
+
+        if (cpu_mutex == NULL) {
+                fail("SDL_CreateMutex() failed: %s", SDL_GetError());
+        }
+
+        freq = SDL_GetPerformanceFrequency();
+        quan = freq / PER_SEC;
+
+        inf("freq %" PRIu64 " quan %" PRIu64, freq, quan);
+
         hw_init();
         bios_init();
 
-        inf("entering CPU loop");
         m68k_init();
         m68k_set_cpu_type(M68K_CPU_TYPE_68000);
         m68k_set_instr_hook_callback(inst_cb);
         m68k_pulse_reset();
-
-        uint64_t freq = SDL_GetPerformanceFrequency();
-        uint64_t quan = freq / PER_SEC;
-        inf("freq %" PRIu64 " quan %" PRIu64, freq, quan);
-
-        bool run = true;
-
-#if defined EMU_LINUX
-        SDL_Scancode down = SDL_SCANCODE_UNKNOWN;
-#endif
-
-        while (run) {
+}
+
+void cpu_quit(void)
+{
+        hw_quit();
+        SDL_DestroyMutex(cpu_mutex);
+}
+
+void cpu_loop(void)
+{
+        inf("entering CPU loop");
+
+        while (SDL_AtomicGet(&run) != 0) {
                 uint64_t until = SDL_GetPerformanceCounter() + quan;
+
+                if (SDL_LockMutex(cpu_mutex) < 0) {
+                        fail("SDL_LockMutex() failed: %s", SDL_GetError());
+                }
 
                 m68k_execute(CPU_FREQ / PER_SEC);
@@ -653 +673 @@
                 m68k_set_irq(irq);
 
-                SDL_Event ev;
-
-                while (SDL_PollEvent(&ev) > 0) {
-#if defined EMU_LINUX
-                        // Work around duplicate key-down events on Linux.
-
-                        if (ev.type == SDL_KEYDOWN) {
-                                if (down == ev.key.keysym.scancode) {
-                                        continue;
-                                }
-
-                                down = ev.key.keysym.scancode;
-                        }
-                        else if (ev.type == SDL_KEYUP) {
-                                down = SDL_SCANCODE_UNKNOWN;
-                        }
-#endif
-
-                        if (ev.type == SDL_QUIT ||
-                                        (ev.type == SDL_KEYDOWN && ev.key.keysym.sym == SDLK_ESCAPE)) {
-                                run = false;
-                                continue;
-                        }
-
-                        if (ev.type == SDL_TEXTINPUT) {
-                                ser_text(&ev.text);
-                                continue;
-                        }
-
-                        if (ev.type == SDL_KEYDOWN) {
-                                ser_key(&ev.key);
-                                continue;
-                        }
+                if (SDL_UnlockMutex(cpu_mutex) < 0) {
+                        fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
                 }
 
@@ -694 +683 @@
 
         inf("leaving CPU loop");
-        hw_quit();
-}
+}