Changeset 467 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp

Timestamp:

Mar 27, 2008, 2:29:35 AM (16 years ago)

Author:

dai_9181

Message:

いくつかのグローバル変数をProgram/Debuggerクラスにまとめた。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp (modified) (8 diffs)

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

@@ -377 +377 @@
 void DebugProgram(void){
     extern HWND hMainDlg;
-    extern char OutputFileName[MAX_PATH];
     extern DWORD ImageBase;
     extern int MemPos_CodeSection;
@@ -419 +418 @@
 
 
-    extern BOOL bAttach;
-    if(bAttach){
-        extern DWORD dwAttachProcessId;
-
+    // デバッグをスタート
+    debugger.DebugStart();
+
+
+    if( program.IsAttach() )
+    {
         //プロセスIDを元にハンドルを取得
         HANDLE hProcess;
-        hProcess=OpenProcess(PROCESS_ALL_ACCESS,0,dwAttachProcessId);
+        hProcess=OpenProcess(PROCESS_ALL_ACCESS,0, program.GetAttachProcessId() );
         if(!hProcess) goto AttachError;
 
@@ -434 +435 @@
 
         //実行ファイル名を取得
-        GetModuleFileNameEx(hProcess,hModule,OutputFileName,MAX_PATH);
+        char tempOutputFileName[MAX_PATH];
+        GetModuleFileNameEx(hProcess,hModule,tempOutputFileName,MAX_PATH);
+        program.SetOutputFilePath( tempOutputFileName );
 
         CloseHandle(hProcess);
@@ -440 +443 @@
 /*
         //デバッグ用の拡張情報を取得
-        pobj_DebugSection->load(OutputFileName);*/
-
-        if(!DebugActiveProcess(dwAttachProcessId)){
+        pobj_DebugSection->load(program.GetOutputFilePath().c_str());*/
+
+        if(!DebugActiveProcess( program.GetAttachProcessId() )){
 AttachError:
             DebugMessage("アタッチに失敗しました。");
@@ -449 +452 @@
     }
     else{
-        /*if(!pobj_DebugSection->load(OutputFileName)){
+        /*if(!pobj_DebugSection->load(program.GetOutputFilePath().c_str())){
             extern BOOL bDebugCompile;
             bDebugCompile=1;
             OutputExe();
-            pobj_DebugSection->load(OutputFileName);
+            pobj_DebugSection->load(program.GetOutputFilePath().c_str());
         }*/
 
@@ -464 +467 @@
         if( !compiler.IsDll() ){
             //EXEファイルをデバッグ
-            CreateProcess(OutputFileName,szDebugCmdLine,NULL,NULL,0,NORMAL_PRIORITY_CLASS|DEBUG_ONLY_THIS_PROCESS|CREATE_NEW_CONSOLE,NULL,NULL,&si,&pi);
+            CreateProcess(program.GetOutputFilePath().c_str(),szDebugCmdLine,NULL,NULL,0,NORMAL_PRIORITY_CLASS|DEBUG_ONLY_THIS_PROCESS|CREATE_NEW_CONSOLE,NULL,NULL,&si,&pi);
         }
         else{
@@ -537 +540 @@
 
 
-            /*if(lstrcmpi(temporary, OutputFileName)==0){
+            /*if(lstrcmpi(temporary, program.GetOutputFilePath().c_str())==0){
                 ImageBase=(DWORD)de.u.LoadDll.lpBaseOfDll;
 
@@ -817 +820 @@
     SetDlgItemText(hMainDlg,IDOK,STRING_CLOSE);
 
+    debugger.FinishDebug();
+
     SendMessage(hOwnerEditor,WM_DESTROYDEBUGGERBASE,0,0);
 }