Support for savestate versioning. Plenty of cleanups.

1 files changed, 124 insertions, 142 deletions

diff --git a/Makefile b/Makefile
index 7b1edbb..d53269e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,108 +1,102 @@
-DEBUG     = 0
-PERF_TEST = 0
-HAVE_GRIFFIN = 0
+DEBUG                 = 0
+PERF_TEST             = 0
+HAVE_GRIFFIN          = 0
 LOAD_FROM_MEMORY_TEST = 1
-USE_BLARGG_APU = 0
+USE_BLARGG_APU        = 0
 
 ifeq ($(platform),)
-platform = unix
+	platform = unix
 ifeq ($(shell uname -a),)
-   platform = win
+	platform = win
 else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   platform = osx
+	platform = osx
 	arch = intel
 ifeq ($(shell uname -p),powerpc)
 	arch = ppc
 endif
 else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   platform = win
+	platform = win
 endif
 endif
 
 # system platform
 system_platform = unix
 ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
+	EXE_EXT = .exe
+	system_platform = win
 else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
+	system_platform = osx
 	arch = intel
-ifeq ($(shell uname -p),powerpc)
-	arch = ppc
-endif
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
 else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
+	system_platform = win
 endif
 
 ifeq ($(USE_BLARGG_APU), 1)
-TARGET_NAME := snes9x2005_plus
+	TARGET_NAME := snes9x2005_plus
 else
-TARGET_NAME := snes9x2005
+	TARGET_NAME := snes9x2005
 endif
 GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
 ifneq ($(GIT_VERSION)," unknown")
 	CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
-DEFS        :=
-LIBM        := -lm
+DEFS :=
+LIBM := -lm
 
 ifeq ($(platform), unix)
-   TARGET := $(TARGET_NAME)_libretro.so
-   fpic := -fPIC
-   SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
-
-   CFLAGS += -fno-builtin \
-            -fno-exceptions -ffunction-sections
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
+	CFLAGS += -fno-builtin -fno-exceptions -ffunction-sections
 else ifeq ($(platform), linux-portable)
-   TARGET := $(TARGET_NAME)_libretro.so
-   fpic := -fPIC -nostdlib
-   SHARED := -shared -Wl,--version-script=link.T
-   CFLAGS += -fno-builtin \
-            -fno-exceptions -ffunction-sections
-	LIBM   :=
+	TARGET := $(TARGET_NAME)_libretro.so
+	fpic := -fPIC -nostdlib
+	SHARED := -shared -Wl,--version-script=link.T
+	CFLAGS += -fno-builtin -fno-exceptions -ffunction-sections
+	LIBM :=
 else ifeq ($(platform), osx)
-   TARGET := $(TARGET_NAME)_libretro.dylib
-   fpic := -fPIC
-   SHARED := -dynamiclib
+	TARGET := $(TARGET_NAME)_libretro.dylib
+	fpic := -fPIC
+	SHARED := -dynamiclib
 
 ifeq ($(arch),ppc)
 	FLAGS += -DMSB_FIRST
 	OLD_GCC = 1
 endif
-   OSXVER = `sw_vers -productVersion | cut -d. -f 2`
-   OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
-   fpic += -mmacosx-version-min=10.1
+	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+	fpic += -mmacosx-version-min=10.1
 ifndef ($(NOUNIVERSAL))
-   FLAGS += $(ARCHFLAGS)
-   LDFLAGS += $(ARCHFLAGS)
+	FLAGS += $(ARCHFLAGS)
+	LDFLAGS += $(ARCHFLAGS)
 endif
-
 # iOS
 else ifneq (,$(findstring ios,$(platform)))
-
-
-   TARGET := $(TARGET_NAME)_libretro_ios.dylib
-   fpic := -fPIC
-   SHARED := -dynamiclib
+	TARGET := $(TARGET_NAME)_libretro_ios.dylib
+	fpic := -fPIC
+	SHARED := -dynamiclib
 
 ifeq ($(IOSSDK),)
-   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+	IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
 endif
 
-   CC = cc -arch armv7 -isysroot $(IOSSDK)
-   CXX = c++ -arch armv7 -isysroot $(IOSSDK)
+	CC = cc -arch armv7 -isysroot $(IOSSDK)
+	CXX = c++ -arch armv7 -isysroot $(IOSSDK)
 ifeq ($(platform),ios9)
-   SHARED += -miphoneos-version-min=8.0
-   CC +=  -miphoneos-version-min=8.0
-   CXX +=  -miphoneos-version-min=8.0
+	SHARED += -miphoneos-version-min=8.0
+	CC +=  -miphoneos-version-min=8.0
+	CXX +=  -miphoneos-version-min=8.0
 else
-   SHARED += -miphoneos-version-min=5.0
-   CC +=  -miphoneos-version-min=5.0
-   CXX +=  -miphoneos-version-min=5.0
+	SHARED += -miphoneos-version-min=5.0
+	CC +=  -miphoneos-version-min=5.0
+	CXX +=  -miphoneos-version-min=5.0
 endif
+# Theos iOS
 else ifeq ($(platform), theos_ios)
-	# Theos iOS
 DEPLOYMENT_IOSVERSION = 5.0
 TARGET = iphone:latest:$(DEPLOYMENT_IOSVERSION)
 ARCHS = armv7 armv7s
@@ -113,132 +107,121 @@ include $(THEOS)/makefiles/common.mk
 LIBRARY_NAME = $(TARGET_NAME)_libretro_ios
 
 else ifeq ($(platform), qnx)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).so
-   fpic := -fPIC
-   SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
+	TARGET := $(TARGET_NAME)_libretro_$(platform).so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
 	CC = qcc -Vgcc_ntoarmv7le
 	CXX = QCC -Vgcc_ntoarmv7le_cpp
-
 # PS3
 else ifeq ($(platform), ps3)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
-   CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-   CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
-   AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
-   STATIC_LINKING = 1
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
+	AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
+	STATIC_LINKING = 1
 	FLAGS += -DMSB_FIRST
 	OLD_GCC = 1
-
 # PS3 (SNC)
 else ifeq ($(platform), sncps3)
-   TARGET := $(TARGET_NAME)_libretro_ps3.a
-   CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-   CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-   AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-   STATIC_LINKING = 1
+	TARGET := $(TARGET_NAME)_libretro_ps3.a
+	CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
+	STATIC_LINKING = 1
 	FLAGS += -DMSB_FIRST
 	NO_GCC = 1
-
 # PSP1
 else ifeq ($(platform), psp1)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
 	CC = psp-gcc$(EXE_EXT)
 	CXX = psp-g++$(EXE_EXT)
 	AR = psp-ar$(EXE_EXT)
-   STATIC_LINKING = 1
+	STATIC_LINKING = 1
 	LOAD_FROM_MEMORY_TEST = 0
-	FLAGS += -G0 
-   CFLAGS += -march=allegrex -mno-abicalls -fno-pic -fno-builtin \
-				 -fno-exceptions -ffunction-sections
-	DEFS   +=  -DPSP -D_PSP_FW_VERSION=371
-   STATIC_LINKING := 1
-
+	FLAGS += -G0
+	CFLAGS += \
+		-march=allegrex -mno-abicalls -fno-pic \
+		-fno-builtin -fno-exceptions -ffunction-sections
+	DEFS +=  -DPSP -D_PSP_FW_VERSION=371
+	STATIC_LINKING := 1
 # Vita
 else ifeq ($(platform), vita)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
 	CC = arm-vita-eabi-gcc$(EXE_EXT)
 	CXX = arm-vita-eabi-g++$(EXE_EXT)
 	AR = arm-vita-eabi-ar$(EXE_EXT)
-   STATIC_LINKING = 1
+	STATIC_LINKING = 1
 	LOAD_FROM_MEMORY_TEST = 0
-	DEFS   +=  -DVITA
-   STATIC_LINKING := 1
-
+	DEFS +=  -DVITA
+	STATIC_LINKING := 1
 # CTR (3DS)
 else ifeq ($(platform), ctr)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
-   CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
-   CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
-   AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
-   CFLAGS += -DARM11 -D_3DS
-   CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard
-   CFLAGS += -Wall -mword-relocations
-   CFLAGS += -fomit-frame-pointer -ffast-math
-   CFLAGS += -D_3DS
-   PLATFORM_DEFINES := -D_3DS
-   STATIC_LINKING = 1
-
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
+	CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
+	AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
+	CFLAGS += -DARM11 -D_3DS
+	CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard
+	CFLAGS += -Wall -mword-relocations
+	CFLAGS += -fomit-frame-pointer -ffast-math
+	CFLAGS += -D_3DS
+	PLATFORM_DEFINES := -D_3DS
+	STATIC_LINKING = 1
 # Nintendo Game Cube
 else ifeq ($(platform), ngc)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-   CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
-   CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
-   STATIC_LINKING = 1
-
+	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+	CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
+	CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
+	STATIC_LINKING = 1
 # Nintendo Wii
 else ifeq ($(platform), wii)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
-   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-   CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
-   CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
-   STATIC_LINKING = 1
-
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+	CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
+	CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
+	STATIC_LINKING = 1
 # Nintendo WiiU
 else ifeq ($(platform), wiiu)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).a
-   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-   CFLAGS += -DGEKKO -DWIIU -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
-   CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
-   STATIC_LINKING = 1
-
+	TARGET := $(TARGET_NAME)_libretro_$(platform).a
+	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+	CFLAGS += -DGEKKO -DWIIU -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
+	CFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
+	STATIC_LINKING = 1
 else ifeq ($(platform), emscripten)
-   TARGET := $(TARGET_NAME)_libretro_$(platform).bc
-   STATIC_LINKING = 1
-
+	TARGET := $(TARGET_NAME)_libretro_$(platform).bc
+	STATIC_LINKING = 1
 # GCW0
 else ifeq ($(platform), gcw0)
-   TARGET := $(TARGET_NAME)_libretro.so
-   CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc
-   CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
-   AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
-   fpic := -fPIC -nostdlib
-   SHARED := -shared -Wl,--version-script=link.T
-   
-   LIBM   :=
-   LOAD_FROM_MEMORY_TEST = 0
-   CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
-
+	TARGET := $(TARGET_NAME)_libretro.so
+	CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc
+	CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
+	AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
+	fpic := -fPIC -nostdlib
+	SHARED := -shared -Wl,--version-script=link.T
+	LIBM :=
+	LOAD_FROM_MEMORY_TEST = 0
+	CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
 else
-   TARGET := $(TARGET_NAME)_libretro.dll
-   CC = gcc
-   CXX = g++
-   SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
-   LDFLAGS += -static-libgcc -static-libstdc++ -lwinmm
+	TARGET := $(TARGET_NAME)_libretro.dll
+	CC = gcc
+	CXX = g++
+	SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
+	LDFLAGS += -static-libgcc -static-libstdc++ -lwinmm
 endif
 
 LDFLAGS += $(LIBM)
 
-CORE_DIR     := ./source
+CORE_DIR := ./source
 LIBRETRO_DIR := .
 
 include Makefile.common
 
 ifeq ($(platform), psp1)
-   INCFLAGS     += -I$(shell psp-config --pspsdk-path)/include
+	INCFLAGS += -I$(shell psp-config --pspsdk-path)/include
 endif
 
 OBJECTS := $(SOURCES_C:.c=.o)
@@ -247,15 +230,14 @@ LDFLAGS += $(fpic) $(SHARED)
 
 FLAGS += $(fpic)
 
-
 CXXFLAGS += $(FLAGS)
 CFLAGS += $(FLAGS)
 
 ifeq ($(platform), theos_ios)
-COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
-$(LIBRARY_NAME)_CFLAGS += $(COMMON_FLAGS) $(CFLAGS)
-${LIBRARY_NAME}_FILES = $(SOURCES_C)
-include $(THEOS_MAKE_PATH)/library.mk
+	COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
+	$(LIBRARY_NAME)_CFLAGS += $(COMMON_FLAGS) $(CFLAGS)
+	${LIBRARY_NAME}_FILES = $(SOURCES_C)
+	include $(THEOS_MAKE_PATH)/library.mk
 else
 all: $(TARGET)
 $(TARGET): $(OBJECTS)