wip using pool allocator for better memory performance accross emulators without having to (re-)allocate the romdata which can fail. update to use menu mutex and to make images spans instead of vectors for better memory performance

Author: finger563

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:

components/doom/include/doom.hpp

@@ -1,13 +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(std::string_view save_path);
-void save_doom(std::string_view save_path);
+void load_doom(int save_slot);
+void save_doom(int save_slot);
 void run_doom_rom();
 void deinit_doom();
-std::vector<uint8_t> get_doom_video_buffer();
+std::span<uint8_t> get_doom_video_buffer();

components/doom/prboom/lprintf.c

@@ -74,8 +74,7 @@ void I_Error(const char *error, ...)
 {
   va_list arg;
   va_start(arg, error);
-  char buffer[256];
-  vsnprintf(buffer, sizeof(buffer), error, arg);
+  vprintf(error, arg);
   va_end(arg);
-  abort();
+  // abort();
 }

components/doom/prboom/m_menu.c

@@ -59,7 +59,7 @@
 #include "r_demo.h"
 #include "r_fps.h"
 
-extern patchnum_t hu_font[HU_FONTSIZE];
+extern patchnum_t *hu_font; // [HU_FONTSIZE];
 
 int showMessages;           // Show messages has default, 0 = off, 1 = on
 bool inhelpscreens;      // indicates we are in or just left a help screen

components/doom/prboom/m_misc.c

@@ -680,7 +680,7 @@ struct default_s *M_LookupDefault(const char *name)
   for (int i = 0 ; i < numdefaults ; i++)
     if ((defaults[i].type != def_none) && !strcmp(name, defaults[i].name))
       return (default_t*)&defaults[i];
-  I_Error("M_LookupDefault: %s not found",name);
+  // I_Error("M_LookupDefault: '%s' not found\n",name);
   return NULL;
 }
 
@@ -690,6 +690,17 @@ struct default_s *M_LookupDefault(const char *name)
 
 void M_LoadDefaults(void)
 {
+  // set everything to base values
+  for (int i = 0 ; i < numdefaults ; i++) {
+    if (defaults[i].type == def_str && defaults[i].location.ppsz)
+      *defaults[i].location.ppsz = strdup(defaults[i].defaultvalue.psz);
+    if (defaults[i].type != def_str && defaults[i].location.pi)
+      *defaults[i].location.pi = defaults[i].defaultvalue.i;
+  }
+
+  // return early since we have no config file
+  return;
+
   // check for a custom default file
   int i = M_CheckParm ("-config");
   if (i && i < myargc-1)
@@ -699,14 +710,6 @@ void M_LoadDefaults(void)
     configfile = strcat(strcpy(malloc(strlen(exedir) + 32), exedir), "/prboom.cfg");
   }
 
-  // set everything to base values
-  for (int i = 0 ; i < numdefaults ; i++) {
-    if (defaults[i].type == def_str && defaults[i].location.ppsz)
-      *defaults[i].location.ppsz = strdup(defaults[i].defaultvalue.psz);
-    if (defaults[i].type != def_str && defaults[i].location.pi)
-      *defaults[i].location.pi = defaults[i].defaultvalue.i;
-  }
-
   // read the file in, overriding any set defaults
   FILE* f = fopen(configfile, "r");
   if (!f)

components/doom/prboom/z_zone.c

@@ -175,6 +175,18 @@ void Z_Close(void)
   Z_FreeTags(PU_FREE, PU_MAX);
 }
 
+#include "pool_allocator.h"
+
+static void* my_malloc(size_t size)
+{
+  return pool_alloc(size);
+}
+
+static void my_free(void* p)
+{
+  pool_free(p);
+}
+
 void Z_Init(void)
 {
   // Nothing to do
@@ -202,7 +214,7 @@ void *(Z_Malloc)(size_t size, int tag, void **user DA(const char *file, int line
 
   size = (size+CHUNK_SIZE-1) & ~(CHUNK_SIZE-1);  // round to chunk size
 
-  while (!(block = (malloc)(size + HEADER_SIZE))) {
+  while (!(block = (my_malloc)(size + HEADER_SIZE))) {
     if (!blockbytag[PU_CACHE])
       I_Error ("Z_Malloc: Failure trying to allocate %lu bytes"
 #ifdef INSTRUMENTED
@@ -304,7 +316,7 @@ void (Z_Free)(void *p DA(const char *file, int line))
   memset(block, gametic & 0xff, block->size + HEADER_SIZE);
 #endif
 
-  (free)(block);
+  (my_free)(block);
 
 #ifdef INSTRUMENTED
       Z_DrawStats();           // print memory allocation stats