Fixed Headless app

Emulator/Components/Denise/FrameBuffer.h

@@ -18,8 +18,10 @@ using util::Buffer;
 
 namespace vamiga {
 
-struct FrameBuffer {
+class FrameBuffer {
 
+public:
+
     // Predefined colors
     static constexpr Texel black    = TEXEL(0xFF000000);
     static constexpr Texel grey2    = TEXEL(0xFF222222);

Emulator/Headless.cpp

@@ -61,10 +61,6 @@ int main(int argc, char *argv[])
 
 namespace vamiga {
 
-Headless::Headless() { // }: amiga(&vamiga.emu->main) {
-
-}
-
 int
 Headless::main(int argc, char *argv[])
 {
@@ -279,18 +275,19 @@ Headless::execScript()
     VAmiga vamiga;
 
     // Redirect shell output to the console in verbose mode
-    if (keys.find("verbose") != keys.end()) vamiga.amiga.amiga->retroShell.setStream(std::cout);
+    if (keys.find("verbose") != keys.end()) vamiga.retroShell.setStream(std::cout);
 
     // Read the input script
     Script script(keys["arg1"]);
 
     // Launch the emulator thread
     vamiga.launch(this, vamiga::process);
 
-    // Execute the script
+    // Execute scripts
     barrier.lock();
-    script.execute(*vamiga.amiga.amiga);
-
+    vamiga.retroShell.execScript(script);
+    barrier.lock();
+
     return *returnCode;
 }
 

Emulator/Headless.h

@@ -37,15 +37,6 @@ class Headless {
     // Return code
     std::optional<int> returnCode;
 
-
-    //
-    // Initializing
-    //
-
-public:
-
-    Headless();
-
 
     //
     // Launching
@@ -85,7 +76,7 @@ class Headless {
 };
 
 //
-// Self-test script
+// Self-test scripts
 //
 
 static const char *script[] = {
@@ -145,6 +136,8 @@ static const char *script[] = {
     "mem set SAVE_ROMS false",
     "mem set SLOW_RAM_DELAY true",
     "mem set SLOW_RAM_DELAY false",
+    "mem set SLOW_RAM_MIRROR true",
+    "mem set SLOW_RAM_MIRROR false",
     "mem set BANKMAP A500",
     "mem set BANKMAP A1000",
     "mem set BANKMAP A2000A",
@@ -209,8 +202,6 @@ static const char *script[] = {
     "agnus set REVISION OCS",
     "agnus set REVISION ECS_1MB",
     "agnus set REVISION ECS_2MB",
-    "agnus set SLOW_RAM_MIRROR true",
-    "agnus set SLOW_RAM_MIRROR false",
     "agnus set PTR_DROPS true",
     "agnus set PTR_DROPS false",
 
@@ -426,11 +417,11 @@ static const char *script[] = {
     "server gdb",
     "server gdb set PORT 8000",
     "server gdb set VERBOSE true",
-    "server gdb set VERBOSE false",
+    "server gdb set VERBOSE false"
+};
 
-    "",
-    "# Entering the debugger...",
-    ".",
+/*
+static const char *debugScript[] = {
 
     "",
     "break",
@@ -540,5 +531,6 @@ static const char *script[] = {
     "i host",
     "i server"
 };
+*/
 
 }

Emulator/Media/MediaFile.h

@@ -38,8 +38,8 @@ class MediaFile {
     static MediaFile *make(const fs::path &path, FileType type);
     static MediaFile *make(const u8 *buf, isize len, FileType type);
     static MediaFile *make(class MutableFileSystem &fs, FileType type);
-    static MediaFile *make(struct FloppyDriveAPI &drive, FileType type);
-    static MediaFile *make(struct HardDriveAPI &drive, FileType type);
+    static MediaFile *make(class FloppyDriveAPI &drive, FileType type);
+    static MediaFile *make(class HardDriveAPI &drive, FileType type);
 
 
     //

Emulator/Misc/RetroShell/Console.cpp

@@ -538,6 +538,9 @@ Console::exec()
 {
     SYNCHRONIZED
 
+    // Indicates if we're executing commands from a script
+    bool scriptMode = false;
+
     // Only proceed if there is anything to process
     if (commands.empty()) return;
 
@@ -550,10 +553,26 @@ Console::exec()
             cmd = commands.front();
             commands.erase(commands.begin());
 
+            // Commands from a script carry a line number
+            scriptMode |= cmd.first != 0;
+
             exec(cmd);
+
+            if (commands.empty() && scriptMode) {
+                msgQueue.put(MSG_SCRIPT_DONE);
+            }
         }
 
-    } catch (...) { }
+    } catch (ScriptInterruption &) {
+
+    } catch (...) { 
+
+        // Remove all remaining commands
+        commands = { };
+
+        // Inform the GUI if a script had been executed
+        if (scriptMode) msgQueue.put(MSG_SCRIPT_ABORT);
+    }
 
     // Print prompt
     *this << getPrompt();
@@ -620,17 +639,6 @@ Console::asyncExecScript(const string &contents)
     asyncExecScript(ss);
 }
 
-/*
- void
- Console::asyncExecScript(const MediaFile &file)
- {
- if (file.type() != FILETYPE_SCRIPT) throw Error(ERROR_FILE_TYPE_MISMATCH);
-
- string s((char *)file.getData(), file.getSize());
- try { execScript(s); } catch (util::Exception &) { }
- }
- */
-
 void
 Console::abortScript()
 {

Emulator/Misc/RetroShell/Console.h

@@ -38,13 +38,20 @@ class Console : public SubComponent {
     friend class RshServer;
     friend class Interpreter;
 
-    Descriptions descriptions = {{
-
-        .type           = COMP_CONSOLE,
-        .name           = "Console",
-        .description    = "Command shell",
-        .shell          = ""
-    }};
+    Descriptions descriptions = {
+        {
+            .type           = COMP_CONSOLE,
+            .name           = "CmdConsole",
+            .description    = "Command shell",
+            .shell          = ""
+        },
+        {
+            .type           = COMP_CONSOLE,
+            .name           = "DbgConsole",
+            .description    = "Debug shell",
+            .shell          = ""
+        }
+    };
 
     ConfigOptions options = {
 

Emulator/Misc/RetroShell/RetroShell.h

@@ -52,8 +52,8 @@ class RetroShell : public SubComponent {
     };
 
     // Consoles
-    CommandConsole commander = CommandConsole(amiga);
-    DebugConsole debugger = DebugConsole(amiga);
+    CommandConsole commander = CommandConsole(amiga, 0);
+    DebugConsole debugger = DebugConsole(amiga, 1);
 
     // The currently active console
     Console *current = &commander;