Changeset 400 for trunk/Include/system

Timestamp:

Jan 22, 2008, 9:19:59 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

_System_CThreadCollectionでのクラスインスタンスへのポインタの使用を除去、参照変数構文へ。

File:

• trunk/Include/system/gc.sbp (modified) (5 diffs)

trunk/Include/system/gc.sbp

@@ -156 +156 @@
 
         ' スレッド管理用オブジェクトを生成
-        _System_pobj_AllThreads = New _System_CThreadCollection()
+        _System_pobj_AllThreads = New Detail._System_CThreadCollection()
 
         ' 自身のThreadオブジェクトを生成
-        Dim thread As Thread(hTargetThread,GetCurrentThreadId(),0)
+        Dim thread = New Thread(hTargetThread, GetCurrentThreadId(), 0)
         thread.Name = "main"
 
-        _System_pobj_AllThreads->BeginThread(ObjPtr( thread ),_System_gc_StackRoot_StartPtr As *LONG_PTR)
+        _System_pobj_AllThreads->BeginThread(thread, _System_gc_StackRoot_StartPtr As *LONG_PTR)
 
     End Sub
@@ -356 +356 @@
                 ExitProcess(-1)
             End If
-            Throw New System.OutOfMemoryException(ActiveBasic.Strings.SPrintf("malloc: Failed to allocate %zu byte(s) memory.", New System.UInt64(size)))
+            Dim s2 = Nothing As Object '#145
+            s2 = New System.UInt64(size)
+            Throw New System.OutOfMemoryException(ActiveBasic.Strings.SPrintf("malloc: Failed to allocate %zu (%&zx) byte(s) memory.", s2, s2))
         End If
     End Sub
@@ -550 +552 @@
         Dim i As Long
         For i=0 To ELM(_System_pobj_AllThreads->ThreadNum)
-            Dim thread = _System_pobj_AllThreads->ppobj_Thread[i]
-            If thread Then
+            Dim thread = _System_pobj_AllThreads->collection[i].thread
+            If Not ActiveBasic.IsNothing(thread) Then
                 FillMemory(VarPtr(Context),SizeOf(CONTEXT),0)
                 Context.ContextFlags=CONTEXT_CONTROL
-                If thread->__GetContext(Context)=0 Then
+                If thread.__GetContext(Context)=0 Then
                     _System_DebugOnly_OutputDebugString(Ex"レジスタ情報の取得に失敗しました。\r\n")
                 End If
@@ -564 +566 @@
 #endif
 
-                Dim size=(_System_pobj_AllThreads->pStackBase[i] As LONG_PTR)-(NowSp As LONG_PTR)
+                Dim size=(_System_pobj_AllThreads->collection[i].stackBase As LONG_PTR)-(NowSp As LONG_PTR)
                 Dim maxNum = (size\SizeOf(LONG_PTR)) As Long
 
@@ -666 +668 @@
     */
     Function SweepOnOtherThread() As Long
+        Imports System.Threading.Detail
         EnterCriticalSection(CriticalSection)
-
 
         Dim startTime = GetTickCount()