Add back initial support for loading and configuring OctoCartridge files (drag&drop only).

Author: gulrak

src/editor.cpp

@@ -431,10 +431,10 @@ void Editor::recompile()
         _compiler.reset();
         if(_text.empty() || _text.back() != '\n') {
             auto text = _text + '\n';
-            _compiler.compile(_filename, text.data(), text.data() + text.size() + 1);
+            _compiler.compile(_filename, text);
         }
         else {
-            _compiler.compile(_filename, _text.data(), _text.data() + _text.size() + 1);
+            _compiler.compile(_filename, _text);
         }
         auto time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - start).count();
         TraceLog(LOG_INFO, "Recompilation took %dms", (int)time_ms);

src/emuhostex.cpp

@@ -269,6 +269,37 @@ bool EmuHostEx::loadRom(std::string_view filename, LoadOptions loadOpt)
         unsigned int size = 0;
         _customPalette = false;
         _colorPalette = _defaultPalette;
+        // TODO: Refactor this
+        if (filename.ends_with(".gif")) {
+            auto cart = emu::OctoCartridge(std::string(filename));
+            if (cart.loadCartridge()) {
+                auto options = cart.getOptions();
+                auto properties = CoreRegistry::propertiesFromOctoOptions(options);
+                auto source = cart.getSource();
+                updateEmulatorOptions(properties);
+                auto c8c = std::make_unique<emu::OctoCompiler>();
+                if (c8c->compile(filename, source).resultType == emu::CompileResult::eOK) {
+                    auto loadAddress = _chipEmu->defaultLoadAddress();
+                    if (c8c->codeSize() < _chipEmu->memSize() - loadAddress) {
+                        _chipEmu->reset();
+                        auto binary = std::span<const uint8_t>(c8c->code(), c8c->code() + c8c->codeSize());
+                        if (_chipEmu->loadData(binary, loadAddress)) {
+                            _romImage.assign(c8c->code(), c8c->code() + c8c->codeSize());
+                            _romSha1 = c8c->sha1();
+                            _romName = filename;
+                            _romIsWellKnown = false;
+                        }
+                    }
+                    whenRomLoaded(_romName, loadOpt & LoadOptions::SetToRun, c8c.get(), source);
+                    return true;
+                }
+                else {
+                    _romName = filename;
+                    whenRomLoaded(_romName, false, c8c.get(), source);
+                    return true;
+                }
+            }
+        }
         auto fileData = loadFile(filename, Librarian::MAX_ROM_SIZE);
         if (fileData) {
             resetAllBreakpoints();
@@ -319,8 +350,8 @@ bool EmuHostEx::loadBinary(std::string_view filename, ghc::span<const uint8_t> b
     TraceLog(LOG_INFO, "Loading %s file with sha1: %s", isKnown ? "known" : "unknown", calculateSha1(fileData).to_hex().c_str());
     auto knownProperties = _librarian.getPropertiesForFile(fileData);
     if (endsWith(filename, ".8o")) {
-        c8c = std::make_unique<emu::OctoCompiler>();
         source.assign((const char*)fileData.data(), fileData.size());
+        c8c = std::make_unique<emu::OctoCompiler>();
         if (c8c->compile(filename).resultType == emu::CompileResult::eOK) {
             auto loadAddress = _chipEmu->defaultLoadAddress();
             if (c8c->codeSize() < _chipEmu->memSize() - loadAddress) {

src/emulation/coreregistry.cpp

@@ -27,9 +27,12 @@
 #include "coreregistry.hpp"
 
 #include <chiplet/utility.hpp>
+#include <chiplet/octocartridge.hpp>
 
 #include <set>
 
+#include <nlohmann/json.hpp>
+
 namespace emu {
 
 void CoreRegistry::IFactoryInfo::cacheVariantMappings() const
@@ -58,6 +61,34 @@ Properties CoreRegistry::IFactoryInfo::variantProperties(const std::string& vari
     return {};
 }
 
+Properties CoreRegistry::propertiesFromOctoOptions(const OctoOptions& options)
+{
+    Properties result;
+    auto pXO = propertiesForPreset("XO-CHIP");
+    auto j = nlohmann::json::object();
+    to_json(j, pXO);
+    j["class"] = "CHIP-8 GENERIC";
+    j["behaviorBase"] = "XO-CHIP";
+    j["memory"] = "65536";
+    j["cleanRam"] = true;
+    j["frameRate"] = 60;
+    j["instructionsPerFrame"] = options.tickrate;
+    j["justShiftVx"] = options.qShift;
+    j["loadStoreIncIByXPlus1"] = !options.qLoadStore;
+    j["loadStoreIncIByX"] = false;
+    j["jump0Bxnn"] = options.qJump0;
+    j["dontResetVf"] = !options.qLogic;
+    j["wrapSprites"] = !options.qClip;
+    j["instantDxyn"] = !options.qVBlank;
+    auto palette = nlohmann::json::array();
+    for (auto col : options.colors) {
+        palette.push_back(Palette::Color::fromRGB(col).toStringRGB());
+    }
+    j["palette"] = palette;
+    from_json(j, result);
+    return result;
+}
+
 CoreRegistry::CoreRegistry()
 {
     for(auto& [key, info] : factoryMap()) {

src/emulation/coreregistry.hpp

@@ -41,6 +41,8 @@
 
 namespace emu {
 
+class OctoOptions;
+
 enum PropertySelector {PropertiesFromVariant, PropertiesAsGiven};
 class CoreRegistry {
 public:
@@ -263,6 +265,8 @@ class CoreRegistry {
         return {};
     }
 
+    static Properties propertiesFromOctoOptions(const OctoOptions& options);
+
     Iterator begin() const
     {
         return Iterator(orderedFactories.begin());

src/knownfiles.ipp

@@ -123,7 +123,7 @@ static KnownRomInfo g_knownRoms[] = {
     {"3450e0d92e0bbf8e9d3065fd088cd6dfa5f9441d"_sha1, "chip-8", "Octo Bird (Cody Hoover, 2016)",nullptr, nullptr},
     {"346f2760ca55bb6d45b1f255fe4960a7d244191e"_sha1, "vip-chip-8", "Bingo (Andrew Modla)",nullptr, nullptr},
     {"35158696bd94ea22ef34e899fff1f15f7154d4fd"_sha1, "chip-8", "Craps (Camerlo Cortez, 1978)",nullptr, nullptr},
-    {"36363ecdd850dd1a099e272fae6d9b786c2a7d36"_sha1, "xo-chip", "Raycaster (A-KouZ1, 2018)",R"({"instructionsPerFrame":100000,"palette":{"border":"#000000","colors":["#000000","#555555","#aaaaaa","#ffffff"],"signal":"#888888"}})", nullptr},
+    {"36363ecdd850dd1a099e272fae6d9b786c2a7d36"_sha1, "xo-chip", "Raycaster (A-KouZ1, 2018)",R"({"instructionsPerFrame":50000,"palette":{"border":"#000000","colors":["#000000","#555555","#aaaaaa","#ffffff"],"signal":"#888888"}})", nullptr},
     {"3643118e2e237deab98151b742f34caf9533dc05"_sha1, "chip-8", "Mandelbrot Program (A-KouZ1, 2018)",nullptr, nullptr},
     {"39970ccfd3a3f00180d53464d4fd7862193eaf0f"_sha1, "chip-8", "Octo: A Chip 8 Story (SystemLogoff, 2015-10-29)",R"({"instructionsPerFrame":7,"palette":{"border":"#222222","colors":["#111111","#eeeeee"],"signal":"#ffff00"}})", nullptr},
     {"3a840c33442ad9e912df1fa2aa61833bf571af34"_sha1, "chip-8", "Private Eye (TCNJ S.572.37)",nullptr, nullptr},