فهرست منبع

Made dependency on garbage collector explicit

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8383 8c9fc860-2736-0410-a75d-ab315db34111
negelef 6 سال پیش
والد
کامیت
e093cd4b94
2فایلهای تغییر یافته به همراه4 افزوده شده و 7 حذف شده
  1. 3 5
      source/Modules.Mod
  2. 1 2
      source/Release.Tool

+ 3 - 5
source/Modules.Mod

@@ -3,7 +3,7 @@ MODULE Modules;	(** AUTHOR "pjm"; PURPOSE "Modules and types"; *)
 IMPORT SYSTEM, Trace, Machine, Heaps;
 
 #IF COOP THEN
-	IMPORT Environment, Activities, Processors, Queues;
+	IMPORT Activities, Environment, GargabeCollector, Processors, Queues;
 #END
 
 CONST
@@ -859,13 +859,11 @@ BEGIN {UNCOOPERATIVE, UNCHECKED}
 END FinalizeModules;
 
 PROCEDURE {FINAL} Main;
-PROCEDURE InitializeGC EXTERN "GarbageCollector.Initialize";
-PROCEDURE TerminateGC EXTERN "GarbageCollector.Terminate";
 BEGIN {UNCOOPERATIVE, UNCHECKED}
 	SYSTEM.SetActivity (NIL);
 	SYSTEM.SetFramePointer (NIL);
 	Environment.Initialize;
-	InitializeGC;
+	GarbageCollector.Initialize;
 	Processors.Initialize;
 	Activities.Execute (PublishRegisteredModules);
 	Processors.Terminate;
@@ -873,7 +871,7 @@ BEGIN {UNCOOPERATIVE, UNCHECKED}
 	Activities.Terminate;
 	Queues.Terminate;
 	Environment.Terminate;
-	TerminateGC;
+	GarbageCollector.Terminate;
 	Environment.Exit (Environment.status);
 END Main;
 

+ 1 - 2
source/Release.Tool

@@ -324,10 +324,9 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	ZYNQ & ~COOP { Zynq.PsUartMin.Mod Zynq.PsTraceDevice.Mod Zynq.PrivateWatchdog.Mod ARM.Machine.Mod }
 
 	~COOP { Heaps.Mod }
-	COOP { Coop.Heaps.Mod }
+	COOP { Coop.Heaps.Mod GarbageCollector.Mod }
 
 	Modules.Mod
-	COOP { GarbageCollector.Mod }
 
 	BIOS & ~COOP { BIOS.Objects.Mod Kernel.Mod }
 	WIN & ~COOP { Windows.Objects.Mod Windows.Kernel.Mod }