Changeset 743 in dev for trunk/ab5.0

Timestamp:

Sep 7, 2008, 12:38:43 AM (16 years ago)

Author:

dai

Message:

oldSourceLinesを排除。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/Debug.cpp (modified) (1 diff)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (8 diffs)
• BasicCompiler_Common/DebugSection.h (modified) (1 diff)
• BasicCompiler_Common/VarList.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/BreakPoint.h (modified) (2 diffs)
• BasicCompiler_Common/src/BreakPoint.cpp (modified) (5 diffs)
• compiler_x86/MakePeHdr.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/Compile.cpp

@@ -15 +15 @@
 //With情報
 WithInfos withInfos;
-
-//デバッグ用行番号情報
-SourceLines oldSourceLines;
 
 // オブジェクトモジュールリストに類似したソースコードリスト

trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp

@@ -114 +114 @@
         }
 
-        if(i2==iLineNum){
-            extern SourceLines oldSourceLines;
-
+        if(i2==iLineNum)
+        {
 loop:
             int tempCp = GetSourceCodeIndexFromLine( pNowSource->GetBuffer(), FileBaseLine+i2 );
 
+            const SourceLines &sourceLines = debugSectionCollection.GetCurrent()._oldSourceLines;
+
             int i3;
-            for(i3=0;i3<(int)oldSourceLines.size()-1;i3++){
-                if(oldSourceLines[i3].GetSourceCodePosition().GetPos()==tempCp) break;
-            }
-            if(i3==oldSourceLines.size()-1){
+            for( i3=0; i3<static_cast<int>(sourceLines.size()-1); i3++ )
+            {
+                if( sourceLines[i3].GetSourceCodePosition().GetPos() == tempCp )
+                {
+                    break;
+                }
+            }
+            if( i3 == sourceLines.size() - 1 )
+            {
                 i2--;
                 goto loop;
             }
 
-            StepCursorObpSchedule=oldSourceLines[i3].GetNativeCodePos();
+            StepCursorObpSchedule = sourceLines[i3].GetNativeCodePos();
             StepCursor_BackupChar=debugSectionCollection.GetCurrent().BreakStepCodeBuffer[StepCursorObpSchedule];
 

trunk/ab5.0/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -51 +51 @@
     }
 }
-void DebugSection::make(void){
+void DebugSection::make( const SourceLines &sourceLines )
+{
     int i2,BufferSize;
 
@@ -135 +136 @@
     // コードと行番号の関係
     ////////////////////////
-    extern SourceLines oldSourceLines;
-
-    *(long *)(buffer+i2)=(long)oldSourceLines.size();
-    i2+=sizeof(long);
-    BOOST_FOREACH( const SourceLine &sourceLine, oldSourceLines )
+    *(long *)(buffer+i2)=(long)sourceLines.size();
+    i2+=sizeof(long);
+    BOOST_FOREACH( const SourceLine &sourceLine, sourceLines )
     {
         *(long *)(buffer+i2) = sourceLine.GetNativeCodePos();
@@ -168 +167 @@
 }
 
-char *DebugSection::MakeSingleStepCode(void){
+char *DebugSection::MakeSingleStepCode(){
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,SizeOf_CodeSection);
@@ -187 +186 @@
     return buffer;
 }
-BOOL DebugSection::__load(void){
+BOOL DebugSection::__load(){
     int i2,i3;
 
@@ -294 +293 @@
     sourcesLinkRelationalObjectModule = this->_sourcesLinkRelationalObjectModule;
 
-    //コードと行番号の関係
-    extern SourceLines oldSourceLines;
-    oldSourceLines = this->_oldSourceLines;
-
-    BreakStepCodeBuffer=pobj_DBBreakPoint->update(OpBuffer,SizeOf_CodeSection);
+    BreakStepCodeBuffer=pobj_DBBreakPoint->update(OpBuffer,SizeOf_CodeSection, this->_oldSourceLines);
 
     //プロセスメモリにコピー
@@ -389 +384 @@
 }
 
-void DebugSection::choice(void){
+void DebugSection::choice(){
     //イメージベース
     extern DWORD ImageBase;
@@ -407 +402 @@
     compiler.SelectObjectModule( &this->objectModule );
 
-    //コードと行番号の関係
-    extern SourceLines oldSourceLines;
-    oldSourceLines = this->_oldSourceLines;
-
     //グローバル実行領域のサイズ
     extern int GlobalOpBufferSize;
@@ -423 +414 @@
 }
 
-void DebugSection::DeleteDebugInfo(void){
+void DebugSection::DeleteDebugInfo(){
     //コードバッファを解放
     free(OpBuffer);

trunk/ab5.0/abdev/BasicCompiler_Common/DebugSection.h

@@ -66 +66 @@
     ~DebugSection();
 
-    void make(void);
+    void make( const SourceLines &sourceLines );
 private:
-    void UpdateBreakPoint(void);
-    char *MakeSingleStepCode(void);
-    BOOL __load(void);
+    void UpdateBreakPoint();
+    char *MakeSingleStepCode();
+    BOOL __load();
 public:
     BOOL load(HMODULE hModule);
 
-    void choice(void);
+    void choice();
 
-    void DeleteDebugInfo(void);
+    void DeleteDebugInfo();
 };
 

trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp

@@ -7 +7 @@
 //デバッグ用
 #include "../BasicCompiler_Common/debug.h"
+#include "../BasicCompiler_Common/DebugSection.h"
 
 using namespace ActiveBasic::Compiler;
@@ -612 +613 @@
 
     //行番号情報
-    extern SourceLines oldSourceLines;
-    for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++){
-        for(i2=0;i2<(int)oldSourceLines.size()-2;i2++){
-            if((ULONG_PTR)(oldSourceLines[i2].GetNativeCodePos()+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
-                pobj_dti->lplpObp[i3]<=(ULONG_PTR)(oldSourceLines[i2+1].GetNativeCodePos()+ImageBase+MemPos_CodeSection)) break;
-        }
-        if(i2==oldSourceLines.size()-1) pobj_dti->lpdwCp[i3]=-1;
+    for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++)
+    {
+        extern DebugSectionCollection debugSectionCollection;
+        const SourceLines &sourceLines = debugSectionCollection.GetCurrent()._oldSourceLines;
+
+        for( i2=0; i2<static_cast<int>(sourceLines.size()-2); i2++ )
+        {
+            if((ULONG_PTR)(sourceLines[i2].GetNativeCodePos()+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
+                pobj_dti->lplpObp[i3]<=(ULONG_PTR)(sourceLines[i2+1].GetNativeCodePos()+ImageBase+MemPos_CodeSection))
+            {
+                break;
+            }
+        }
+        if( i2 == sourceLines.size() - 1 )
+        {
+            pobj_dti->lpdwCp[i3] = -1;
+        }
         else
         {
-            pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePosition().GetPos();
-            pobj_dti->relationalObjectModuleIndexes[i3]=oldSourceLines[i2].GetSourceCodePosition().GetRelationalObjectModuleIndex();
+            pobj_dti->lpdwCp[i3] = sourceLines[i2].GetSourceCodePosition().GetPos();
+            pobj_dti->relationalObjectModuleIndexes[i3] = sourceLines[i2].GetSourceCodePosition().GetRelationalObjectModuleIndex();
         }
     }

trunk/ab5.0/abdev/BasicCompiler_Common/include/BreakPoint.h

@@ -12 +12 @@
     void remove(int iLineNum);
 
-    void update(char *nativeCodeBuffer);
+    void update( char *nativeCodeBuffer, const SourceLines &sourceLines );
 };
 typedef std::vector<BreakPointsPerFile> BreakPointsPerFiles;
@@ -26 +26 @@
     void remove(const char *lpszFileName,int iLineNum);
 
-    char *update(char *nativeCodeBuffer,int SizeOf_CodeSection);
+    char *update( char *nativeCodeBuffer, int SizeOf_CodeSection, const SourceLines &sourceLines );
 };
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/BreakPoint.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+#include "../../BasicCompiler_Common/DebugSection.h"
 
 //////////////////////////
@@ -28 +30 @@
 }
 
-void BreakPointsPerFile::update(char *nativeCodeBuffer)
+void BreakPointsPerFile::update( char *nativeCodeBuffer, const SourceLines &sourceLines )
 {
     int FileNum;
@@ -88 +90 @@
 
         if(i2==this->lines[nCount]){
-            extern SourceLines oldSourceLines;
-
 loop:
             int tempCp = GetSourceCodeIndexFromLine( pNowSource->GetBuffer(), FileBaseLine+i2 );
 
             int i3;
-            for(i3=0;i3<(int)oldSourceLines.size()-1;i3++){
-                if(oldSourceLines[i3].GetSourceCodePosition().GetPos()==tempCp) break;
-            }
-            if(i3==oldSourceLines.size()-1){
+            for( i3=0; i3<static_cast<int>(sourceLines.size()-1); i3++ )
+            {
+                if( sourceLines[i3].GetSourceCodePosition().GetPos() == tempCp )
+                {
+                    break;
+                }
+            }
+            if( i3 == sourceLines.size() - 1 )
+            {
                 i2--;
                 goto loop;
             }
 
-            nativeCodeBuffer[oldSourceLines[i3].GetNativeCodePos()]=(char)0xCC;
+            nativeCodeBuffer[sourceLines[i3].GetNativeCodePos()] = (char)0xCC;
 
             nCount++;
@@ -192 +197 @@
 }
 
-char *BreakPointManager::update(char *nativeCodeBuffer,int SizeOf_CodeSection){
+char *BreakPointManager::update( char *nativeCodeBuffer, int SizeOf_CodeSection, const SourceLines &sourceLines )
+{
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,SizeOf_CodeSection);
@@ -199 +205 @@
     BOOST_FOREACH( BreakPointsPerFile &breakpointsPerFile, breakpointsPerFiles )
     {
-        breakpointsPerFile.update( buffer );
+        breakpointsPerFile.update( buffer, sourceLines );
     }
 

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -529 +529 @@
     compiler.linker.Link( compiler.GetObjectModule() );
 
-    extern SourceLines oldSourceLines;
-    oldSourceLines = compiler.linker.GetNativeCode().GetSourceLines();
-
 
     /////////////////////////////////////////////////////////////////
@@ -859 +856 @@
         compiler.messenger.Output( "デバッグ情報を生成しています。" );
 
-        pobj_DebugSection->make();
+        pobj_DebugSection->make( compiler.linker.GetNativeCode().GetSourceLines() );
 
         compiler.messenger.Output( "デバッグ情報の生成が完了しました。" );