Parcourir la source

win64 kernel boots up to objects (where it traps)

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7412 8c9fc860-2736-0410-a75d-ab315db34111
felixf il y a 7 ans
Parent
commit
d6aab8bfa5
2 fichiers modifiés avec 4 ajouts et 34 suppressions
  1. 0 32
      source/Generic.Win64.Kernel32.Mod
  2. 4 2
      source/Win64.Machine.Mod

+ 0 - 32
source/Generic.Win64.Kernel32.Mod

@@ -1098,35 +1098,3 @@ VAR hout: HANDLE;
 BEGIN
 	Trace.String("Kernel32 (64bit)"); Trace.Ln;
 END Kernel32.
-	
---newObjectFile 
---preciseGC --trackLeave --writeBarriers
-
-Compiler.Compile -b=AMD --bits=64 --objectFile=Generic --metaData=Simple
-	--symbolFile=Textual 
-	--mergeSections 
-	--objectFileExtension=.GofWw --symbolFileExtension=.SymWw 
-	
-	Runtime.Mod Trace.Mod Generic.Win64.Kernel32.Mod ~
-
-StaticLinker.Link --fileFormat=PE64CUI --fileName=A264.exe --extension=GofWw --displacement=401000H  
-	Runtime Kernel32 ~
-
-FSTools.CloseFiles A264.exe  ~
-
-
-SystemTools.DoCommands 
-
-Compiler.Compile -b=AMD --bits=64 --objectFile=Generic --newObjectFile  --symbolFile=Textual  --objectFileExtension=.GofWw --symbolFileExtension=.SymWw 
-	AMD64.Runtime.Mod Trace.Mod Generic.Win64.Kernel32.Mod Win64.Machine.Mod Heaps.Mod Generic.Modules.Mod 
-	Win64.Objects.Mod Win32.Kernel.Mod ~
-
-StaticLinker.Link --fileFormat=PE64CUI --fileName=A264.exe --extension=GofWw --displacement=401000H  
-	Runtime Trace Kernel32 
-	Heaps Modules Objects Kernel ~
-
-FSTools.CloseFiles A264.exe  ~
-~
-
-	KernelLog Streams Commands Files WinFS Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker Reflection  GenericLoader  BootConsole ~
-	~

+ 4 - 2
source/Win64.Machine.Mod

@@ -308,11 +308,11 @@ VAR
 	CONST ConfigKey = "Configuration";
 	BEGIN
 		COPY ("", val);
-		TRACE(name,val,userConfigFile,defaultConfigFile); 
+
 		IF Kernel32.GetPrivateProfileString (ConfigKey, name, "", val, LEN (val), userConfigFile) # 0 THEN
 		ELSIF Kernel32.GetPrivateProfileString (ConfigKey, name, "", val, LEN (val), defaultConfigFile) # 0 THEN
 		END;
-		TRACE(name,val); 
+		
 		IF (name = "ObjectFileExtension") & (val = "") THEN
 			IF Kernel32.Generic THEN
 				val := ".GofW";
@@ -1090,8 +1090,10 @@ CODE{SYSTEM.i386}
 	OUT DX,EAX
 END Portout32;
 
+
 BEGIN
 	IF ~Kernel32.Generic THEN
 		Init
 	END;
+	Trace.String("Machine (64 bit)"); Trace.Ln;
 END Machine.