Move various io-related source files to src/io/ (#221)

* Move various io-related source files to src/io/ * Move string search functions out of util.c * Fix emzip builds * Move non-IO stuff back out of io/ * Fix hashtable.h/memcasecmp.h include guards
AliceLR · Apr 4, 2020 · 8fe56e0 · 8fe56e0
1 parent 0b0d153
commit 8fe56e0
Show file tree

Hide file tree

Showing 56 changed files with 383 additions and 271 deletions.
diff --git a/arch/emscripten/Makefile.in b/arch/emscripten/Makefile.in
@@ -62,18 +62,22 @@ clean:
 
 all: emzip.js
 
-# NOTE: hack, core_obj isn't defined yet...
-emzip.js: arch/emscripten/emzip.c src/.build/zip.o src/.build/vfs.o src/.build/util.o
+# NOTE: hack, core_obj and io_obj aren't defined yet...
+emzip_objs := \
+  src/.build/util.o \
+  src/io/.build/vfile.o \
+  src/io/.build/zip.o \
+  src/io/.build/zip_stream.o
+
+emzip.js: arch/emscripten/emzip.c ${emzip_objs}
 	$(if ${V},,@echo "  LINK    " $@)
 	${CC} -O3 \
 	-s ENVIRONMENT=web \
 	-s ALLOW_MEMORY_GROWTH=1 \
 	-s MODULARIZE=1 \
 	-s EXPORT_NAME="'emzip'" \
 	-s "EXPORTED_RUNTIME_METHODS=['_main', 'UTF8ToString']" \
-	arch/emscripten/emzip.c \
-	${core_obj}/zip.o ${core_obj}/vfs.o ${core_obj}/util.o \
-	${ZLIB_LDFLAGS} -o emzip.js
+	$< ${emzip_objs} ${ZLIB_LDFLAGS} -o $@
 
 # Normally not defined yet...
 build := build/${SUBPLATFORM}

diff --git a/arch/emscripten/emzip.c b/arch/emscripten/emzip.c
@@ -23,7 +23,7 @@
  * copied into module memory, but supports more decompression methods than UZIP.
  */
 
-#include "../../src/zip.h"
+#include "../../src/io/zip.h"
 #include <stdlib.h>
 #include <emscripten.h>
 

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -17,6 +17,9 @@ core_obj = src/.build
 audio_src = src/audio
 audio_obj = src/audio/.build
 
+io_src = src/io
+io_obj = src/io/.build
+
 network_src = src/network
 network_obj = src/network/.build
 
@@ -55,6 +58,10 @@ ${audio_obj}/%.o: ${audio_src}/%.cpp
 	$(if ${V},,@echo "  CXX     " $<)
 	${CC} -MD ${core_cxxflags} ${core_flags} ${core_spec} -c $< -o $@
 
+${io_obj}/%.o: ${io_src}/%.c
+	$(if ${V},,@echo "  CC      " $<)
+	${CC} -MD ${core_cflags} ${core_flags} ${core_spec} -c $< -o $@
+
 ${network_obj}/%.o: ${network_src}/%.c
 	$(if ${V},,@echo "  CC      " $<)
 	${CC} -MD ${core_cflags} ${core_flags} ${core_spec} -c $< -o $@
@@ -79,11 +86,9 @@ core_cobjs := \
   ${core_obj}/core.o              \
   ${core_obj}/counter.o           \
   ${core_obj}/data.o              \
-  ${core_obj}/dir.o               \
   ${core_obj}/error.o             \
   ${core_obj}/event.o             \
   ${core_obj}/expr.o              \
-  ${core_obj}/fsafeopen.o         \
   ${core_obj}/game.o              \
   ${core_obj}/game_menu.o         \
   ${core_obj}/game_ops.o          \
@@ -108,10 +113,13 @@ core_cobjs := \
   ${core_obj}/sprite.o            \
   ${core_obj}/str.o               \
   ${core_obj}/util.o              \
-  ${core_obj}/vfs.o               \
   ${core_obj}/window.o            \
   ${core_obj}/world.o             \
-  ${core_obj}/zip.o
+  ${io_obj}/dir.o                 \
+  ${io_obj}/fsafeopen.o           \
+  ${io_obj}/vfile.o               \
+  ${io_obj}/zip.o                 \
+  ${io_obj}/zip_stream.o
 
 #
 # Lists mandatory C++ language sources (mangled to object names) required
@@ -289,10 +297,6 @@ core_ldflags := $(LIBPNG_LDFLAGS) ${core_ldflags}
 core_cobjs += ${core_obj}/pngops.o
 endif
 
-ifeq (${BUILD_COUNTER_HASH_TABLES},1)
-core_flags += -Icontrib/khash/
-endif
-
 ifeq (${BUILD_AUDIO},1)
 audio_cobjs := \
  ${audio_obj}/audio.o          \
@@ -381,6 +385,7 @@ core_objs := ${core_cobjs} ${core_cxxobjs}
 
 ${core_objs}: | $(filter-out $(wildcard ${core_obj}), ${core_obj})
 ${core_objs}: | $(filter-out $(wildcard ${audio_obj}), ${audio_obj})
+${core_objs}: | $(filter-out $(wildcard ${io_obj}), ${io_obj})
 ${core_objs}: | $(filter-out $(wildcard ${network_obj}), ${network_obj})
 
 ifeq (${BUILD_MODULAR},1)
@@ -475,8 +480,8 @@ ${mzxrun}.debug:
 endif
 
 mzx_clean: core_target_clean gdm2s3m_clean icons_clean libmodplug_clean libxmp_clean
-	$(if ${V},,@echo "  RM      " ${core_obj} ${audio_obj} ${network_obj})
-	${RM} -r ${core_obj} ${audio_obj} ${network_obj}
+	$(if ${V},,@echo "  RM      " ${core_obj} ${audio_obj} ${io_obj} ${network_obj})
+	${RM} -r ${core_obj} ${audio_obj} ${io_obj} ${network_obj}
 	$(if ${V},,@echo "  RM      " ${mzxrun} ${mzxrun}.debug)
 	${RM} ${mzxrun} ${mzxrun}.debug
 	$(if ${V},,@echo "  RM      " ${mzx} ${mzx}.debug)

diff --git a/src/audio/audio.c b/src/audio/audio.c
@@ -35,9 +35,9 @@
 
 #include "../configure.h"
 #include "../data.h"
-#include "../fsafeopen.h"
 #include "../platform.h"
 #include "../util.h"
+#include "../io/fsafeopen.h"
 
 #if defined(CONFIG_MODPLUG) + defined(CONFIG_MIKMOD) + \
  defined(CONFIG_XMP) + defined(CONFIG_OPENMPT) > 1

diff --git a/src/audio/audio_modplug.cpp b/src/audio/audio_modplug.cpp
@@ -30,8 +30,8 @@
 #include "sampled_stream.h"
 
 #include "../const.h"
-#include "../fsafeopen.h"
 #include "../util.h"
+#include "../io/fsafeopen.h"
 
 struct _ModPlugFile
 {

diff --git a/src/board.c b/src/board.c
@@ -25,14 +25,14 @@
 #include "board.h"
 #include "const.h"
 #include "error.h"
-#include "memfile.h"
 #include "legacy_board.h"
 #include "robot.h"
 #include "world.h"
 #include "world_format.h"
 #include "util.h"
 #include "world_struct.h"
-#include "zip.h"
+#include "io/memfile.h"
+#include "io/zip.h"
 
 
 static int save_board_info(struct board *cur_board, struct zip_archive *zp,

diff --git a/src/configure.c b/src/configure.c
@@ -21,18 +21,18 @@
 // Config file options, which can be given either through config.txt
 // or at the command line.
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <sys/stat.h>
 
 #include "configure.h"
 #include "counter.h"
 #include "event.h"
 #include "rasm.h"
-#include "fsafeopen.h"
 #include "util.h"
-#include "sys/stat.h"
+#include "io/fsafeopen.h"
 
 // Arch-specific config.
 #ifdef CONFIG_NDS

diff --git a/src/counter.c b/src/counter.c
@@ -40,7 +40,6 @@
 #include "data.h"
 #include "error.h"
 #include "event.h"
-#include "fsafeopen.h"
 #include "game_ops.h"
 #include "graphics.h"
 #include "idarray.h"
@@ -52,6 +51,8 @@
 #include "util.h"
 #include "world.h"
 #include "world_struct.h"
+#include "io/dir.h"
+#include "io/fsafeopen.h"
 
 #include "audio/audio.h"
 
@@ -62,7 +63,7 @@
  */
 
 #ifdef CONFIG_COUNTER_HASH_TABLES
-#include <khashmzx.h>
+#include "hashtable.h"
 HASH_SET_INIT(COUNTER, struct counter *, name, name_length)
 #endif
 

diff --git a/src/editor/Makefile.in b/src/editor/Makefile.in
@@ -39,6 +39,7 @@ editor_objs := \
   ${editor_obj}/robot.o         \
   ${editor_obj}/select.o        \
   ${editor_obj}/sfx_edit.o      \
+  ${editor_obj}/stringsearch.o  \
   ${editor_obj}/undo.o          \
   ${editor_obj}/window.o        \
   ${editor_obj}/world.o

diff --git a/src/editor/board.c b/src/editor/board.c
@@ -27,7 +27,7 @@
 #include "../world.h"
 #include "../world_format.h"
 #include "../util.h"
-#include "../zip.h"
+#include "../io/zip.h"
 
 #include "world.h"
 #include "configure.h"

diff --git a/src/editor/debug.c b/src/editor/debug.c
@@ -24,6 +24,7 @@
 #include "char_ed.h"
 #include "pal_ed.h"
 #include "robo_debug.h"
+#include "stringsearch.h"
 #include "window.h"
 
 #include "../core.h"
@@ -1240,8 +1241,8 @@ static boolean select_debug_var(struct debug_node *node, char *var_name,
 /******************/
 
 static boolean search_match(const char *var_text, const size_t var_text_length,
- const char *match_text, const int *match_text_index, const size_t match_length,
- int search_flags)
+ const char *match_text, const struct string_search_data *match_text_index,
+ const size_t match_length, int search_flags)
 {
   boolean ignore_case = (search_flags & VAR_SEARCH_CASESENS) == 0;
 
@@ -1262,7 +1263,7 @@ static boolean search_match(const char *var_text, const size_t var_text_length,
   }
   else
   {
-    if(boyer_moore_search(var_text, var_text_length, match_text, match_length,
+    if(string_search(var_text, var_text_length, match_text, match_length,
      match_text_index, ignore_case))
       return true;
   }
@@ -1272,8 +1273,8 @@ static boolean search_match(const char *var_text, const size_t var_text_length,
 
 static boolean search_vars(struct world *mzx_world, struct debug_node *node,
  struct debug_var **res_var, struct debug_node **res_node, int *res_pos,
- const char *match_text, const int *match_text_index, const size_t match_length,
- int search_flags, struct debug_var **stop_var)
+ const char *match_text, const struct string_search_data *match_text_index,
+ const size_t match_length, int search_flags, struct debug_var **stop_var)
 {
   boolean matched = false;
   struct debug_var *current;
@@ -1369,8 +1370,8 @@ static boolean search_vars(struct world *mzx_world, struct debug_node *node,
 
 static boolean search_node(struct world *mzx_world, struct debug_node *node,
  struct debug_var **res_var, struct debug_node **res_node, int *res_pos,
- const char *match_text, const int *match_text_index, const size_t match_length,
- int search_flags, struct debug_var **stop_var)
+ const char *match_text, const struct string_search_data *match_text_index,
+ const size_t match_length, int search_flags, struct debug_var **stop_var)
 {
   boolean r = false;
   int i;
@@ -1467,12 +1468,12 @@ static boolean search_debug(struct world *mzx_world, struct debug_node *node,
   struct debug_var *stop_var = NULL;
   boolean matched = false;
 
-  int match_text_index[256] = { 0 };
+  struct string_search_data match_text_index;
   boolean ignore_case = (search_flags & VAR_SEARCH_CASESENS) == 0;
 
   // Generate an index to help speed up substring searches.
   if(!(search_flags & VAR_SEARCH_EXACT))
-    boyer_moore_index(match_text, match_length, match_text_index, ignore_case);
+    string_search_index(match_text, match_length, &match_text_index, ignore_case);
 
   if(search_flags & VAR_SEARCH_WRAP)
   {
@@ -1492,12 +1493,12 @@ static boolean search_debug(struct world *mzx_world, struct debug_node *node,
   }
 
   matched = search_node(mzx_world, node, res_var, res_node, res_pos,
-   match_text, match_text_index, match_length, search_flags, &stop_var);
+   match_text, &match_text_index, match_length, search_flags, &stop_var);
 
   // Wrap? Try again from the start
   if(!matched && (search_flags & VAR_SEARCH_WRAP))
     matched = search_node(mzx_world, node, res_var, res_node, res_pos,
-     match_text, match_text_index, match_length, search_flags, &stop_var);
+     match_text, &match_text_index, match_length, search_flags, &stop_var);
 
   // If we stopped on a non-match, return false.
   if(*res_var == NULL)

diff --git a/src/editor/robo_debug.c b/src/editor/robo_debug.c
@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "robot.h"
 #include "robo_debug.h"
+#include "stringsearch.h"
 #include "window.h"
 
 #include "../core.h"
@@ -41,7 +42,7 @@ struct breakpoint
 {
   char match_name[ROBOT_NAME_SIZE];
   char match_string[61];
-  int index[256];
+  struct string_search_data index;
   int line_number;
   int match_name_len;
   int match_string_len;
@@ -242,8 +243,8 @@ static void new_breakpoint(struct world *mzx_world)
        num_breakpoints_allocated * sizeof(struct breakpoint *));
     }
 
-    boyer_moore_index(br->match_string, br->match_string_len,
-     br->index, true);
+    string_search_index(br->match_string, br->match_string_len,
+     &(br->index), true);
 
     breakpoints[num_breakpoints] = br;
     num_breakpoints++;
@@ -457,8 +458,8 @@ void __debug_robot_config(struct world *mzx_world)
 
             if(!edit_breakpoint_dialog(mzx_world, br, "Edit Breakpoint"))
             {
-              boyer_moore_index(br->match_string, br->match_string_len,
-               br->index, true);
+              string_search_index(br->match_string, br->match_string_len,
+               &(br->index), true);
             }
           }
           else
@@ -1205,8 +1206,8 @@ int __debug_robot_break(context *ctx, struct robot *cur_robot,
 
         // Try to find the match pattern in the line
         if(b->match_string_len)
-          if(!boyer_moore_search((void *)src_ptr, src_length,
-           (void *)b->match_string, b->match_string_len, b->index, true))
+          if(!string_search((void *)src_ptr, src_length,
+           (void *)b->match_string, b->match_string_len, &(b->index), true))
             continue;
 
         action = ACTION_MATCHED;