Changeset 460 in dev

Timestamp:

Mar 23, 2008, 10:43:50 AM (17 years ago)

Author:

dai_9181

Message:

[459]を64bit版にもマージ。

Location:

trunk/ab5.0/abdev/BasicCompiler64

Files:

• Compile_CallProc.cpp (modified) (3 diffs)
• Compile_ProcOp.cpp (modified) (5 diffs)
• MakePeHdr.cpp (modified) (4 diffs)

trunk/ab5.0/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -26 +26 @@
 bool Opcode_CallProcPtr( const char *variable, const char *lpszParms,ProcPointer *pProcPointer)
 {
-    extern BOOL bDebugCompile;
     extern BOOL bDebugSupportProc;
-    if(bDebugCompile&&bDebugSupportProc==0)
+    if( compiler.IsDebug() && bDebugSupportProc == 0 )
+    {
         Call_DebugSys_SaveContext();
+    }
 
 
@@ -462 +463 @@
 bool Opcode_CallDllProc( const char *lpszParms, DllProc *pDllProc ){
 
-    extern BOOL bDebugCompile;
     extern BOOL bDebugSupportProc;
-    if(bDebugCompile&&bDebugSupportProc==0&& pDllProc->GetName() != "DebugBreak" ){
+    if( compiler.IsDebug() && bDebugSupportProc == 0 && pDllProc->GetName() != "DebugBreak" )
+    {
         Call_DebugSys_SaveContext();
     }
@@ -524 +525 @@
 void Opcode_CallDelegate( const Delegate &dg, const char *methodPtrValueStr, const char *objPtrValueStr, const char *params )
 {
-    extern BOOL bDebugCompile;
     extern BOOL bDebugSupportProc;
-    if(bDebugCompile&&bDebugSupportProc==0)
+    if( compiler.IsDebug() && bDebugSupportProc == 0 )
+    {
         Call_DebugSys_SaveContext();
+    }
 
 

trunk/ab5.0/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ -39 +39 @@
         const PertialSchedule *pStackFramePertialSchedule = compiler.codeGenerator.op_sub_rsp( 0, true );
 
-        extern BOOL bDebugCompile;
-        if(bDebugCompile){
+        if( compiler.IsDebug() )
+        {
             //デバッグ用の変数を定義
             DebugVariable();
@@ -203 +203 @@
     extern char *basbuf;
     extern HANDLE hHeap;
-    extern BOOL bDebugCompile;
     int i3,i4;
     char temporary[VN_SIZE];
@@ -222 +221 @@
     extern BOOL bDebugSupportProc;
     if(memcmp(pUserProc->GetName().c_str(),"_DebugSys_",10)==0){
-        if(!bDebugCompile){
+        if( !compiler.IsDebug() )
+        {
             return;
         }
@@ -449 +449 @@
     const PertialSchedule *pRspOffsetPertialSchedule1 = NULL;
     const PertialSchedule *pRspOffsetPertialSchedule2 = NULL;
-    if(bDebugCompile&&bDebugSupportProc==0){
+    if( compiler.IsDebug() && bDebugSupportProc == 0 )
+    {
         //mov rdx, qword ptr[rsp+スタックフレームサイズ]
         pRspOffsetPertialSchedule1 = compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RDX,REG_RSP,0,MOD_BASE_DISP32, Schedule::None, true );
@@ -607 +608 @@
     compiler.codeGenerator.ResolveExitSubSchedule();
 
-    if(bDebugCompile&&bDebugSupportProc==0){
+    if( compiler.IsDebug() && bDebugSupportProc == 0 )
+    {
         //call _DebugSys_EndProc
         extern const UserProc *pSub_DebugSys_EndProc;

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

@@ -91 +91 @@
     extern HWND hOwnerEditor;
     extern HANDLE hHeap;
-    extern BOOL bDebugCompile;
     extern DWORD ImageBase;
     extern int obp_AllocSize;
@@ -119 +118 @@
     //////////////////
     // データテーブル
-    if(bDebugCompile){
+    if( compiler.IsDebug() )
+    {
         compiler.GetObjectModule().dataTable.Add( (long)0x00000002 );
     }
@@ -360 +360 @@
             compiler.codeGenerator.op_sub_RV( sizeof(_int64), REG_RSP, 0x108 );
 
-            if(bDebugCompile){
+            if( compiler.IsDebug() )
+            {
                 //デバッグ用の変数を定義
                 DebugVariable();
@@ -831 +832 @@
     CDebugSection *pobj_DebugSection;
     pobj_DebugSection=new CDebugSection();
-    extern BOOL bDebugCompile;
     extern BOOL bError;
-    if(bDebugCompile&&bError==0){
+    if( compiler.IsDebug() && bError == 0 )
+    {
         CompileMessage( "デバッグ情報を生成しています。" );