util.cc created, Makefile updated

diff --git a/Makefile b/Makefile
index 0e9f583d0bf8d0dcf0fc92f4fa173836c67f053e..f135bf6ab7ee3d2199028d2a01c4cd64ae48ec88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,23 +6,27 @@ all: tests
 
 tests: tests/test_gbrom tests/test_core
 
-GBVideo.o: GBVideo.cc GBVideo.h Logger.h util.h
+util.o: util.cc util.h
        g++ $(CXXFLAGS) -c -o $@ $<
 
-GBMemory.o: GBMemory.cc GBMemory.h Logger.h
+GBVideo.o: GBVideo.cc GBVideo.h Logger.h util.h gbcore.h
+       g++ $(CXXFLAGS) -c -o $@ $<
+
+GBMemory.o: GBMemory.cc GBMemory.h Logger.h MBC.h gbcore.h
        g++ $(CXXFLAGS) -c -o $@ $<
 
 MBC.o: MBC.cc MBC.h Logger.h
        g++ $(CXXFLAGS) -c -o $@ $<
 
 gbcore.o: gbcore.cc gbcore.h opcodes.h disasm.h \
-       GBRom.h Logger.h MBC.h GBMemory.h
+       GBRom.h Logger.h MBC.h GBMemory.h util.h
        g++ $(CXXFLAGS) -c -o $@ $<
                
 tests/test_gbrom: GBRom.cc GBRom.h 
        g++ $(CXXFLAGS) $(LDFLAGS) -DTEST_GBROM -o $@ GBRom.cc 
 
-tests/test_core: tests/test_core.cc gbcore.o MBC.o GBMemory.o GBRom.o GBVideo.o
+tests/test_core: tests/test_core.cc gbcore.o MBC.o GBMemory.o GBRom.o \
+       GBVideo.o util.o
        g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $^
 
 clean:

diff --git a/util.cc b/util.cc
new file mode 100644 (file)
index 0000000..9258de7
--- /dev/null
+++ b/util.cc
@@ -0,0 +1,26 @@
+#include "util.h"
+
+uint32 set_bit(uint32 val, uint32 pos)
+{
+       uint32 mask = 1<<pos;
+       return val | mask;
+}
+
+uint32 reset_bit(uint32 val, uint32 pos)
+{
+       uint32 mask = ~(1<<pos);
+       return val & mask;
+}
+
+uint32 flip_bit(uint32 val, uint32 pos)
+{
+       uint32 mask = 1<<pos;
+       return val ^ mask;
+}
+
+bool check_bit(uint32 val, uint32 pos)
+{
+       uint32 mask = 1<<pos;
+       return ((val&mask) != 0);
+}
+

diff --git a/util.h b/util.h
index 31c45d16933aac23bf39564fa96ff1c24158ae52..52fd175183259b21653b0366ff5ce14dbb49142a 100644 (file)
--- a/util.h
+++ b/util.h
@@ -3,29 +3,10 @@
 
 #include "sized_types.h"
 
-uint32 set_bit(uint32 val, uint32 pos)
-{
-       uint32 mask = 1<<pos;
-       return val | mask;
-}
-
-uint32 reset_bit(uint32 val, uint32 pos)
-{
-       uint32 mask = ~(1<<pos);
-       return val & mask;
-}
-
-uint32 flip_bit(uint32 val, uint32 pos)
-{
-       uint32 mask = 1<<pos;
-       return val ^ mask;
-}
-
-bool check_bit(uint32 val, uint32 pos)
-{
-       uint32 mask = 1<<pos;
-       return ((val&mask) != 0);
-}
+uint32 set_bit(uint32 val, uint32 pos);
+uint32 reset_bit(uint32 val, uint32 pos);
+uint32 flip_bit(uint32 val, uint32 pos);
+bool check_bit(uint32 val, uint32 pos);
 
 #endif