system: added fastboot

Author: JaCzekanski

Diff for: README.md

@@ -69,20 +69,12 @@ Currently Avocado requires OpenGL 3.2. In the future this limitation will be lif
 
 ## Running
 
-Avocado requires the BIOS from real console in the data/bios directory.
-Selection of a BIOS rom will be required on the first run. The rom can be changed under Options->BIOS or by modifying the **config.json** file.
+Avocado requires the BIOS from real console in the `data/bios` directory. (use `File->Open Avocado directory` to locate the directory on your system)
+Selection of a BIOS rom will be required on the first run. The rom can be changed under `Options->BIOS` or by modifying the **config.json** file.
 
-Avocado doesn't support fast booting. [UniROM](http://www.psxdev.net/forum/viewtopic.php?t=722) can be used as a work around. Place the .rom file in the data/bios directory and modify **config.json**:
-```
-"extension": "data/bios/unirom_caetlaNTSC_plugin.rom"
-```
-
-Press the **Start** button (Enter by default) to fastboot, or **R2** (keypad *) to slowboot a game.
-You can run the included Playstation firmware replacement *Caetla* with the **Select** button (Right shift) then run the .exe directly from the disk.
-
-To load a .cue/.bin/.img/.chd file just drag and drop it.
+To load a `.cue/.bin/.img/.chd` or `.exe/.psexe/.psf/.minipsf` file just drag and drop it.
 
-PAL games with LibCrypt protection need additional subchannel info - download proper file .SBI or .LSD file from [Redump](http://redump.org/discs/system/psx/), place it in the same folder as game image and make sure has identical name as .cue/.bin/... file.
+PAL games with LibCrypt protection need additional subchannel info - download proper file `.SBI` or `.LSD` file from [Redump](http://redump.org/discs/system/psx/), place it in the same folder as game image and make sure has identical name as `.cue/.bin/...` file.
 
 ## Controls
 

Diff for: src/disc/load.cpp

@@ -1,9 +1,21 @@
 #include "load.h"
+#include <array>
 #include "disc/format/chd_format.h"
 #include "disc/format/cue_parser.h"
 #include "utils/file.h"
 
 namespace disc {
+const std::array<std::string, 5> discFormats = {
+    "chd", "cue", "iso", "bin", "img",
+};
+
+bool isDiscImage(const std::string& path) {
+    std::string ext = getExtension(path);
+    transform(ext.begin(), ext.end(), ext.begin(), tolower);
+
+    return std::find(discFormats.begin(), discFormats.end(), ext) != discFormats.end();
+}
+
 std::unique_ptr<disc::Disc> load(const std::string& path) {
     std::string ext = getExtension(path);
     transform(ext.begin(), ext.end(), ext.begin(), tolower);

Diff for: src/disc/load.h

@@ -4,5 +4,6 @@
 #include "disc.h"
 
 namespace disc {
+bool isDiscImage(const std::string& path);
 std::unique_ptr<disc::Disc> load(const std::string& path);
-}
+}  // namespace disc

Diff for: src/platform/windows/gui/file/open.cpp

@@ -24,7 +24,7 @@ bool Open::onFileSelected(const gui::helper::File& f) {
     auto path = f.entry.path();
     config.gui.lastPath = path.parent_path().string();
 
-    bus.notify(Event::File::Load{path.string(), true});
+    bus.notify(Event::File::Load{path.string()});
     return true;
 }
 

Diff for: src/platform/windows/gui/gui.cpp

@@ -292,15 +292,22 @@ void GUI::render(std::unique_ptr<System>& sys) {
         aboutHelp.displayWindows();
     }
 
+    toasts.display();
+
     if (!config.isEmulatorConfigured() && !notInitializedWindowShown) {
         notInitializedWindowShown = true;
         ImGui::OpenPopup("Avocado");
+    } else if (droppedItem) {
+        if (!droppedItemDialogShown) {
+            droppedItemDialogShown = true;
+            ImGui::OpenPopup("Disc");
+        }
+    } else {
+        drawControls(sys);
     }
 
-    toasts.display();
-
-    if (config.isEmulatorConfigured()) {
-        drawControls(sys);
+    if (droppedItem) {
+        discDialog();
     }
 
     // Work in progress
@@ -310,6 +317,44 @@ void GUI::render(std::unique_ptr<System>& sys) {
     ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
 }
 
+void GUI::discDialog() {
+    if (!ImGui::BeginPopupModal("Disc", nullptr, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize)) {
+        return;
+    }
+
+    ImGui::Text("%s", getFilenameExt(*droppedItem).c_str());
+    if (ImGui::Button("Boot")) {
+        bus.notify(Event::File::Load{*droppedItem, Event::File::Load::Action::slowboot});
+        ImGui::CloseCurrentPopup();
+    }
+    if (ImGui::IsItemHovered()) ImGui::SetTooltip("Restart console and boot the CD");
+
+    ImGui::SameLine();
+    if (ImGui::Button("Fast boot")) {
+        bus.notify(Event::File::Load{*droppedItem, Event::File::Load::Action::fastboot});
+        ImGui::CloseCurrentPopup();
+    }
+    if (ImGui::IsItemHovered()) ImGui::SetTooltip("Restart console and boot the CD (skipping BIOS intro)");
+
+    ImGui::SameLine();
+    if (ImGui::Button("Swap disc")) {
+        bus.notify(Event::File::Load{*droppedItem, Event::File::Load::Action::swap});
+        ImGui::CloseCurrentPopup();
+    }
+    if (ImGui::IsItemHovered()) ImGui::SetTooltip("Swap currently inserted disc");
+    ImGui::SameLine();
+
+    if (ImGui::Button("Cancel")) {
+        ImGui::CloseCurrentPopup();
+    }
+    ImGui::EndPopup();
+
+    if (!ImGui::IsPopupOpen("Disc")) {
+        droppedItem = {};
+        droppedItemDialogShown = false;
+    }
+}
+
 void GUI::drawControls(std::unique_ptr<System>& sys) {
     auto symbolButton = [](const char* hint, const char* symbol, ImVec4 bg = ImVec4(1, 1, 1, 0.08f)) -> bool {
         auto padding = ImGui::GetStyle().FramePadding;

Diff for: src/platform/windows/gui/gui.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <SDL.h>
+#include <optional>
 #include "file/open.h"
 #include "debug/cdrom.h"
 #include "debug/cpu.h"
@@ -40,6 +41,7 @@ class GUI {
     gui::Toasts toasts;
 
     void mainMenu(std::unique_ptr<System>& sys);
+    void discDialog();
     void drawControls(std::unique_ptr<System>& sys);
     void renderController();
 
@@ -55,6 +57,10 @@ class GUI {
     bool statusFramelimitter = true;
     bool statusMouseLocked = false;
 
+    // Drag&drop
+    std::optional<std::string> droppedItem;
+    bool droppedItemDialogShown = false;
+
     GUI(SDL_Window* window, void* glContext);
     ~GUI();
 

Diff for: src/platform/windows/main.cpp

@@ -7,6 +7,7 @@
 #include <string>
 #include "config.h"
 #include "config_parser.h"
+#include "disc/load.h"
 #include "gui/filesystem.h"
 #include "gui/gui.h"
 #include "input/sdl_input_manager.h"
@@ -191,15 +192,56 @@ int main(int argc, char** argv) {
         return 1;
     }
 
+    auto gui = std::make_unique<GUI>(window, glContext);
     Sound::init();
 
     std::unique_ptr<System> sys = system_tools::hardReset();
 
     int busToken = bus.listen<Event::File::Load>([&](auto e) {
-        bool isPaused = sys->state == System::State::pause;
-        if (e.reset) {
-            sys = system_tools::hardReset();
+        if (disc::isDiscImage(e.file)) {
+            if (e.action == Event::File::Load::Action::ask) {
+                // Show dialog and decide what to do
+                gui->droppedItem = e.file;
+                return;
+            }
+
+            std::unique_ptr<disc::Disc> disc = disc::load(e.file);
+            if (!disc) {
+                toast(fmt::format("Cannot load {}", getFilenameExt(e.file)));
+                return;
+            }
+
+            if (e.action == Event::File::Load::Action::slowboot) {
+                system_tools::bootstrap(sys);
+                sys->cdrom->disc = std::move(disc);
+                sys->cdrom->setShell(false);
+                sys->state = System::State::run;
+
+                toast("System restarted");
+                return;
+            } else if (e.action == Event::File::Load::Action::fastboot) {
+                system_tools::bootstrap(sys);
+                sys->cdrom->disc = std::move(disc);
+                sys->cdrom->setShell(false);
+
+                // BIOS is at 0x80030000 after bootstrap, forcing CPU to return
+                // will skip the boot animation and go straight to the CD boot
+
+                sys->cpu->setPC(sys->cpu->reg[31]);
+                sys->state = System::State::run;
+
+                toast("Fastboot");
+                return;
+            } else if (e.action == Event::File::Load::Action::swap) {
+                sys->cdrom->disc = std::move(disc);
+                sys->cdrom->setShell(false);
+
+                toast("Disc swapped");
+                return;
+            }
         }
+
+        bool isPaused = sys->state == System::State::pause;
         system_tools::loadFile(sys, e.file);
         sys->state = isPaused ? System::State::pause : System::State::run;
     });
@@ -238,8 +280,6 @@ int main(int argc, char** argv) {
     auto inputManager = std::make_unique<SdlInputManager>();
     InputManager::setInstance(inputManager.get());
 
-    auto gui = std::make_unique<GUI>(window, glContext);
-
     if (!sys->isSystemReady()) {
         sys->state = System::State::stop;
     } else {
@@ -335,7 +375,8 @@ int main(int argc, char** argv) {
             if (event.type == SDL_DROPFILE) {
                 std::string path = event.drop.file;
                 SDL_free(event.drop.file);
-                system_tools::loadFile(sys, path);
+
+                bus.notify(Event::File::Load{path});
             }
             if (event.type == SDL_WINDOWEVENT
                 && (event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED || event.window.event == SDL_WINDOWEVENT_RESIZED)) {

Diff for: src/utils/event.h

@@ -14,8 +14,14 @@ struct Spu {};
 
 namespace File {
 struct Load {
+    enum class Action {
+        ask,
+        slowboot,
+        fastboot,
+        swap,
+    };
     std::string file;
-    bool reset;
+    Action action = Action::ask;
 };
 struct Exit {};
 };  // namespace File