فهرست منبع

Removed obsolete I386GEN prefix

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8022 8c9fc860-2736-0410-a75d-ab315db34111
negelef 7 سال پیش
والد
کامیت
658ce520c5

+ 1 - 1
source/AMD64.EFIMachine.Mod

@@ -4,7 +4,7 @@ IMPORT SYSTEM, EFI;
 
 
 VAR p0, p1: ADDRESS;
 VAR p0, p1: ADDRESS;
 
 
-(*  I386.Machine.Mod uses following registers as arguments:
+(* BIOS.I386.Machine.Mod uses following registers as arguments:
 	eax	: bootFlag (= address of boot table)
 	eax	: bootFlag (= address of boot table)
 	esi	: ?
 	esi	: ?
 	edi	: address of frame buffer
 	edi	: address of frame buffer

+ 1 - 1
source/AMD64.FoxArrayBaseOptimized.Mod

@@ -6486,7 +6486,7 @@ VAR
 		END;
 		END;
 	END InstallSSE2;
 	END InstallSSE2;
 
 
-	(*! to do: at current, this only works for Win, not for native because SSE3Support is not yet implemented in I386.Machine.Mod*)
+	(*! to do: at current, this only works for Win, not for native because SSE3Support is not yet implemented in BIOS.I386.Machine.Mod*)
 	PROCEDURE InstallSSE3*;   (* extra for testing, will be merged with Install in later versions *)
 	PROCEDURE InstallSSE3*;   (* extra for testing, will be merged with Install in later versions *)
 	BEGIN
 	BEGIN
 		IF Machine.SSE3Support THEN
 		IF Machine.SSE3Support THEN

+ 0 - 0
source/AMD64.Machine.Mod → source/BIOS.AMD64.Machine.Mod


+ 0 - 0
source/I386.BenchInterrupts.Mod → source/BIOS.I386.BenchInterrupts.Mod


+ 0 - 0
source/I386.Machine.Mod → source/BIOS.I386.Machine.Mod


+ 0 - 0
source/I386.MemCache.Mod → source/BIOS.I386.MemCache.Mod


+ 6 - 6
source/BenchSyntaxHighlighter.Mod

@@ -271,22 +271,22 @@ END BenchSyntaxHighlighter.
 SystemTools.Free BenchSyntaxHighlighter ~
 SystemTools.Free BenchSyntaxHighlighter ~
 
 
 BenchSyntaxHighlighter.Bench Usb.Mod reader ~
 BenchSyntaxHighlighter.Bench Usb.Mod reader ~
-BenchSyntaxHighlighter.Bench I386.Machine.Mod reader ~
+BenchSyntaxHighlighter.Bench BIOS.I386.Machine.Mod reader ~
 
 
 BenchSyntaxHighlighter.Bench Usb.Mod words ~
 BenchSyntaxHighlighter.Bench Usb.Mod words ~
-BenchSyntaxHighlighter.Bench I386.Machine.Mod words ~
+BenchSyntaxHighlighter.Bench BIOS.I386.Machine.Mod words ~
 
 
 BenchSyntaxHighlighter.Bench Usb.Mod rebuildregions~
 BenchSyntaxHighlighter.Bench Usb.Mod rebuildregions~
-BenchSyntaxHighlighter.Bench I386.Machine.Mod rebuildregions ~
+BenchSyntaxHighlighter.Bench BIOS.I386.Machine.Mod rebuildregions ~
 
 
 BenchSyntaxHighlighter.Bench -n=1000000 Usb.Mod regionlookup~
 BenchSyntaxHighlighter.Bench -n=1000000 Usb.Mod regionlookup~
-BenchSyntaxHighlighter.Bench I386.Machine.Mod regionlookup ~
+BenchSyntaxHighlighter.Bench BIOS.I386.Machine.Mod regionlookup ~
 
 
 BenchSyntaxHighlighter.Bench Usb.Mod full ~
 BenchSyntaxHighlighter.Bench Usb.Mod full ~
-BenchSyntaxHighlighter.Bench I386.Machine.Mod full ~
+BenchSyntaxHighlighter.Bench BIOS.I386.Machine.Mod full ~
 
 
 BenchSyntaxHighlighter.Bench Usb.Mod  ~
 BenchSyntaxHighlighter.Bench Usb.Mod  ~
-BenchSyntaxHighlighter.Bench I386.Machine.Mod  ~
+BenchSyntaxHighlighter.Bench BIOS.I386.Machine.Mod  ~
 
 
 Tests:
 Tests:
 
 

+ 1 - 1
source/Coop.ARM.Machine.Mod

@@ -48,7 +48,7 @@ TYPE
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 	END;
 	END;
 
 
-	(* dummy definition to make GC work for both I386 and Win32 - copied from I386.Machine.Mod, but not really used *)
+	(* dummy definition to make GC work for both I386 and Win32 - copied from BIOS.I386.Machine.Mod, but not really used *)
 	Stack* = RECORD	(** values are read-only *)
 	Stack* = RECORD	(** values are read-only *)
 			low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 			low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)

+ 1 - 1
source/Coop.I386.Machine.Mod

@@ -51,7 +51,7 @@ TYPE
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 	END;
 	END;
 
 
-	(* dummy definition to make GC work for both I386 and Win32 - copied from I386.Machine.Mod, but not really used *)
+	(* dummy definition to make GC work for both I386 and Win32 - copied from BIOS.I386.Machine.Mod, but not really used *)
 	Stack* = RECORD	(** values are read-only *)
 	Stack* = RECORD	(** values are read-only *)
 			low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 			low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)

+ 1 - 1
source/EFI.Tool

@@ -19,7 +19,7 @@ Compiler.Compile --newObjectFile --mergeSections -b=AMD --objectFileExtension=.G
 	Runtime.Mod Trace.Mod EFI.I386.Machine.Mod EFIGraphicalConsole.Mod StartConsole.Mod Heaps.Mod Modules.Mod 
 	Runtime.Mod Trace.Mod EFI.I386.Machine.Mod EFIGraphicalConsole.Mod StartConsole.Mod Heaps.Mod Modules.Mod 
 	Objects.Mod Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod Commands.Mod I386.Reals.Mod 
 	Objects.Mod Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod Commands.Mod I386.Reals.Mod 
 	Reflection.Mod TrapWriters.Mod CRC.Mod SystemVersion.Mod Traps.Mod Locks.Mod BiosFreePCI.Mod 
 	Reflection.Mod TrapWriters.Mod CRC.Mod SystemVersion.Mod Traps.Mod Locks.Mod BiosFreePCI.Mod 
-	Clock.Mod I386.MemCache.Mod Disks.Mod Files.Mod Dates.Mod Strings.Mod UTF8Strings.Mod 
+	Clock.Mod BIOS.I386.MemCache.Mod Disks.Mod Files.Mod Dates.Mod Strings.Mod UTF8Strings.Mod 
 	FileTrapWriter.Mod Caches.Mod DiskVolumes.Mod OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod 
 	FileTrapWriter.Mod Caches.Mod DiskVolumes.Mod OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod 
 	OberonFS.Mod FATVolumes.Mod FATFiles.Mod ISO9660Volumes.Mod ISO9660Files.Mod 
 	OberonFS.Mod FATVolumes.Mod FATFiles.Mod ISO9660Volumes.Mod ISO9660Files.Mod 
 	RelativeFileSystem.Mod Loader.Mod BitSets.Mod Diagnostics.Mod StringPool.Mod ObjectFile.Mod 
 	RelativeFileSystem.Mod Loader.Mod BitSets.Mod Diagnostics.Mod StringPool.Mod ObjectFile.Mod 

+ 1 - 1
source/EFIA2Loader.Mod

@@ -340,7 +340,7 @@ VAR
 	VAR btIdx : ADDRESS; i : LONGINT; ch : CHAR;
 	VAR btIdx : ADDRESS; i : LONGINT; ch : CHAR;
 	BEGIN
 	BEGIN
 		btIdx := bootTableCfgStrEntry + 8; (* skip type and size fields *)
 		btIdx := bootTableCfgStrEntry + 8; (* skip type and size fields *)
-		(* copied from I386.Machine.Mod - GetConfig *)
+		(* copied from BIOS.I386.Machine.Mod - GetConfig *)
 		LOOP
 		LOOP
 			SYSTEM.GET(btIdx,ch);
 			SYSTEM.GET(btIdx,ch);
 			IF ch = 0X THEN EXIT END;
 			IF ch = 0X THEN EXIT END;

+ 1 - 1
source/EFILib.Mod

@@ -397,7 +397,7 @@ BEGIN
 	END;
 	END;
 END IntToString;
 END IntToString;
 
 
-(* Copied from I386.Machine.Mod - StrToInt *)
+(* Copied from BIOS.I386.Machine.Mod - StrToInt *)
 (** Convert a string to an integer. Parameter i specifies where in the string scanning should begin (usually 0 in the first call). Scanning stops at the first non-valid character, and i returns the updated position. Parameter s is the string to be scanned. The value is returned as result, or 0 if not valid. Syntax: number = ["-"] digit {digit} ["H" | "h"] . digit = "0" | ... "9" | "A" .. "F" | "a" .. "f" . If the number contains any hexdecimal letter, or if it ends in "H" or "h", it is interpreted as hexadecimal. *)
 (** Convert a string to an integer. Parameter i specifies where in the string scanning should begin (usually 0 in the first call). Scanning stops at the first non-valid character, and i returns the updated position. Parameter s is the string to be scanned. The value is returned as result, or 0 if not valid. Syntax: number = ["-"] digit {digit} ["H" | "h"] . digit = "0" | ... "9" | "A" .. "F" | "a" .. "f" . If the number contains any hexdecimal letter, or if it ends in "H" or "h", it is interpreted as hexadecimal. *)
 PROCEDURE StringToInt* (VAR i: LONGINT; CONST s: ARRAY OF CHAR): LONGINT;
 PROCEDURE StringToInt* (VAR i: LONGINT; CONST s: ARRAY OF CHAR): LONGINT;
 VAR vd, vh, sgn, d: LONGINT; hex: BOOLEAN;
 VAR vd, vh, sgn, d: LONGINT; hex: BOOLEAN;

+ 1 - 1
source/I386.EFIMachine.Mod

@@ -2,7 +2,7 @@ MODULE EFIMachine; (** AUTHOR ""; PURPOSE ""; *)
 
 
 IMPORT SYSTEM, EFI;
 IMPORT SYSTEM, EFI;
 
 
-(*  I386.Machine.Mod uses following registers as arguments:
+(* BIOS.I386.Machine.Mod uses following registers as arguments:
 	eax	: bootFlag (= address of boot table)
 	eax	: bootFlag (= address of boot table)
 	esi	: ?
 	esi	: ?
 	edi	: address of frame buffer
 	edi	: address of frame buffer

+ 1 - 1
source/I386.FoxArrayBaseOptimized.Mod

@@ -6488,7 +6488,7 @@ VAR
 		END;
 		END;
 	END InstallSSE2;
 	END InstallSSE2;
 
 
-	(*! to do: at current, this only works for Win, not for native because SSE3Support is not yet implemented in I386.Machine.Mod*)
+	(*! to do: at current, this only works for Win, not for native because SSE3Support is not yet implemented in BIOS.I386.Machine.Mod*)
 	PROCEDURE InstallSSE3*;   (* extra for testing, will be merged with Install in later versions *)
 	PROCEDURE InstallSSE3*;   (* extra for testing, will be merged with Install in later versions *)
 	BEGIN
 	BEGIN
 		IF Machine.SSE3Support THEN
 		IF Machine.SSE3Support THEN

+ 4 - 4
source/Release.Tool

@@ -103,7 +103,7 @@ END
 
 
 BUILDS
 BUILDS
 	Bios32 {
 	Bios32 {
-		INCLUDE "BIOS32 NATIVE I386 I386GEN UNCOOP UNCOOP32"
+		INCLUDE "BIOS32 NATIVE I386 UNCOOP UNCOOP32"
 		COMPILER "Compiler.Compile"
 		COMPILER "Compiler.Compile"
 		COMPILEOPTIONS "--newObjectFile --mergeSections"
 		COMPILEOPTIONS "--newObjectFile --mergeSections"
 		TARGET "AMD"
 		TARGET "AMD"
@@ -264,7 +264,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	WIN32 { Windows.I386.Kernel32.Mod }
 	WIN32 { Windows.I386.Kernel32.Mod }
 	WIN64 { Windows.AMD64.Kernel32.Mod }
 	WIN64 { Windows.AMD64.Kernel32.Mod }
 
 
-	I386GEN { I386.Machine.Mod }
+	BIOS32 { BIOS.I386.Machine.Mod }
 	WIN32 { Windows.I386.Machine.Mod }
 	WIN32 { Windows.I386.Machine.Mod }
 	WIN64 { Windows.AMD64.Machine.Mod }
 	WIN64 { Windows.AMD64.Machine.Mod }
 	COOP { Mutexes.Mod }
 	COOP { Mutexes.Mod }
@@ -326,7 +326,7 @@ PACKAGE System ARCHIVE "System.zip" SOURCE "SystemSrc.zip" DESCRIPTION "System"
 	UNIX { Unix.Clock.Mod }
 	UNIX { Unix.Clock.Mod }
 
 
 	# Memory cache control
 	# Memory cache control
-	I386GEN { I386.MemCache.Mod }
+	BIOS32 { BIOS.I386.MemCache.Mod }
 	COOP { Coop.MemCache.Mod }
 	COOP { Coop.MemCache.Mod }
 
 
 	# Block device interface
 	# Block device interface
@@ -1213,7 +1213,7 @@ PACKAGE Testing ARCHIVE "Testing.zip" SOURCE "TestingSrc.zip" DESCRIPTION "Tests
 		BluetoothTest.Mod
 		BluetoothTest.Mod
 	}
 	}
 
 
-	I386GEN { I386.BenchInterrupts.Mod }
+	BIOS32 { BIOS.I386.BenchInterrupts.Mod }
 
 
 	BenchTCP.Mod
 	BenchTCP.Mod
 
 

+ 1 - 1
source/Visualizer.Mod

@@ -1571,7 +1571,7 @@ Visualizer.Generate -a  -s="A0" -v=all --procedures=all --hasA=all -d=all --mode
 Visualizer.Generate -a  -s="A3" ratio="fill"' -v=none -p=none -h=all -m=2 -e="Modules Machine Heaps Objects Kernel Raster XMLObjects XML"  WMEvents.Mod WMProperties.Mod WMComponents.Mod WindowManager.Mod ~
 Visualizer.Generate -a  -s="A3" ratio="fill"' -v=none -p=none -h=all -m=2 -e="Modules Machine Heaps Objects Kernel Raster XMLObjects XML"  WMEvents.Mod WMProperties.Mod WMComponents.Mod WindowManager.Mod ~
 
 
 
 
-Visualizer.Generate -a  -s="A3" -v=all -p=all -h=all -m=2 Trace.Mod I386.Machine.Mod Heaps.Mod Objects.Mod Modules.Mod Kernel.Mod  ~
+Visualizer.Generate -a  -s="A3" -v=all -p=all -h=all -m=2 Trace.Mod BIOS.I386.Machine.Mod Heaps.Mod Objects.Mod Modules.Mod Kernel.Mod  ~
 
 
 Visualizer.Generate -a -s="A3" -v=all -p=all -m=1 WMWindowManager.Mod ~
 Visualizer.Generate -a -s="A3" -v=all -p=all -m=1 WMWindowManager.Mod ~
 
 

+ 1 - 1
source/Windows.AMD64.Machine.Mod

@@ -66,7 +66,7 @@ TYPE
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 	END;
 	END;
 
 
-	(* dummy definition to make GC work for both I386 and Win32 - copied from I386.Machine.Mod, but not really used *)
+	(* dummy definition to make GC work for both I386 and Win32 - copied from BIOS.I386.Machine.Mod, but not really used *)
 	Stack* = RECORD	(** values are read-only *)
 	Stack* = RECORD	(** values are read-only *)
 			low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 			low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)

+ 1 - 1
source/Windows.I386.Machine.Mod

@@ -66,7 +66,7 @@ TYPE
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 		beginBlockAdr-, endBlockAdr-: ADDRESS
 	END;
 	END;
 
 
-	(* dummy definition to make GC work for both I386 and Win32 - copied from I386.Machine.Mod, but not really used *)
+	(* dummy definition to make GC work for both I386 and Win32 - copied from BIOS.I386.Machine.Mod, but not really used *)
 	Stack* = RECORD	(** values are read-only *)
 	Stack* = RECORD	(** values are read-only *)
 		low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 		low: ADDRESS;		(* lowest virtual address that may be allocated for stack *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)
 		adr*: ADDRESS;		(* lowest address on allocated stack *)	(* exported for Objects only *)