Merge branch 'main' into debugger-start

.github/workflows/ci.yml

@@ -8,8 +8,8 @@ on:
 
 jobs:
   linux_ubuntu_22_04:
-    name: (Ubuntu 22.04) GCC ${{ matrix.gcc-version }}.x
-    runs-on: ubuntu-22.04
+    name: (Ubuntu 24.04) GCC ${{ matrix.gcc-version }}.x
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         gcc-version: [11, 12, 13]

.gitignore

@@ -64,3 +64,4 @@ packages.config
 *.d
 temp
 output
+build/

.vscode/launch.json

@@ -0,0 +1,86 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            // Resolved by CMake Tools:
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    // add the directory where our target was built to the PATHs
+                    // it gets resolved by CMake Tools:
+                    "name": "PATH",
+                    "value": "${env:PATH}:${command:cmake.getLaunchTargetDirectory}"
+                },
+                {
+                    "name": "OTHER_VALUE",
+                    "value": "Something something"
+                }
+            ],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+       {
+            "name": "(lldb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            // Resolved by CMake Tools:
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    // add the directory where our target was built to the PATHs
+                    // it gets resolved by CMake Tools:
+                    "name": "PATH",
+                    "value": "${env:PATH}:${command:cmake.getLaunchTargetDirectory}"
+                },
+                {
+                    "name": "OTHER_VALUE",
+                    "value": "Something something"
+                }
+            ],
+            "externalConsole": false,
+            "MIMode": "lldb"
+        },
+        {
+            "name": "(msvc) Launch",
+            "type": "cppvsdbg",
+            "request": "launch",
+            // Resolved by CMake Tools:
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    // add the directory where our target was built to the PATHs
+                    // it gets resolved by CMake Tools:
+                    "name": "PATH",
+                    "value": "${env:PATH}:${command:cmake.getLaunchTargetDirectory}"
+                },
+                {
+                    "name": "OTHER_VALUE",
+                    "value": "Something something"
+                }
+            ],
+            "externalConsole": false
+        }
+    ]
+}

CMakeLists.txt

@@ -174,6 +174,7 @@ add_executable(quaesar
     uae_src/scsi.cpp
     uae_src/scsiemul.cpp
     uae_src/scsitape.cpp
+    uae_src/serial.cpp
     uae_src/sndboard.cpp
     uae_src/statusline.cpp
     uae_src/tabletlibrary.cpp

src/dummy.cpp

@@ -104,7 +104,7 @@ bool specialmonitor_need_genlock() {
 }
 
 void setmouseactive(int, int) {
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 void screenshot(int monid, int, int) {
@@ -142,7 +142,7 @@ static void dummy_close(void) {
 
 // Dummy function to acquire an input device
 static int dummy_acquire(int device_id, int exclusive) {
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return 0;  // Return 0 for success, -1 for failure
 }
 
@@ -450,7 +450,7 @@ void a4091_add_scsi_unit(int, uaedev_config_info*, romconfig*) {
     UNIMPLEMENTED();
 }
 void activate_console() {
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 void alf3_add_scsi_unit(int, uaedev_config_info*, romconfig*) {
@@ -601,12 +601,17 @@ int compiler_init() {
 }
 
 void console_flush() {
-    //UNIMPLEMENTED();
+    fflush(stdout);
 }
 
-int console_get(char*, int) {
-    UNIMPLEMENTED();
-    return 0;
+int console_get(char* out, int maxlen) {
+    TCHAR* res = fgets(out, maxlen, stdin);
+    if (res == NULL) {
+        return -1;
+    }
+
+    int len = strlen(out);
+    return len - 1;
 }
 
 bool console_isch() {
@@ -984,7 +989,10 @@ void unlockscr(struct vidbuffer* vb_in, int y_start, int y_end) {
                 // TODO: Fix me
                 exit(0);
                 break;
-            case SDL_KEYDOWN:                           // User presses a key
+            case SDL_KEYDOWN:                      // User presses a key
+                if (e.key.keysym.sym == SDLK_d) {  // If the key is ESC
+                    activate_debugger();
+                }
                 if (e.key.keysym.sym == SDLK_ESCAPE) {  // If the key is ESC
                     quit_program == UAE_QUIT;
                     exit(0);
@@ -1105,7 +1113,6 @@ bool is_mainthread() {
 }
 
 bool ismouseactive() {
-    //UNIMPLEMENTED();
     return false;
 }
 
@@ -1384,42 +1391,25 @@ void scram5394_add_scsi_unit(int, uaedev_config_info*, romconfig*) {
     UNIMPLEMENTED();
 }
 
-uae_u16 SERDATR() {
-    UNIMPLEMENTED();
-    return 0;
-}
-
-void SERDAT(uae_u16) {
-    UNIMPLEMENTED();
-}
-
-void serial_dtr_off() {
-    UNIMPLEMENTED();
-}
-
-void serial_exit() {
-    UNIMPLEMENTED();
+void serial_uartbreak(int) {
+    // UNIMPLEMENTED();
 }
 
 void serial_hsynchandler() {
-    UNIMPLEMENTED();
-}
-
-void serial_init() {
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 void serial_rbf_clear() {
     UNIMPLEMENTED();
 }
 
-uae_u8 serial_readstatus(uae_u8, uae_u8) {
-    UNIMPLEMENTED();
-    return 0;
+uae_u8 serial_readstatus(uae_u8 v, uae_u8) {
+    // UNIMPLEMENTED();
+    return v;
 }
 
 void serial_rethink() {
-    UNIMPLEMENTED();
+    serial_flush_buffer();
 }
 
 void setup_brkhandler() {
@@ -1534,11 +1524,11 @@ int target_get_volume_name(uaedev_mount_info*, uaedev_config_info*, bool, bool,
 #endif
 
 void target_inputdevice_acquire() {
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 void target_inputdevice_unacquire() {
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 bool target_isrelativemode() {
@@ -1592,8 +1582,10 @@ void toggle_mousegrab() {
     UNIMPLEMENTED();
 }
 
-void to_upper(char*, int) {
-    UNIMPLEMENTED();
+void to_upper(char* s, int len) {
+    for (int i = 0; i < len; i++) {
+        s[i] = toupper(s[i]);
+    }
 }
 
 uae_u32 trifecta_ncr9x_scsi_get(unsigned int, int) {
@@ -1676,7 +1668,7 @@ bool uae_slirp_start() {
 }
 
 void update_debug_info() {
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 void updatedisplayarea(int) {
@@ -1902,19 +1894,6 @@ uae_u8* save_cdtv(size_t*, uae_u8*) {
     return nullptr;
 }
 
-void serial_uartbreak(int) {
-    UNIMPLEMENTED();
-}
-
-uae_u8 serial_writestatus(uae_u8, uae_u8) {
-    UNIMPLEMENTED();
-    return 0;
-}
-
-void SERPER(unsigned short) {
-    UNIMPLEMENTED();
-}
-
 int set_cache_state(int) {
     UNIMPLEMENTED();
     return 0;
@@ -1925,7 +1904,7 @@ void setcapslockstate(int) {
 }
 
 void setmouseactivexy(int, int, int, int) {
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 }
 
 uae_u32 squirrel_ncr9x_scsi_get(unsigned int, int) {

src/gfx.cpp

@@ -16,7 +16,6 @@ int vsync_activeheight, vsync_totalheight;
 int max_uae_width = 8192, max_uae_height = 8192;
 int saveimageoriginalpath;
 float vsync_vblank, vsync_hblank;
-uae_u16 serper, serdat, serdatr;
 
 // related to GSYNC/VSYNC
 int target_get_display_scanline2(int displayindex) {

src/parse_options.h

@@ -7,6 +7,8 @@ struct Options {
     std::string input;
     // kickstart file such as kick.rom, kick31.rom, etc.
     std::string kickstart;
+    // serial port path ('/tmp/virtual-serial-port')
+    std::string serial_port;
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/quaesar.cpp

@@ -45,6 +45,7 @@ int main(int argc, char** argv) {
 
     app.add_option("input", options.input, "Executable or image file (adf, dms)")->check(CLI::ExistingFile);
     app.add_option("-k,--kickstart", options.kickstart, "Path to the kickstart ROM")->check(CLI::ExistingFile);
+    app.add_option("--serial_port", options.serial_port, "Serial port path");
     CLI11_PARSE(app, argc, argv);
 
     keyboard_settrans();
@@ -61,6 +62,11 @@ int main(int argc, char** argv) {
         }
     }
 
+    if (!options.serial_port.empty()) {
+        currprefs.use_serial = 1;
+        strcpy(currprefs.sername, options.serial_port.c_str());
+    }
+
     // Most compatible mode
     currprefs.cpu_cycle_exact = 1;
     currprefs.cpu_memory_cycle_exact = 1;

src/sounddep/sound.cpp

@@ -363,6 +363,24 @@ void resume_sound_device(struct sound_data* sd) {
     sd->paused = 0;
 }
 
+int get_default_audio_device() {
+    int device_idx = -1;
+#if SDL_VERSION_ATLEAST(2, 24, 0)
+    SDL_AudioSpec spec;
+    char* default_device_name = nullptr;
+    if (SDL_GetDefaultAudioInfo(&default_device_name, &spec, 0) == 0) {
+        for (int i = 0; i < num_sound_devices; i++) {
+            if (strcmp(sound_devices[i]->name, default_device_name) != 0)
+                continue;
+            device_idx = i;
+            break;
+        }
+        SDL_free(default_device_name);
+    }
+#endif
+    return device_idx;
+}
+
 static int open_sound() {
     auto size = currprefs.sound_maxbsiz;
 
@@ -379,10 +397,12 @@ static int open_sound() {
 
     sdp->softvolume = -1;
     int num = enumerate_sound_devices();
-    if (currprefs.win32_soundcard >= num)
-        currprefs.win32_soundcard = changed_prefs.win32_soundcard = 0;
     if (num == 0)
         return 0;
+    if (currprefs.win32_soundcard < 0)
+        currprefs.win32_soundcard = changed_prefs.win32_soundcard = get_default_audio_device();
+    if ((unsigned)currprefs.win32_soundcard >= (unsigned)num)
+        currprefs.win32_soundcard = changed_prefs.win32_soundcard = 0;
     const auto ch = get_audio_nativechannels(active_sound_stereo);
     const auto ret = open_sound_device(sdp, currprefs.win32_soundcard, size, currprefs.sound_freq, ch);
     if (!ret)

src/sysconfig.h

@@ -67,8 +67,8 @@
 // #define D3D /* D3D display filter support */
 #define PARALLEL_PORT   /* parallel port emulation */
 #define PARALLEL_DIRECT /* direct parallel port emulation */
-// #define SERIAL_PORT /* serial port emulation */
-#define SERIAL_ENET /* serial port UDP transport */
+#define SERIAL_PORT     /* serial port emulation */
+#define SERIAL_ENET     /* serial port UDP transport */
 // #define SCSIEMU /* uaescsi.device emulation */
 // #define UAESERIAL /* uaeserial.device emulation */
 #define FPUEMU /* FPU emulation */

uae_src/cfgfile.cpp

@@ -8389,6 +8389,7 @@ void default_prefs (struct uae_prefs *p, bool reset, int type)
 	p->keyboard_connected = true;
 
 	p->produce_sound = 3;
+	p->win32_soundcard = -1;
 	p->sound_stereo = SND_STEREO;
 	p->sound_stereo_separation = 7;
 	p->sound_mixed_stereo_delay = 0;