Changeset 263 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Aug 5, 2007, 3:47:49 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• CodeGenerator.h (modified) (1 diff)
• Linker.h (modified) (1 diff)
• NativeCode.h (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -238 +238 @@
         }
         pNativeCode = &nativeCode;
+    }
+
+    void NextSourceLine()
+    {
+        pNativeCode->NextSourceLine();
     }
 

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -41 +41 @@
     }
 
+    const NativeCode &GetNativeCode() const
+    {
+        return nativeCode;
+    }
+
     void SetImageBase( DWORD imageBase )
     {

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -112 +112 @@
 typedef std::vector<Schedule> Schedules;
 
+#define CODETYPE_SYSTEMPROC     0x0001
+#define CODETYPE_DEBUGPROC      0x0002
+class SourceLine
+{
+    int lineNum;
+    long nativeCodePos;
+    long sourceCodePos;
+    DWORD codeType;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - SourceLine" );
+
+        ar & BOOST_SERIALIZATION_NVP( lineNum );
+        ar & BOOST_SERIALIZATION_NVP( nativeCodePos );
+        ar & BOOST_SERIALIZATION_NVP( sourceCodePos );
+        ar & BOOST_SERIALIZATION_NVP( codeType );
+    }
+
+public:
+    SourceLine( int lineNum, int nativeCodePos, int sourceCodePos, DWORD codeType )
+        : lineNum( lineNum )
+        , nativeCodePos( nativeCodePos )
+        , sourceCodePos( sourceCodePos )
+        , codeType( codeType )
+    {
+    }
+    SourceLine()
+    {
+    }
+
+    int GetLineNum() const
+    {
+        return lineNum;
+    }
+    long GetNativeCodePos() const
+    {
+        return nativeCodePos;
+    }
+    long GetSourceCodePos() const
+    {
+        return sourceCodePos;
+    }
+    void SetSourceCodePos( int sourceCodePos )
+    {
+        this->sourceCodePos = sourceCodePos;
+    }
+    DWORD GetCodeType() const
+    {
+        return codeType;
+    }
+    bool IsInSystemProc() const
+    {
+        return ( (codeType&CODETYPE_SYSTEMPROC) != 0 );
+    }
+    bool IsInDebugProc() const
+    {
+        return ( (codeType&CODETYPE_DEBUGPROC) != 0 );
+    }
+};
+typedef std::vector<SourceLine> SourceLines;
+
 class NativeCode
 {
@@ -118 +183 @@
     int size;
 
+    // リンカで解決しなければならないスケジュール
     Schedules schedules;
+
+    // ソースコード行番号とネイティブコード位置の対応情報
+    SourceLines sourceLines;
 
     // XMLシリアライズ用
@@ -132 +201 @@
         ar & BOOST_SERIALIZATION_NVP( size );
         ar & BOOST_SERIALIZATION_NVP( schedules );
+        ar & BOOST_SERIALIZATION_NVP( sourceLines );
 
         // 読み込み後の処理
@@ -163 +233 @@
         ar & BOOST_SERIALIZATION_NVP( size );
         ar & BOOST_SERIALIZATION_NVP( schedules );
+        ar & BOOST_SERIALIZATION_NVP( sourceLines );
     }
 
@@ -192 +263 @@
         Put( nativeCode, isOpBuffer );
     }
-    NativeCode( const char *codeBuffer, int size )
+    NativeCode( const char *codeBuffer, int size, bool isOpBuffer )
         : allocateSize( 8192 )
         , codeBuffer( (char *)malloc( allocateSize ) )
         , size( 0 )
     {
-        Put( codeBuffer, size );
+        Put( codeBuffer, size, isOpBuffer );
     }
     ~NativeCode()
@@ -214 +285 @@
     }
 
+    const char *GetCodeBuffer() const
+    {
+        return codeBuffer;
+    }
     int GetSize() const
     {
@@ -332 +407 @@
         ObpPlus();
     }
+
+    void NextSourceLine();
 };