FASTER

libgambatte/Makefile

@@ -0,0 +1,52 @@
+CXX = g++
+#CXXFLAGS = -Wall -I -Wno-multichar -O3
+CXXFLAGS = -Wall -Iinclude -Isrc -O3 -std=c++11 -fomit-frame-pointer -fno-exceptions
+TARGET = libgambatte.dll
+LDFLAGS = -shared -static-libgcc -static-libstdc++ $(CXXFLAGS)
+RM = rm
+CP = cp
+
+SRCS = \
+	src/cinterface.cpp \
+	src/cpu.cpp \
+	src/gambatte.cpp \
+	src/initstate.cpp \
+	src/interrupter.cpp \
+	src/interruptrequester.cpp \
+	src/memory.cpp \
+	src/mem/cartridge.cpp \
+	src/mem/memptrs.cpp \
+	src/mem/rtc.cpp \
+	src/newstate.cpp \
+	src/sound.cpp \
+	src/sound/channel1.cpp \
+	src/sound/channel2.cpp \
+	src/sound/channel3.cpp \
+	src/sound/channel4.cpp \
+	src/sound/duty_unit.cpp \
+	src/sound/envelope_unit.cpp \
+	src/sound/length_counter.cpp \
+	src/tima.cpp \
+	src/video.cpp \
+	src/video/lyc_irq.cpp \
+	src/video/ly_counter.cpp \
+	src/video/next_m0_time.cpp \
+	src/video/ppu.cpp \
+	src/video/sprite_mapper.cpp
+
+OBJS = $(SRCS:.cpp=.o)
+
+all: $(TARGET)
+
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CXXFLAGS)
+
+$(TARGET) : $(OBJS)
+	$(CXX) -o $@ $(LDFLAGS) $(OBJS)
+
+clean:
+	$(RM) $(OBJS)
+	$(RM) $(TARGET)
+	
+install:
+	$(CP) $(TARGET) ../output/dll

libgambatte/src/video/ppu.cpp

@@ -1475,17 +1475,6 @@ PPUPriv::PPUPriv(NextM0Time &nextM0Time, const unsigned char *const oamram, cons
 	std::memset(spwordList, 0, sizeof spwordList);
 }
 
-static void saveSpriteList(const PPUPriv &p, SaveState &ss) {
-	for (unsigned i = 0; i < 10; ++i) {
-		ss.ppu.spAttribList[i] = p.spriteList[i].attrib;
-		ss.ppu.spByte0List[i] = p.spwordList[i] & 0xFF;
-		ss.ppu.spByte1List[i] = p.spwordList[i] >> 8;
-	}
-	
-	ss.ppu.nextSprite    = p.nextSprite;
-	ss.ppu.currentSprite = p.currentSprite;
-}
-
 namespace {
 
 template<class T, class K, std::size_t start, std::size_t len>