try out precompiled headers for speed

Author: goblinhack

build/build.sh

@@ -273,6 +273,7 @@ LDLIBS="$LDLIBS -lSDL2_mixer"
 CONFIG_H=src/cfg.hpp
 echo "#include \"my_cfg.hpp\"" > $CONFIG_H
 C_FLAGS+=" -include cfg.hpp"
+rm -f src/precompiled.hpp.gch
 
 #
 # for backtraces, but it doesn't help much

src/Makefile

@@ -1,4 +1,5 @@
 include ../build/Makefile.template
+# CFLAGS+=-O0
 
 NAME=yelindor
 BUILD_DIR=../.o
@@ -33,12 +34,20 @@ $(OBJ_FILES): | $(BUILD_DIR)
 
 # custom compile command for each source file needed because object file
 # base names don't match source files that were in src/ subdirectories
-$(foreach x,$(CPP_SOURCES),\
-$(eval $(BUILD_DIR)/$(call obj_name,$x): $x ; $(CC) $(CFLAGS) $(DEP_FLAGS) -c -o $$@ $$<))
+
+PRECOMPILED_H := precompiled.hpp
+PRECOMPILED_H_OBJ := $(PRECOMPILED_H).gch
+
+%.hpp.gch: $(PRECOMPILED_H)
+		$(CC) $(CFLAGS) -c -o $@ $<
 
 $(foreach x,$(ASM_SOURCES),\
-$(eval $(BUILD_DIR)/$(call obj_name,$x): $x ; $(CC) $(DEP_FLAGS) -c -o $$@ $$<))
+$(eval $(BUILD_DIR)/$(call obj_name,$x): $x ;\
+  $(CC) $(CFLAGS) $(DEP_FLAGS) -c -o $$@ $$<))
 
+$(foreach x,$(CPP_SOURCES),\
+$(eval $(BUILD_DIR)/$(call obj_name,$x): $x | $(PRECOMPILED_H_OBJ) ;\
+  $(CC) -include $(PRECOMPILED_H) $(CFLAGS) $(DEP_FLAGS) -c -o $$@ $$<))
 
 # use file list instead of wildcard for link command so we don't accidentally
 # link with old object files for removed source files

src/globals.cpp

@@ -45,18 +45,6 @@ std::string g_opt_seed_name;
 int TILES_VISIBLE_ACROSS;
 int TILES_VISIBLE_DOWN;
 
-//
-// Map size
-//
-int MAP_HEIGHT;
-int MAP_WIDTH;
-
-//
-// Map room cells
-//
-int LEVEL_PH2_HEIGHT;
-int LEVEL_PH2_WIDTH;
-
 int g_last_logged_callframes_depth;
 
 void reset_globals(void)

src/main.cpp

@@ -28,6 +28,29 @@
 #include "my_tp.hpp"
 #include "my_wid_console.hpp"
 
+#include "my_callstack.hpp"
+
+#ifdef USE_THREADS
+#ifdef __MAIN__
+thread_local struct callframe callframes[ MAXCALLFRAME ];
+thread_local unsigned char    g_callframes_depth;
+#else
+extern thread_local struct callframe callframes[ MAXCALLFRAME ];
+extern thread_local unsigned char    g_callframes_depth;
+extern thread_local unsigned char    g_callframes_indent;
+#endif
+#else
+#ifdef __MAIN__
+struct callframe callframes[ MAXCALLFRAME ];
+unsigned char    g_callframes_depth;
+unsigned char    g_callframes_indent;
+#else
+extern struct callframe callframes[ MAXCALLFRAME ];
+extern unsigned char    g_callframes_depth;
+extern unsigned char    g_callframes_indent;
+#endif
+#endif
+
 static char **ARGV;
 
 static std::string original_program_name;

src/my_ramdisk.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <map>
-#include <string> // do not remove
+#include <string>
 
 using ramdisk_t = struct ramdisk_t_ {
   const unsigned char *data;

src/precompiled.hpp

@@ -0,0 +1,55 @@
+#include <SDL.h>
+#include <SDL_mixer.h>
+#include <array>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+#include <ctype.h>
+#include <errno.h>
+#include <fstream>
+#include <inttypes.h>
+#include <iomanip>
+#include <iostream>
+#include <limits.h>
+#include <list>
+#include <locale.h>
+#include <map>
+#include <math.h>
+#include <memory>
+#include <signal.h>
+#include <sstream>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <strings.h>
+#include <sys/param.h>
+#include <sys/prctl.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+#include <vector>
+
+#include "my_audio.hpp"
+#include "my_command.hpp"
+#include "my_dir.hpp"
+#include "my_file.hpp"
+#include "my_font.hpp"
+#include "my_game.hpp"
+#include "my_gfx.hpp"
+#include "my_level.hpp"
+#include "my_level_data.hpp"
+#include "my_music.hpp"
+#include "my_ramdisk.hpp"
+#include "my_random.hpp"
+#include "my_sdl_proto.hpp"
+#include "my_sound.hpp"
+#include "my_thing.hpp"
+#include "my_thing_id.hpp"
+#include "my_tp.hpp"
+#include "my_tps.hpp"
+#include "my_wid_console.hpp"

src/ramdisk_read.cpp

@@ -2,11 +2,9 @@
 // Copyright Neil McGill, goblinhack@gmail.com
 //
 
-#include <string.h>
-
 #include "my_main.hpp"
-#include "my_ptrcheck.hpp"
 #include "my_ramdisk.hpp"
+#include <string.h>
 
 std::map< std::string, ramdisk_t_ > ramdisk_data;