Changeset 648 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src

Timestamp:

Jun 17, 2008, 9:24:12 PM (16 years ago)

Author:

dai_9181

Message:

・ブレークポイントが正常に動作しない不具合を修正。
・と同時に、ブレークポイント周りのコードをリファクタリング

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/BreakPoint.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/BreakPoint.cpp ) (6 diffs)

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

@@ -5 +5 @@
 //////////////////////////
 
-CDBBreakPoint *pobj_DBBreakPoint;
-
-CFileBreakPoint::CFileBreakPoint(char *lpszFileName,int iLineNum){
-    this->lpszFileName=(char *)HeapAlloc(hHeap,0,lstrlen(lpszFileName)+1);
-    lstrcpy(this->lpszFileName,lpszFileName);
-
-    piLine=(int *)HeapAlloc(hHeap,0,sizeof(int));
-    piLine[0]=iLineNum;
-    num=1;
-}
-CFileBreakPoint::~CFileBreakPoint(){
-    HeapDefaultFree(lpszFileName);
-    HeapDefaultFree(piLine);
-}
-void CFileBreakPoint::add(int iLineNum){
-    piLine=(int *)HeapReAlloc(hHeap,0,piLine,(num+1)*sizeof(int));
-    piLine[num]=iLineNum;
-    num++;
-}
-void CFileBreakPoint::remove(int iLineNum){
-    int i;
-    for(i=0;i<num;i++){
-        if(iLineNum==piLine[i]) break;
-    }
-    if(i==num) return;
-
-    num--;
-    for(;i<num;i++){
-        piLine[i]=piLine[i+1];
-    }
-}
-
-void CFileBreakPoint::update(char *nativeCodeBuffer)
+BreakPointManager *pobj_DBBreakPoint;
+
+BreakPointsPerFile::BreakPointsPerFile(char *lpszFileName,int iLineNum){
+    this->filename = lpszFileName;
+
+    lines.clear();
+    lines.push_back( iLineNum );
+}
+void BreakPointsPerFile::add(int iLineNum){
+    lines.push_back( iLineNum );
+}
+void BreakPointsPerFile::remove( int iLineNum )
+{
+    for( int i=0; i<static_cast<int>(this->lines.size()); i++ )
+    {
+        if( iLineNum == this->lines[i] )
+        {
+            Jenga::Common::EraseVectorItem<std::vector<int>>( this->lines, i );
+            break;
+        }
+    }
+}
+
+void BreakPointsPerFile::update(char *nativeCodeBuffer)
 {
     int FileNum;
     const IncludedFilesRelation *pIncludedFilesRelation = NULL;
     const BasicSource *pNowSource = NULL;
-    BOOST_FOREACH( const ObjectModule *pObjectModule, compiler.staticLibraries )
-    {
-        const BasicSource *pSource = &pObjectModule->GetSource();
-
-        pIncludedFilesRelation = &pSource->GetIncludedFilesRelation();
+
+    extern BasicSources sourcesLinkRelationalObjectModule;
+    BOOST_FOREACH( const BasicSource &source, sourcesLinkRelationalObjectModule )
+    {
+        pIncludedFilesRelation = &source.GetIncludedFilesRelation();
 
         for(FileNum=0;FileNum<pIncludedFilesRelation->GetFileCounts();FileNum++)
         {
-            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),lpszFileName)==0)
+            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),this->filename.c_str())==0)
             {
-                pNowSource = pSource;
+                pNowSource = &source;
                 break;
             }
@@ -68 +59 @@
     if( !pIncludedFilesRelation )
     {
-        Jenga::Throw( "CFileBreakPoint::update内で不正な処理" );
+        Jenga::Throw( "BreakPointsPerFile::update内で不正な処理" );
         return;
     }
@@ -96 +87 @@
         }
 
-        if(i2==piLine[nCount]){
+        if(i2==this->lines[nCount]){
             extern SourceLines oldSourceLines;
 
@@ -114 +105 @@
 
             nCount++;
-            if(nCount>=num) break;
-        }
-    }
-}
-
-
-CDBBreakPoint::CDBBreakPoint(){
-    ppItem=(CFileBreakPoint **)HeapAlloc(hHeap,0,1);
-    num=0;
-
+            if( nCount >= static_cast<int>(this->lines.size()) )
+            {
+                break;
+            }
+        }
+    }
+}
+
+
+BreakPointManager::BreakPointManager()
+{
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,65535);
 
+    std::string filepath = ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\ab_breakpoint.tmp";
     HANDLE hFile=CreateFile(
-        ( Jenga::Common::Environment::GetAppDir() + "\\ab_breakpoint.tmp" ).c_str(),
+        filepath.c_str(),
         GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-    if(hFile!=INVALID_HANDLE_VALUE){
+    if(hFile!=INVALID_HANDLE_VALUE)
+    {
         DWORD dwAccBytes;
         ReadFile(hFile,buffer,MAX_PATH,&dwAccBytes,NULL);
@@ -136 +130 @@
         buffer[dwAccBytes]=0;
     }
-    else buffer[0]=0;
+    else
+    {
+        buffer[0]=0;
+    }
 
     int i=0,i2;
@@ -161 +158 @@
     HeapDefaultFree(buffer);
 }
-CDBBreakPoint::~CDBBreakPoint(){
-    int i;
-    for(i=0;i<num;i++){
-        delete ppItem[i];
-    }
-    HeapDefaultFree(ppItem);
-}
-void CDBBreakPoint::insert(char *lpszFileName,int iLineNum){
-    int i;
-    for(i=0;i<num;i++){
-        if(lstrcmpi(ppItem[i]->lpszFileName,lpszFileName)==0){
-            ppItem[i]->add(iLineNum);
+void BreakPointManager::insert(char *lpszFileName,int iLineNum)
+{
+    BOOST_FOREACH( BreakPointsPerFile &breakpointsPerFile, breakpointsPerFiles )
+    {
+        if(lstrcmpi(breakpointsPerFile.filename.c_str(),lpszFileName)==0)
+        {
+            breakpointsPerFile.add( iLineNum );
             return;
         }
     }
 
-    if(i==num){
-        ppItem=(CFileBreakPoint **)HeapReAlloc(hHeap,0,ppItem,(num+1)*sizeof(CFileBreakPoint *));
-        ppItem[num]=new CFileBreakPoint(lpszFileName,iLineNum);
-        num++;
-    }
-}
-void CDBBreakPoint::remove(char *lpszFileName,int iLineNum){
-    int i;
-    for(i=0;i<num;i++){
-        if(lstrcmpi(lpszFileName,ppItem[i]->lpszFileName)==0){
-            ppItem[i]->remove(iLineNum);
-            break;
-        }
-    }
-    if(i==num) return;
-
-    if(ppItem[i]->num==0){
-        delete ppItem[i];
-
-        num--;
-        for(;i<num;i++){
-            ppItem[i]=ppItem[i+1];
-        }
-    }
-}
-
-char *CDBBreakPoint::update(char *nativeCodeBuffer,int SizeOf_CodeSection){
+    this->breakpointsPerFiles.push_back( BreakPointsPerFile( lpszFileName, iLineNum ) );
+}
+void BreakPointManager::remove(char *lpszFileName,int iLineNum)
+{
+    for( int i=0; i<static_cast<int>(this->breakpointsPerFiles.size()); i++ )
+    {
+        BreakPointsPerFile *pBreakpointsPerFile = &breakpointsPerFiles[i];
+        if(lstrcmpi(pBreakpointsPerFile->filename.c_str(),lpszFileName)==0)
+        {
+            pBreakpointsPerFile->remove( iLineNum );
+            if( pBreakpointsPerFile->lines.empty() )
+            {
+                Jenga::Common::EraseVectorItem<BreakPointsPerFiles>( this->breakpointsPerFiles, i );
+            }
+            break;
+        }
+    }
+}
+
+char *BreakPointManager::update(char *nativeCodeBuffer,int SizeOf_CodeSection){
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,SizeOf_CodeSection);
     memcpy(buffer,nativeCodeBuffer,SizeOf_CodeSection);
 
-    int i;
-    for(i=0;i<num;i++){
-        ppItem[i]->update(buffer);
+    BOOST_FOREACH( BreakPointsPerFile &breakpointsPerFile, breakpointsPerFiles )
+    {
+        breakpointsPerFile.update( buffer );
     }