Changeset 550 in dev for trunk

Timestamp:

May 4, 2008, 10:56:44 PM (17 years ago)

Author:

dai_9181

Message:

SpecifyAddressOf, SpecifyCatchAddressを廃止。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/NativeCode.h (modified) (2 diffs)
• src/Exception.cpp (modified) (1 diff)
• src/NativeCode.cpp (modified) (3 diffs)

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

@@ -73 +73 @@
     {
     }
-    Schedule( const ::UserProc *pUserProc, long offset )
-        : type( Schedule::UserProc )
+    Schedule( Schedule::Type type, const ::UserProc *pUserProc, long offset )
+        : type( type )
         , offset( offset )
         , pUserProc( pUserProc )
@@ -114 +114 @@
     const ::UserProc &GetUserProc() const;
     const ::CClass &GetClass() const;
-
-    void SpecifyAddressOf();
-    void SpecifyCatchAddress();
 };
 typedef std::vector<Schedule> Schedules;

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

@@ -227 +227 @@
                 pUserProc = UserProc::pGlobalProc;
             }
-            compiler.GetObjectModule().dataTable.schedules.push_back( Schedule( pUserProc, dataTableOffset + pos ) );
-            compiler.GetObjectModule().dataTable.schedules.back().SpecifyCatchAddress();
+            compiler.GetObjectModule().dataTable.schedules.push_back(
+                Schedule( Schedule::CatchAddress, pUserProc, dataTableOffset + pos )
+            );
             pos += sizeof(LONG_PTR);
         }

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

@@ -19 +19 @@
     _ASSERT( type == Schedule::ComVtbl || type == Schedule::Vtbl || type == Schedule::TypeInfo );
     return *pClass;
-}
-
-void Schedule::SpecifyAddressOf()
-{
-    _ASSERT( type == Schedule::UserProc );
-    type = Schedule::AddressOf;
-}
-void Schedule::SpecifyCatchAddress()
-{
-    _ASSERT( type == Schedule::UserProc );
-    type = Schedule::CatchAddress;
 }
 
@@ -92 +81 @@
     pUserProc->Using();
 
-    Schedule schedule( pUserProc, GetSize() );
-    if( isCall == false )
-    {
-        schedule.SpecifyAddressOf();
-    }
-    schedules.push_back( schedule );
+    Schedule::Type type = isCall ? Schedule::UserProc : Schedule::AddressOf;
+
+    schedules.push_back( Schedule( type, pUserProc, GetSize() ) );
 
     Put( (long)0 );
@@ -106 +92 @@
     pUserProc->Using();
 
-    Schedule schedule( pUserProc, GetSize() );
-    schedule.SpecifyCatchAddress();
-    schedules.push_back( schedule );
+    schedules.push_back( Schedule( Schedule::CatchAddress, pUserProc, GetSize() ) );
 
     Put( codePos );