Changes in emu/main.c [0edef06:1efc42c] in buchla-emu

File:

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

emu/main.c

@@ -25 +25 @@
 static verb_flag_t verb_flags[] = {
         { "sdl", &sdl_verbose },
-        { "gdb", &gdb_verbose },
         { "cpu", &cpu_verbose },
         { "fpu", &fpu_verbose },
@@ -41 +40 @@
 const char *bios = "bios.abs";
 const char *disk = "buchla.disk";
-const char *font = "ttf/vera-sans-mono.ttf";
-
-SDL_atomic_t run;
 
 static void usage(FILE *fh)
 {
-        fprintf(fh, "usage: buchla [-h] [-v comp [-v comp [...]]] [-b bios] [-d disk] [-f font]\n");
+        fprintf(fh, "usage: buchla [-h] [-v comp [-v comp [...]]] [-b bios] [-d disk]\n");
         fprintf(fh, "where comp is one of: ");
 
@@ -87 +83 @@
                 }
 
-                if (strcmp(argv[i], "-f") == 0) {
-                        if (++i == argc) {
-                                usage(stderr);
-                                fprintf(stderr, "missing argument to -f\n");
-                                exit(1);
-                        }
-
-                        font = argv[i];
-                        continue;
-                }
-
                 if (strcmp(argv[i], "-v") == 0) {
                         if (++i == argc) {
@@ -133 +118 @@
 }
 
-static int32_t cpu_thread(void *data)
-{
-        (void)data;
-
-        cpu_loop();
-        return 0;
-}
-
-static int32_t gdb_thread(void *data)
-{
-        (void)data;
-
-        gdb_loop();
-        return 0;
-}
-
 int32_t main(int32_t argc, char *argv[])
 {
         parse_args(argc, argv);
         sdl_init();
-        gdb_init();
-        cpu_init();
 
-        SDL_AtomicSet(&run, 1);
-        SDL_Thread *thr_cpu = SDL_CreateThread(cpu_thread, "cpu", NULL);
+        cpu_loop();
 
-        if (thr_cpu == NULL) {
-                fail("SDL_CreateThread() failed: %s", SDL_GetError());
-        }
-
-        SDL_Thread *thr_gdb = SDL_CreateThread(gdb_thread, "gdb", NULL);
-
-        if (thr_gdb == NULL) {
-                fail("SDL_CreateThread() failed: %s", SDL_GetError());
-        }
-
-        sdl_loop();
-
-        SDL_WaitThread(thr_cpu, NULL);
-        SDL_WaitThread(thr_gdb, NULL);
-
-        cpu_quit();
-        gdb_quit();
         sdl_quit();
         return 0;