Changeset 266

Timestamp:

Jun 2, 2007, 11:51:16 AM (17 years ago)

Author:

dai

Message:

※本コミットがCP4バージョンのベースになります
_System_StartupProgramの呼び出しタイミングを変更。

Files:

• Include/basic.sbp (modified) (1 diff)
• Include/system/gc.sbp (modified) (2 diffs)
• bin/BasicCompiler32.exe (modified) ( previous)
• bin/BasicCompiler64.exe (modified) ( previous)
• bin/SubOperation/res.dll (modified) ( previous)
• bin/abdev.exe (modified) ( previous)

Include/basic.sbp

@@ -143 +143 @@
         _System_hProcessHeap=HeapCreate(HEAP_GENERATE_EXCEPTIONS,0,0)
 
-        ' GC管理オブジェクトを生成
-        _System_pGC = _System_calloc( SizeOf( _System_CGarbageCollection ) )
-        _System_pGC->Begin()
+        ' GC管理オブジェクトを初期化
+        _System_CGarbageCollection.Initialize()
 
         ' 動的型情報を生成
         _System_TypeBase.Initialize()
-
-        'Initialize global variables
-        _System_InitDllGlobalVariables()
 
         'Initialize static variables

Include/system/gc.sbp

@@ -26 +26 @@
 
 Class _System_CGarbageCollection
+
     ppPtr As *VoidPtr
     pSize As *SIZE_T
@@ -68 +69 @@
 
 Public
+
+    Static Sub Initialize()
+        Dim temporary[255] As Char
+        If GetEnvironmentVariable( "ActiveBasicGarbageCollection", temporary, 255 ) Then
+            ' 既にGCがプロセスに存在するとき
+            sscanf( temporary, "%08x", VarPtr( _System_pGC ) )
+            MessageBox(0,temporary,"GetEnvironmentVariable",0)
+        Else
+            _System_pGC = _System_calloc( SizeOf( _System_CGarbageCollection ) )
+            _System_pGC->Begin()
+
+            ' GCをプロセスに登録する
+            sprintf( temporary, "%08x", _System_pGC )
+            SetEnvironmentVariable( "ActiveBasicGarbageCollection", temporary )
+        End If
+    End Sub
 
     Sub Begin()