Cambio logger.h -> Logger.h

git-svn-id: http://slack.codemaniacs.com/wenboi@7 0666ae3d-8926-0410-aeff-ae84559ff337

diff --git a/GBMemory.cc b/GBMemory.cc
index c9d1345af99a40c85ee100e82cce4d890dc472f2..a5786b3348d6cc872f307d95cd91284595c223d2 100644 (file)
--- a/GBMemory.cc
+++ b/GBMemory.cc
@@ -1,6 +1,7 @@
 #include "GBMemory.h"
 #include "MBC.h"
 #include "gbcore.h"
+#include "Logger.h"
 
 u8& GBMemory::operator[](unsigned int addr)
 {

diff --git a/Logger.cc b/Logger.cc
new file mode 100644 (file)
index 0000000..93bcd3f
--- /dev/null
+++ b/Logger.cc
@@ -0,0 +1,4 @@
+#include "Logger.h"
+#include <iostream>
+
+Logger Logger::instance(std::cerr);

diff --git a/logger.h b/Logger.h
similarity index 100%
rename from logger.h
rename to Logger.h

diff --git a/MBC.cc b/MBC.cc
index 112ffa3a1663df60107d1b6210afd79d696d2a6e..f208f73eca498d2e4b0e3567d3a0b362043bc6b9 100644 (file)
--- a/MBC.cc
+++ b/MBC.cc
@@ -1,5 +1,6 @@
 #include "MBC.h"
-#include "logger.h"
+#include "Logger.h"
+#include <cstring>
 
 using namespace cartridge_types;
 
@@ -14,3 +15,24 @@ MBC *create_MBC(GBRom *rom)
                        return 0;
        }
 }
+
+u8 NoMBC::operator[](unsigned int addr) const
+{
+       if (addr <= 0x7FFF)
+               return ROM[addr];
+       else if ((addr&0xE000) == 0xA000)   //(addr >= 0xA000 && addr <= 0xBFFF)
+               return RAM[addr-0xA000];
+       else
+               logger.error("NoMBC: Incorrect read");
+       return 0;
+}
+
+u8& NoMBC::operator[](unsigned int addr) 
+{
+       if ((addr&0xE000) == 0xA000)   //(addr >= 0xA000 && addr <= 0xBFFF)
+               return RAM[addr-0xA000];
+       else
+               logger.error("NoMBC: trying to write in ROM");
+       return *(static_cast<u8*>(0)); // Shouldn't happen
+}
+

diff --git a/MBC.h b/MBC.h
index 2f52f90e02372200243640557186647c8a3dac8e..81fd79f313d9d57b165806dac60e673fb27c0070 100644 (file)
--- a/MBC.h
+++ b/MBC.h
@@ -3,8 +3,6 @@
 
 #include "sized_types.h"
 #include "GBRom.h"
-#include "logger.h"
-#include <cstring>
 
 class MBC
 {
@@ -21,26 +19,9 @@ class NoMBC: public MBC
        
        public:
        NoMBC(GBRom *rom) { memcpy(ROM, rom->data, 32768); }
+       u8  operator[](unsigned int addr) const;
+       u8& operator[](unsigned int addr);
 
-       u8 operator[](unsigned int addr) const
-       {
-               if (addr <= 0x7FFF)
-                       return ROM[addr];
-               else if ((addr&0xE000) == 0xA000)   //(addr >= 0xA000 && addr <= 0xBFFF)
-                       return RAM[addr-0xA000];
-               else
-                       logger.error("NoMBC: Incorrect read");
-               return 0;
-       }
-
-       u8& operator[](unsigned int addr) 
-       {
-               if ((addr&0xE000) == 0xA000)   //(addr >= 0xA000 && addr <= 0xBFFF)
-                       return RAM[addr-0xA000];
-               else
-                       logger.error("NoMBC: trying to write in ROM");
-               return *(static_cast<u8*>(0)); // Shouldn't happen
-       }
 };
 
 

diff --git a/Makefile b/Makefile
index ca4ff790d43ec1f6dcef3a6ef5e57f572e293dd6..b442874620896c45176818334b0a22e6946b0451 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 CXXFLAGS=-g -Wall -Weffc++ -Wstrict-null-sentinel -Wold-style-cast \
         -Woverloaded-virtual 
 
-all: gbcore.o MBC.o GBMemory.o logger.o
+all: gbcore.o MBC.o GBMemory.o Logger.o
 
 tests: tests/test_gbrom
 
-logger.o: logger.cc logger.h
+Logger.o: Logger.cc Logger.h
        g++ $(CXXFLAGS) -c -o $@ $<
 
-GBMemory.o: GBMemory.cc GBMemory.h
+GBMemory.o: GBMemory.cc GBMemory.h Logger.h
        g++ $(CXXFLAGS) -c -o $@ $<
 
-MBC.o: MBC.cc MBC.h
+MBC.o: MBC.cc MBC.h Logger.h
        g++ $(CXXFLAGS) -c -o $@ $<
 
-gbcore.o: gbcore.cc gbcore.h GBRom.h logger.h MBC.h GBMemory.h
+gbcore.o: gbcore.cc gbcore.h GBRom.h Logger.h MBC.h GBMemory.h
        g++ $(CXXFLAGS) -c -o $@ $<
                
 tests/test_gbrom: GBRom.cc GBRom.h

diff --git a/gbcore.cc b/gbcore.cc
index f9875ac2e69123b744c6577a05d3b0b623c7a691..bbed7e7a88069db4f3547569e0f1fefdfb07590c 100644 (file)
--- a/gbcore.cc
+++ b/gbcore.cc
@@ -2,7 +2,7 @@
 
 #include "GBRom.h"
 #include "MBC.h"
-#include "logger.h"
+#include "Logger.h"
 #include <string>
 #include <cstring>