Feat/doom

CMakeLists.txt

@@ -21,17 +21,17 @@ set(GBC_COMPONENTS "gbc")
 ### SMS ###
 set(SMS_COMPONENTS "sms")
 
-### SNES ###
-# set(SNES_COMPONENTS "snes")
-
 ### MSX ###
 set(MSX_COMPONENTS "msx")
 
 ### GENESIS ###
 set(GENESIS_COMPONENTS "genesis")
 
 ### DOOM ###
-# set(DOOM_COMPONENTS "doom")
+set(DOOM_COMPONENTS "doom")
+
+### SNES ###
+# set(SNES_COMPONENTS "snes")
 
 add_compile_definitions(BOARD_HAS_PSRAM)
 

boxart/source/resize.bash

@@ -1,2 +1,2 @@
 #!/bin/bash
-find . -maxdepth 1 -iname "*.jpg" | xargs -L1 -I{} convert -resize 100x "{}" ../"{}"
+find . -maxdepth 1 -iname "*.jpg" | xargs -L1 -I{} magick -quiet "{}" -resize 100x ../"{}"

components/box-emu/CMakeLists.txt

@@ -30,4 +30,5 @@ idf_component_register(
   "statistics"
   "max1704x"
   "esp-box"
+  "pool_allocator"
   )

components/box-emu/include/box-emu.hpp

@@ -36,6 +36,7 @@
 #include "video_setting.hpp"
 
 #include "make_color.h"
+#include "pool_allocator.h"
 
 class BoxEmu : public espp::BaseComponent {
 public:
@@ -126,6 +127,7 @@ class BoxEmu : public espp::BaseComponent {
   /////////////////////////////////////////////////////////////////////////////
 
   bool initialize_memory();
+  void deinitialize_memory();
   size_t copy_file_to_romdata(const std::string& filename);
   uint8_t *romdata() const;
 
@@ -154,6 +156,7 @@ class BoxEmu : public espp::BaseComponent {
   void clear_screen();
   void display_size(size_t width, size_t height);
   void native_size(size_t width, size_t height, int pitch = -1);
+  const uint16_t *palette() const;
   void palette(const uint16_t *palette, size_t size = 256);
   void push_frame(const void* frame);
   VideoSetting video_setting() const;
@@ -185,7 +188,6 @@ class BoxEmu : public espp::BaseComponent {
   bool is_native() const;
   int x_offset() const;
   int y_offset() const;
-  const uint16_t *palette() const;
   bool video_task_callback(std::mutex &m, std::condition_variable &cv, bool &task_notified);
 
   class InputBase {

components/box-emu/src/box-emu.cpp

@@ -114,7 +114,7 @@ bool BoxEmu::initialize_sdcard() {
   memset(&mount_config, 0, sizeof(mount_config));
   mount_config.format_if_mount_failed = false;
   mount_config.max_files = 5;
-  mount_config.allocation_unit_size = 16 * 1024;
+  mount_config.allocation_unit_size = 2 * 1024;
 
   // Use settings defined above to initialize SD card and mount FAT filesystem.
   // Note: esp_vfs_fat_sdmmc/sdspi_mount is all-in-one convenience functions.
@@ -136,7 +136,7 @@ bool BoxEmu::initialize_sdcard() {
   bus_cfg.sclk_io_num = sdcard_sclk;
   bus_cfg.quadwp_io_num = -1;
   bus_cfg.quadhd_io_num = -1;
-  bus_cfg.max_transfer_sz = 8192;
+  bus_cfg.max_transfer_sz = 4096;
   spi_host_device_t host_id = (spi_host_device_t)host.slot;
   ret = spi_bus_initialize(host_id, &bus_cfg, SDSPI_DEFAULT_DMA);
   if (ret != ESP_OK) {
@@ -182,6 +182,8 @@ sdmmc_card_t *BoxEmu::sdcard() const {
 // Memory
 /////////////////////////////////////////////////////////////////////////////
 
+static constexpr size_t memory_size = 4*1024*1024;
+
 extern "C" uint8_t *osd_getromdata() {
   auto &emu = BoxEmu::get();
   return emu.romdata();
@@ -195,7 +197,7 @@ bool BoxEmu::initialize_memory() {
 
   logger_.info("Initializing memory (romdata)");
   // allocate memory for the ROM and make sure it's on the SPIRAM
-  romdata_ = (uint8_t*)heap_caps_malloc(4*1024*1024, MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
+  romdata_ = (uint8_t*)heap_caps_malloc(memory_size, MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
   if (romdata_ == nullptr) {
     logger_.error("Couldn't allocate memory for ROM!");
     return false;
@@ -204,6 +206,14 @@ bool BoxEmu::initialize_memory() {
   return true;
 }
 
+void BoxEmu::deinitialize_memory() {
+  if (romdata_) {
+    logger_.info("Deinitializing memory (romdata)");
+    free(romdata_);
+    romdata_ = nullptr;
+  }
+}
+
 size_t BoxEmu::copy_file_to_romdata(const std::string& filename) {
   // load the file data and iteratively copy it over
   std::ifstream romfile(filename, std::ios::binary | std::ios::ate); //open file at end
@@ -648,7 +658,7 @@ bool BoxEmu::initialize_usb() {
     .mount_config = {
       .format_if_mount_failed = false,
       .max_files = 5,
-      .allocation_unit_size = 16 * 1024, // sector size is 512 bytes, this should be between sector size and (128 * sector size). Larger means higher read/write performance and higher overhead for small files.
+      .allocation_unit_size = 2 * 1024, // sector size is 512 bytes, this should be between sector size and (128 * sector size). Larger means higher read/write performance and higher overhead for small files.
       .disk_status_check_enable = false, // true if you see issues or are unmounted properly; slows down I/O
     },
   };

components/doom/CMakeLists.txt

@@ -0,0 +1,15 @@
+idf_component_register(
+  INCLUDE_DIRS "include"
+  SRC_DIRS "src" "prboom"
+  PRIV_INCLUDE_DIRS "." "prboom"
+  REQUIRES box-emu shared_memory
+  )
+target_compile_options(${COMPONENT_LIB} PRIVATE
+    -Wno-error=address
+    -Wno-misleading-indentation
+    -Wno-format-overflow
+    -Wno-char-subscripts
+    -Wno-missing-field-initializers
+    -DHAVE_CONFIG_H
+    -O2
+)

components/doom/include/doom.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <span>
+#include <string>
+#include <string_view>
+#include <vector>
+
+void reset_doom();
+void init_doom(const std::string& rom_filename, uint8_t *romdata, size_t rom_data_size);
+void load_doom(int save_slot);
+void save_doom(int save_slot);
+void run_doom_rom();
+void deinit_doom();
+std::span<uint8_t> get_doom_video_buffer();

components/doom/linker.lf

@@ -0,0 +1,8 @@
+# Move gbc code into IRAM for perforamnce
+[mapping:doom]
+archive: libdoom.a
+entries:
+    d_main (noflash_text)
+    r_draw (noflash_text)
+    g_game (noflash_text)
+    m_misc (noflash_text)

components/doom/prboom/AUTHORS

@@ -0,0 +1,163 @@
+This file is now the amalgamated list of authors, contributors and credits
+for PrBoom. Hopefully by keeping these all in one place, they will remain
+more accurate.
+
+Doom was originally written by id software; when playing with any id main
+wad file, you can see their list of credits, which includes the list of
+programmers. After some years, they released the source code, to allow
+others to work on improving the game.
+
+One of the first projects was DosDoom, by Chi Hoang. This was a quick port
+of the released source code, which was for Linux, to DOS. This was then
+picked up by TeamTNT (http://www.teamtnt.com/), who produced Boom, a greatly
+debugged and extended version of Doom. The Boom programmers were Lee
+Killough, Jim Flynn, Rand Phares, Ty Halderman.
+
+Several projects started working from the Boom source code. One was PrBoom,
+made by Florian Schulze, that ported the code to Windows, added suport for
+higher resolutions and later OpenGL. Another was Marine's Best Friend
+(known as MBF) by Lee Killough, which fixed a lot of Boom bugs and added
+many new game features. Finally, there was LxDoom, a port of Boom to Linux
+by Colin Phipps.
+
+In October 1999, id Software re-released the Doom source code under the
+GNU General Public License. TeamTNT have also changed to the new license,
+and the other sources mentioned above have all allowed their code to be
+GPLed. So PrBoom is covered by the GPL.
+
+In May 2000, LxDoom, PrBoom, and a derived port called LSDLDoom, merged into
+one. The current authors of PrBoom are:
+
+Florian Schulze <florian.schulze@gmx.net>
+Colin Phipps <cph@moria.org.uk>
+Neil Stevens <neil@hakubi.us> - Mac OS X porting
+Andrey Budko <andrey.budko@gmail.com>
+Rob Young (RjY) <rjy@users.sourceforge.net>
+
+Our thanks go to all the authors of the ports mentioned above, and also the
+following people who contributed code to LxDoom or PrBoom:
+
+Jess Haas <JessH@lbjhs.net>
+Of LSDLdoom, who merged his project into PrBoom, contributing his SDL code.
+
+Nicolas Kalkhof	<nkalkhof@gmx.net>
+Much work on the OpenGL renderer.
+
+James "Quasar" Haley <haleyjd@concentric.net>
+Ever willing to talk about source ideas, and has pointed me in the direction of
+a lot of Boom and MBF bugs; also various bits code from his port Eternity have
+been used, such as the BEX enhancements.
+
+Bob Aman (sporkmonger.com)
+Created the RMUDAnsiTextView class used in the Mac launcher.
+
+Gady Kozma	gady@math.tau.ac.il
+Added hires to the SVGALib version of LxDoom, and other useful patches.
+
+Dick Leban
+Lots of feedback about portability issues and helping get the network code
+working properly back at v1.3.6.
+
+Eduardo Casino Almao
+Lots of helpful feedback and suggestions, but more importantly actually getting
+to grips with the code and giving very precise bug reports and patches.
+
+Joey Hess
+For numerous patches, like the glibc fixes and window manager updates, and
+help with the music.
+
+Ben Winslow
+Various useful patches, like the colour ENDOOM code.
+
+Josh Parsons	josh@schlick.anu.edu.au
+Sent me the patches to use autoconf for configuring LxDoom.
+
+Steve Van Devender <stevev@efn.org>
+Found the bug causing slight noise at the start of sounds playing, and other
+patches.
+
+Barry Mead <bmead15@cox.net>
+Improvements to the mouse code and other odd patches.
+
+Mattias Kunkel <mattias@kunkel.freeservers.com>
+Made the lxdoom.spec file for creating LxDoom RPMs.
+
+Vicente Aguilar	vicente@hal.dhis.org
+Handy patch for the file handling
+
+Benjamin L McGee <vuelto@netscape.net>
+Patch fixing the joystick code.
+
+Chris Young <young1@users.sourceforge.net>
+Patch improving the ENDOOM printing
+
+Peter Jay Salzman <p@belial.ucdavis.edu>
+Cleanup patches
+
+Oliver Kraus
+Send bug reports and patches for Solaris/Sparc.
+
+Paul S Jenner <psj@firstlinux.net>
+Nice patch to make RPM building easier
+
+Julian <julian@jplan.cjb.net>
+Fixed inline asm for gcc-2.95 (from Eternity)
+
+Lionel Ulmer <lionel.ulmer@free.fr>
+Patch to fix alignment problems on ARM processors.
+
+Ville Vuorinen <vv@ydin.org>
+Spotted and helped patch the player spawn bug, as well as helping with some
+Win32 issues.
+
+Steven Elliot <selliot4@users.sourceforge.net>
+Misc patches.
+
+Andreas Dehmel <zarquon@t-online.de>
+Spotted & patched a savegame bug.
+
+Jon Dowland
+Bug reports & fixes, documentation improvements.
+
+If you have sent in patches and I forgot to list you, I apologise. Please email
+me and I will add you.
+
+Also, thanks to the following people who have helped in various ways:
+
+Simon "fraggle" Howard <fraggle@alkali.org>
+More MBF bugs.
+
+Robert Phipps <rob@phipps.uklinux.net>
+Network game testing, feature suggestions etc.
+
+Udo Monk
+His port xdoom is very portable, and I referred to his code sometimes for help
+with the X stuff; also his collection of Doom tools (XWadTools) is the
+definitive tools collection for Linux.
+
+Andre Majorel	<amajorel@teaser.fr>
+For Yadex, so I can debug those problematic levels more easily.
+
+Michael Heasley
+Author of musserver, which helped me first add music support.
+
+Rafael Reilova
+Helped with the music server program for LxDoom
+
+Frederic Oghdayan
+For useful feedback on LxDoom v1.0.1, and repeating his bug reports until I
+believed them :-).
+
+Adam Hegyi <ha211@hszk.bme.hu>
+Prompted me to hunt down those last few demo sync bugs, and provided some useful
+insights and example demos to help.
+
+Adam Williamson
+Pointing me toward yet another compatibility bug.
+
+Ingo van Lil
+Another bug spotter.
+
+Everyone who contributed indirectly to MBF and Boom and Doom; see the
+respective documentation files.
+

components/doom/prboom/CMakeLists.txt

@@ -0,0 +1,19 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+set(COMPONENT_REQUIRES "retro-go")
+register_component()
+
+# The PSRAM cache bug seems responsible for very odd bugs that I spent way too much time
+# trying to debug... In retro-go the fix is disabled because of the huge performance overhead
+# but I guess we'll have to live with it in at least the prboom-go module...
+
+rg_setup_compile_options(
+    -Wno-error=address
+    -Wno-misleading-indentation
+    -Wno-format-overflow
+    -Wno-char-subscripts
+    -Wno-missing-field-initializers
+    -mfix-esp32-psram-cache-issue
+    -DHAVE_CONFIG_H
+    -O2
+)