Changeset 373 for trunk

Timestamp:

Nov 6, 2007, 2:35:38 AM (17 years ago)

Author:

dai

Message:

Try-Catchを試験的に実装。
（まだ下記の動作しか実装していません）
・Try
・Catch（パラメータ無し）
・Throw（パラメータ無し）

Location:

trunk

Files:

• Include/system/exception.ab (modified) (7 diffs)
• Include/system/gc.sbp (modified) (1 diff)
• bin/BasicCompiler32.exe (modified) ( previous)
• bin/BasicCompiler64.exe (modified) ( previous)

trunk/Include/system/exception.ab

@@ -6 +6 @@
     Const basePtr As LONG_PTR
     Const stackPtr As LONG_PTR
-    context As CONTEXT
     Const debugProcNum As DWord
     
@@ -13 +12 @@
         This.basePtr = basePtr
         This.stackPtr = stackPtr
-
-        Dim tempContext As CONTEXT
-
-        tempContext.ContextFlags = CONTEXT_CONTROL or CONTEXT_INTEGER
-        If Thread.CurrentThread().__GetContext(tempContext) = 0 Then
-            ' TODO: エラー処理
-            debug
-        End If
-        context = tempContext
 
 #ifdef _DEBUG
@@ -58 +48 @@
 
     'Try
-    Function BeginTryScope( addressOfCatch As VoidPtr, basePtr As LONG_PTR, stackPtr As LONG_PTR ) As TryLayer
+    Function _BeginTryScope( addressOfCatch As VoidPtr, basePtr As LONG_PTR, stackPtr As LONG_PTR ) As TryLayer
         ppTryLayers = _System_realloc( ppTryLayers, ( nTryLayers + 1 ) * SizeOf( *TryLayer ) )
         ppTryLayers[nTryLayers] = New TryLayer( addressOfCatch, basePtr, stackPtr )
@@ -64 +54 @@
 
         Return ByVal ppTryLayers[nTryLayers-1]
+    End Function
+
+    Static Function BeginTryScope( addressOfCatch As VoidPtr, basePtr As LONG_PTR, stackPtr As LONG_PTR ) As TryLayer
+        Return _System_pobj_AllThreads->GetCurrentException()->_BeginTryScope( addressOfCatch, basePtr, stackPtr )
     End Function
 
@@ -92 +86 @@
         '--------------------------------------------------
 
-        'レジスタ情報を取得
-        Dim context = ppTryLayers[nTryLayers - 1]->context
+        Dim context As CONTEXT
+        context.ContextFlags = CONTEXT_CONTROL or CONTEXT_INTEGER
+        If GetThreadContext( GetCurrentThread(), context ) = 0 Then
+            ' TODO: エラー処理
+            debug
+        End If
 
-        'カレント スレッドを取得
-        Dim thread = Thread.CurrentThread
-
-        '新しいip, spをセット
+        '新しいip, sp, bpをセット
 #ifdef _WIN64
         context.Rip = ppTryLayers[nTryLayers - 1]->addressOfCatch As QWord
@@ -116 +111 @@
         End If
 #endif
-debug
-        If thread.__SetContext( context ) = 0 Then
+
+        If SetThreadContext( GetCurrentThread(), context ) = 0 Then
             OutputDebugString(Ex"レジスタ情報の設定に失敗しました。\r\n")
             Return
         End If
-        debug
     End Sub
 
@@ -127 +121 @@
         _Throw()
     End Sub
-
-    Static Sub AllocateObject( pObj As VoidPtr )
-        Dim thread = Thread.CurrentThread
-        'TODO: ローカルオブジェクトを登録
-    End Sub
-
-    Static Sub DeallocateObject( pObj As VoidPtr )
-        'TODO: ローカルオブジェクトを破棄
-    End Sub
 End Class
 

trunk/Include/system/gc.sbp

@@ -8 +8 @@
 Dim _System_gc_StackRoot_StartPtr As VoidPtr
 */
-
-Function _System_GetSp() As LONG_PTR                    'dummy
-End Function
-
 
 Const _System_GC_FLAG_ATOMIC = 1