Changeset 264 in dev for trunk

Timestamp:

Aug 6, 2007, 9:31:22 AM (17 years ago)

Author:

dai_9181

Message:

デバッグデータとしてオブジェクトモジュールのシリアライズを可能にした（その先の処理はまだ動かない）

Location:

trunk/abdev/BasicCompiler_Common

Files:

• DebugMiddleFile.cpp (modified) (2 diffs)
• include/BoostSerializationSupport.h (modified) (1 diff)
• src/BoostSerializationSupport.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -76 +76 @@
     *(long *)(buffer+i2)=PLATFORM;
     i2+=sizeof(long);
+
+
+    // オブジェクトモジュール
+    {
+        // テキストデータにシリアライズ
+        std::string textString;
+        compiler.objectModule.WriteTextString( textString );
+
+        // サイズ
+        *(long *)(buffer+i2) = textString.size();
+        i2+=sizeof(long);
+
+        //バッファが足りない場合は再確保
+        if(BufferSize<i2+(int)textString.size()+32768){
+            while( BufferSize<i2+(int)textString.size()+32768 )
+            {
+                BufferSize+=32768;
+            }
+
+            buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
+        }
+
+        // バッファ
+        memcpy( buffer+i2, textString.c_str(), textString.size() );
+        i2 += textString.size();
+    }
+
 
     //インクルード情報
@@ -475 +502 @@
     i2+=sizeof(long);
 
+    MessageBox(0,"test","test",0);
+
+    // オブジェクトモジュール
+    {
+        // サイズ
+        int size = *(long *)(buffer+i2);
+        i2 += sizeof(long);
+
+        // バッファ
+        const std::string textString( (const char *)(buffer + i2), size );
+        i2 += textString.size();
+
+        // テキストデータからシリアライズ
+        this->objectModule.ReadTextString( textString );
+    }
+
     //インクルード情報
     IncludeFileInfo.FilesNum=*(long *)(buffer+i2);

trunk/abdev/BasicCompiler_Common/include/BoostSerializationSupport.h

@@ -23 +23 @@
     bool ReadXml( istream& ifs, bool isShowExceptionMessage = true );
     bool WriteXml( ostream& ofs, bool isShowExceptionMessage = true ) const;
-    bool ReadXml( const string &xmlFilePath, bool isShowExceptionMessage = true );
-    bool WriteXml( const string &xmlFilePath, bool isShowExceptionMessage = true ) const;
+    bool ReadXml( const std::string &xmlFilePath, bool isShowExceptionMessage = true );
+    bool WriteXml( const std::string &xmlFilePath, bool isShowExceptionMessage = true ) const;
 
-    bool ReadBinary( const string &filePath, bool isShowExceptionMessage = true );
-    bool WriteBinary( const string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadBinary( const std::string &filePath, bool isShowExceptionMessage = true );
+    bool WriteBinary( const std::string &filePath, bool isShowExceptionMessage = true ) const;
 
-    bool ReadText( const string &filePath, bool isShowExceptionMessage = true );
-    bool WriteText( const string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadText( const std::string &filePath, bool isShowExceptionMessage = true );
+    bool WriteText( const std::string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadTextString( const std::string &textString );
+    bool WriteTextString( std::string &textString ) const;
 
-    bool ReadXmlFromString( const string &xmlBuffer );
+    bool ReadXmlFromString( const std::string &xmlBuffer );
 };
 

trunk/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -270 +270 @@
 }
 
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXmlFromString( const string &xmlBuffer )
-{
-    bool isSuccessful = false;
-
-    // 入力アーカイブの作成
-    std::istringstream iss( xmlBuffer );
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadTextString( const std::string &textString )
+{
+    bool isSuccessful = false;
+
+    // 入力アーカイブの作成
+    std::istringstream iss( textString );
+
+    try{
+        boost::archive::text_iarchive ia(iss);
+
+        // 文字列ストリームから読込
+        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+
+        isSuccessful = true;
+    }
+    catch(...){
+        // 失敗
+    }
+
+    if( !isSuccessful )
+    {
+        return false;
+    }
+
+    return true;
+}
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteTextString( std::string &textString ) const
+{
+    // 出力アーカイブの作成
+    std::ostringstream oss;
+
+    bool isSuccessful = false;
+    try{
+        boost::archive::text_oarchive oa(oss);
+
+        // 文字列ストリームに書き出し
+        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception e )
+    {
+        echo( e.what() );
+    }
+    catch(...){
+        echo( "archive_exception以外の不明な例外" );
+    }
+
+    if( !isSuccessful )
+    {
+        return false;
+    }
+
+    textString = oss.str();
+
+    return true;
+}
+
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXmlFromString( const std::string &textString )
+{
+    bool isSuccessful = false;
+
+    // 入力アーカイブの作成
+    std::istringstream iss( textString );
 
     try{