Add emscripten support for BlastEm patch

Author: joeyparrish

emulator-patches/blastem-0.6.2.patch

@@ -1,4 +1,4 @@
-commit afd33eaffc60bf38c895f370af0a683a6fe67aa2
+commit 9acf6e19a6633eeecb5feabd5fab0188468aa16e
 Author: Joey Parrish <[email protected]>
 Date:   Wed Mar 27 07:39:28 2024 -0700
 
@@ -21,7 +21,7 @@ index 0000000..8f39f7f
 +zdis
 +kinetoscope
 diff --git a/Makefile b/Makefile
-index 0dddc9f..4655371 100644
+index 0dddc9f..cfa4645 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -23,11 +23,11 @@ ifeq ($(CPU),i686)
@@ -38,21 +38,7 @@ index 0dddc9f..4655371 100644
  GLUDIR:=x64
  endif
  GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/$(GLUDIR)/glew32s.lib
-@@ -39,6 +39,13 @@ LDFLAGS+= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lSDL2main -lSDL2 -lopengl32 -lg
- endif
- LIBZOBJS=$(BUNDLED_LIBZ)
- 
-+# Static libcurl for kinetoscope emulation
-+CFLAGS+= -Icurl/include -DCURL_STATICLIB
-+LDFLAGS+= curl/lib/.libs/libcurl.a
-+# Pthread for kinetoscope emulation
-+CFLAGS+= -pthread
-+LDFLAGS+= -pthread
-+
- else
- 
- MEM:=mem.o
-@@ -96,10 +103,11 @@ LDFLAGS:=-lm glew/lib/libGLEW.a
+@@ -96,10 +96,11 @@ LDFLAGS:=-lm glew/lib/libGLEW.a
  endif
 
  ifeq ($(OS),Darwin)
@@ -68,54 +54,59 @@ index 0dddc9f..4655371 100644
  else
  SDL_INCLUDE_PATH:=sdl/include
  LDFLAGS+= -Wl,-rpath='$$ORIGIN/lib' -Llib -lSDL2
-@@ -109,6 +117,16 @@ endif
- endif #Darwin
- CFLAGS+= -I$(SDL_INCLUDE_PATH)
+@@ -129,6 +130,38 @@ endif
+ endif #PORTABLE
+ endif #Windows
 
-+# Static libcurl for kinetoscope emulation
-+CFLAGS+= -Icurl/include
++
++# Kinetoscope code itself
++CFLAGS+= -I. -Ikinetoscope/software/player/inc/
++
++ifeq ($(PLATFORM),emscripten)
++CFLAGS+= -sMEMORY64=1
++LDFLAGS+= -sMEMORY64=1
++endif
++
++ifneq ($(PLATFORM),emscripten)
++# Curl, but only if it's not an emscripten environment
++ifdef PORTABLE
++# Static libcurl
++CFLAGS+= -Icurl/include -DCURL_STATICLIB
 +LDFLAGS+= curl/lib/.libs/libcurl.a
++else
++# System libcurl
++LDFLAGS+= $(shell curl-config --libs)
++endif
++endif
++
++# Pthread is required
++CFLAGS+= -pthread
++LDFLAGS+= -pthread
++
 +ifeq ($(OS),Darwin)
++# Needed for curl on macOS?
 +LDFLAGS+= -framework SystemConfiguration
 +endif #Darwin
-+# Pthread for kinetoscope emulation
-+CFLAGS+= -pthread
-+LDFLAGS+= -pthread
 +
- else
- ifeq ($(MAKECMDGOALS),libblastem.$(SO))
- LDFLAGS:=-lm
-@@ -126,6 +144,12 @@ LDFLAGS+= -framework OpenGL -framework AppKit
- endif
- endif
- 
-+# System libcurl for Kinetoscope emulation
-+LDFLAGS+= $(shell curl-config --libs)
-+# Pthread for kinetoscope emulation
-+CFLAGS+= -pthread
-+LDFLAGS+= -pthread
 +
- endif #PORTABLE
- endif #Windows
- 
-@@ -221,6 +245,7 @@ endif
++
+ ifndef OPT
+ ifdef DEBUG
+ OPT:=-g3 -O0
+@@ -221,10 +254,12 @@ endif
 
  MAINOBJS=blastem.o system.o genesis.o debug.o gdb_remote.o vdp.o $(RENDEROBJS) io.o romdb.o hash.o menu.o xband.o \
  	realtec.o i2c.o nor.o sega_mapper.o multi_game.o megawifi.o $(NET) serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o \
 +	kinetoscope/emulator-patches/kinetoscope.o \
  	$(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) saves.o zip.o bindings.o jcart.o gen_player.o
 
  LIBOBJS=libblastem.o system.o genesis.o debug.o gdb_remote.o vdp.o io.o romdb.o hash.o xband.o realtec.o \
-@@ -277,6 +302,8 @@ ifeq ($(MAKECMDGOALS),libblastem.$(SO))
- CFLAGS+= -fpic -DIS_LIB
- endif
- 
-+CFLAGS+= -I. -Ikinetoscope/software/player/inc/
-+
- all : $(ALL)
- 
- libblastem.$(SO) : $(LIBOBJS)
-@@ -366,7 +393,7 @@ m68k.c : m68k.cpu cpu_dsl.py
+ 	i2c.o nor.o sega_mapper.o multi_game.o megawifi.o $(NET) serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o \
++	kinetoscope/emulator-patches/kinetoscope.o \
+ 	$(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) saves.o jcart.o rom.db.o gen_player.o $(LIBZOBJS)
+ 	
+ ifdef NONUKLEAR
+@@ -366,7 +401,7 @@ m68k.c : m68k.cpu cpu_dsl.py
  	$(CC) $(CFLAGS) -c -o $@ $<
 
  %.png : %.xcf
@@ -124,11 +115,24 @@ index 0dddc9f..4655371 100644
 
  %.tiles : %.spec
  	./img2tiles.py -s $< $@
-@@ -393,3 +420,4 @@ tmss.md : font.tiles
+@@ -393,3 +428,4 @@ tmss.md : font.tiles
 
  clean :
  	rm -rf $(ALL) trans ztestrun ztestgen *.o nuklear_ui/*.o zlib/*.o
 +	rm -f kinetoscope/emulator-patches/kinetoscope.o
+diff --git a/Makefile.libretro b/Makefile.libretro
+index a8af9bc..f890d01 100644
+--- a/Makefile.libretro
++++ b/Makefile.libretro
+@@ -58,7 +58,7 @@ endif
+ 
+ 
+ core: $(OBJ)
+-	$(MAKE) $(target) OS=$(OS) CC=$(CC) CPU=$(ABI) LIBRETRO=$(LIBRETRO)
++	$(MAKE) $(target) OS=$(OS) CC=$(CC) CPU=$(ABI) LIBRETRO=$(LIBRETRO) PLATFORM=$(platform)
+ 	cp -v $(target) $(libname)
+ 
+ install: $(libname)
 diff --git a/build_release b/build_release
 index f5faa10..aa30c75 100755
 --- a/build_release

emulator-patches/kinetoscope.c

@@ -8,10 +8,16 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <curl/curl.h>
+#if defined(__EMSCRIPTEN__)
+# include <emscripten/fetch.h>
+#else
+# include <curl/curl.h>
+#endif
+
 #include <pthread.h>
 
 #include "genesis.h"
@@ -182,7 +188,7 @@ static void write_error_to_sram() {
 // Writes HTTP data to SRAM.
 static size_t http_data_to_sram(char* data, size_t size, size_t n, void* ctx) {
   if (global_compressed) {
-    rle_to_sram(data, size * n);
+    rle_to_sram((const uint8_t*)data, size * n);
   } else {
     write_sram(global_sram_offset, (const uint8_t*)data, size * n);
     global_sram_offset += size * n;
@@ -223,6 +229,7 @@ static bool fetch_range(const char* url, size_t first_byte, size_t size,
   // snprintf doesn't guarantee a terminator when it overflows.
   range[31] = '\0';
 
+#if !defined(__EMSCRIPTEN__)
   CURL* handle = curl_easy_init();
   curl_easy_setopt(handle, CURLOPT_URL, url);
   curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_callback);
@@ -245,6 +252,35 @@ static bool fetch_range(const char* url, size_t first_byte, size_t size,
   }
 
   return res == CURLE_OK && (http_code == 200 || http_code == 206);
+#else
+  emscripten_fetch_attr_t fetch_attributes;
+  emscripten_fetch_attr_init(&fetch_attributes);
+
+  strcpy(fetch_attributes.requestMethod, "GET");
+  fetch_attributes.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
+  fetch_attributes.attributes |= EMSCRIPTEN_FETCH_SYNCHRONOUS;
+
+  const char* headers[] = { "Range", range, NULL };
+  fetch_attributes.requestHeaders = headers;
+
+  emscripten_fetch_t *fetch = emscripten_fetch(&fetch_attributes, url);
+
+  int http_code = fetch->status;
+  printf("Kinetoscope: url = %s, http status = %d\n",
+         url, http_code);
+
+  bool ok = http_code == 200 || http_code == 206;
+  if (ok) {
+    write_callback(fetch->data, fetch->numBytes, 1, ctx);
+  } else {
+    char buf[64];
+    snprintf(buf, 64, "fetch error, code %d", http_code);
+    report_error(buf);
+  }
+
+  emscripten_fetch_close(fetch);
+  return ok;
+#endif
 }
 
 static bool fetch_range_to_sram(const char* url, size_t first_byte,
@@ -469,7 +505,9 @@ void kinetoscope_init(void *sram_buffer, uint32_t sram_size) {
   global_sram_buffer = sram_buffer;
   global_sram_size = sram_size;
 
+#if !defined(__EMSCRIPTEN__)
   curl_global_init(CURL_GLOBAL_ALL);
+#endif
 
   global_fetch_busy = false;
   pthread_create(&global_fetch_thread, NULL, fetch_thread, NULL);