Various stuff (fixed some include paths, XML serialization for MIPStags, etc.)

git-svn-id: http://svn.purei.org/purei/trunk@421 b36208d7-6611-0410-8bec-b1987f11c4a2

Source/MIPSTags.cpp

@@ -1,6 +1,7 @@
 #include "MIPSTags.h"
 #include "PtrMacro.h"
 #include "StdStream.h"
+#include "lexical_cast_ex.h"
 
 using namespace Framework;
 using namespace std;
@@ -107,6 +108,23 @@ void CMIPSTags::Unserialize(const char* sPath)
 	}
 }
 
+void CMIPSTags::Serialize(Xml::CNode* parentNode)
+{
+	for(TagMap::const_iterator itTag(m_Tags.begin());
+		itTag != m_Tags.end(); itTag++)
+	{
+        Xml::CNode* node = new Xml::CNode("tag", true);
+        node->InsertAttribute("address", lexical_cast_hex<string>(itTag->first, 8).c_str());
+        node->InsertAttribute("value", itTag->second.c_str());
+        parentNode->InsertNode(node);
+	}
+}
+
+void CMIPSTags::Unserialize(Xml::CNode* parentNode)
+{
+
+}
+
 CMIPSTags::TagIterator CMIPSTags::GetTagsBegin() const
 {
 	return m_Tags.begin();

Source/MIPSTags.h

@@ -2,6 +2,7 @@
 #define _MIPSTAGS_H_
 
 #include "Types.h"
+#include "xml/Node.h"
 #include <map>
 #include <string>
 #include <boost/signal.hpp>
@@ -19,6 +20,8 @@ public:
 	void						            InsertTag(uint32, const char*);
 	void						            RemoveTags();
 	const char*					            Find(uint32);
+    void                                    Serialize(Framework::Xml::CNode*);
+    void                                    Unserialize(Framework::Xml::CNode*);
 	void						            Serialize(const char*);
 	void						            Unserialize(const char*);
 

Source/Ps2Const.h

@@ -8,14 +8,19 @@ namespace PS2
 	    EERAMSIZE = 0x02000000,
     };
 
-    enum IOPRAMSIZE
+    enum IOP_RAM_SIZE
     {
-        IOPRAMSIZE = 0x00400000,
+        IOP_RAM_SIZE = 0x00200000,
+    };
+
+    enum IOP_SCRATCH_SIZE
+    {
+		IOP_SCRATCH_SIZE = 0x00000400,
     };
 
     enum
     {
-        IOP_CLOCK_FREQUENCY = (44100 * 256 * 3),
+        IOP_CLOCK_FREQ = (44100 * 256 * 3),
     };
 
     enum EEBIOSSIZE
@@ -47,6 +52,11 @@ namespace PS2
     {
 	    MICROMEM1SIZE = 0x00004000,
     };
+
+    enum
+    {
+        SPU_RAM_SIZE = 0x00200000,
+    };
 }
 
 #endif

Source/iop/Iop_BiosBase.h

@@ -0,0 +1,21 @@
+#ifndef _IOP_BIOSBASE_H_
+#define _IOP_BIOSBASE_H_
+
+#include "Types.h"
+
+namespace Iop
+{
+    class CBiosBase
+    {
+    public:
+        virtual         ~CBiosBase() {}
+        virtual void    HandleException() = 0;
+        virtual void    HandleInterrupt() = 0;
+	    virtual void	CountTicks(uint32) = 0;
+
+    private:
+
+    };
+}
+
+#endif

Source/iop/Iop_Dmac.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include "Iop_Dmac.h"
-#include "Log.h"
-#include "iop/Iop_Intc.h"
+#include "Iop_Intc.h"
+#include "../Log.h"
 
 #define LOG_NAME ("iop_dmac")
 

Source/iop/Iop_RootCounters.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include "Iop_RootCounters.h"
 #include "Iop_Intc.h"
-#include "Log.h"
+#include "../Log.h"
 
 #define LOG_NAME ("iop_counters")
 

Source/iop/Iop_Spu.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <math.h>
 #include "Iop_Spu.h"
-#include "Log.h"
+#include "../Log.h"
 
 using namespace std;
 using namespace Iop;

Source/iop/Iop_Spu2.cpp

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include "Iop_Spu2.h"
-#include "Log.h"
+#include "../Log.h"
 
 #define LOG_NAME ("iop_spu2")
 

Source/iop/Iop_Spu2_Core.cpp

@@ -1,7 +1,7 @@
 #include <boost/lexical_cast.hpp>
 #include <assert.h>
 #include "Iop_Spu2_Core.h"
-#include "Log.h"
+#include "../Log.h"
 
 #define LOG_NAME_PREFIX ("iop_spu2_core_")
 #define SPU_BASE_SAMPLING_RATE (48000)

Source/iop/Iop_Spu2_Core.h

@@ -5,7 +5,7 @@
 #include <functional>
 #include <boost/utility.hpp>
 #include "Types.h"
-#include "iop/Iop_SpuBase.h"
+#include "Iop_SpuBase.h"
 
 namespace Iop
 {

Source/iop/Iop_SpuBase.cpp

@@ -1,6 +1,6 @@
 #include <cassert>
 #include <cmath>
-#include "Log.h"
+#include "../Log.h"
 #include "Iop_SpuBase.h"
 
 using namespace Iop;

Source/win32ui/ELFView.cpp

@@ -9,9 +9,14 @@ using namespace std;
 using namespace boost;
 
 CELFView::CELFView(HWND hParent) :
-COptionWnd<CMDIChild>(hParent, _T("ELF File Viewer"))
+COptionWnd<CMDIChild>(hParent, _T("ELF File Viewer")),
+m_pELF(NULL),
+m_pHeaderView(NULL),
+m_pSymbolView(NULL),
+m_pSectionView(NULL),
+m_pProgramView(NULL)
 {
-	m_pELF = NULL;
+
 }
 
 CELFView::~CELFView()

Source/win32ui/StdAfx.h

@@ -3,6 +3,7 @@
 
 #include <windows.h>
 
+#include <string>
 #include <vector>
 #include <list>
 #include <map>
@@ -15,5 +16,7 @@
 #include <boost/static_assert.hpp>
 
 #include "Types.h"
+#include "Stream.h"
+#include "xml/Node.h"
 
 #endif