Quellcode durchsuchen

Consistency: added static date to version string

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7034 8c9fc860-2736-0410-a75d-ab315db34111
felixf vor 8 Jahren
Ursprung
Commit
362a102566

+ 1 - 1
source/Generic.Linux.I386.Unix.Mod

@@ -11,7 +11,7 @@ IMPORT S := SYSTEM, Glue, Trace;
 
 
 CONST
-	Version* = "Linux";
+	Version* = "LinuxG32";
 
   	libcname* = "libc.so.6";
 	libmname* = "libm.so.6";

+ 2 - 2
source/Generic.Unix.I386.Machine.Mod

@@ -5,7 +5,7 @@ IMPORT S := SYSTEM, Trace, Unix, Glue;
 CONST
 	DefaultConfig = "Color 0  StackSize 128";
 	
-	Version = "Aos (rev.6640)";
+	Version = " A2 ";
 
 	DefaultObjectFileExtension* = ".Obj";
 	
@@ -977,7 +977,7 @@ END GetTimer;
 	BEGIN
 		standaloneAppl := FALSE;
 		
-		COPY( Unix.Version, version );  Append( version, Version );
+		COPY( Unix.Version, version );  Append( version, Version ); Append(version, S.Date);
 		timer0 := GetTimer( );  ticks := 0;
 		InitThreads;
 		InitLocks;

+ 18 - 3
source/I386.Machine.Mod

@@ -5,7 +5,7 @@ MODULE Machine;	(** AUTHOR "pjm"; PURPOSE "Bootstrapping, configuration and mach
 IMPORT SYSTEM, Trace;
 
 CONST
-	Version = "A2 Revision 5387 (23.08.2013)";
+	Version = "A2(I386) ";
 
 	MaxCPU* = 32;	(** maximum number of processors (up to 256) *)
 
@@ -3658,6 +3658,20 @@ CODE{SYSTEM.i386}
 	POP EAX
 END GetBootValue;
 
+PROCEDURE Append(VAR s: ARRAY OF CHAR; CONST t: ARRAY OF CHAR);
+VAR i,j: LONGINT;
+BEGIN
+	i := 0; 
+	WHILE(s[i] # 0X) DO INC(i) END;
+	j := 0;
+	WHILE (t[j] # 0X) DO
+		s[i] := t[j];
+		INC(i); INC(j);
+	END;
+	s[i] := 0X;
+END Append;
+
+
 (* Init code called from OBL. EAX = boot table offset. ESI, EDI=initRegs. 2k stack is available. No trap handling. *)
 BEGIN
 	PushBootValues;
@@ -3670,11 +3684,12 @@ BEGIN
 	SYSTEM.PUT16(0472H, 01234H);	(* soft boot flag, for when we reboot *)
 	ReadBootTable(bootFlag);
 	InitTrace;
-	Trace.String("Machine: "); Trace.Blue;Trace.StringLn (Version); Trace.Default;
+	version := Version;
+	Append(version, SYSTEM.Date);
+	Trace.String("Machine: "); Trace.Blue;Trace.StringLn (version); Trace.Default;
 	CheckMemory;
 	SearchMP;
 	AllocateDMA;	(* must be called after SearchMP, as lowTop is modified *)
-	version := Version;
 	InitBoot;
 	InitProcessor;
 

+ 15 - 1
source/Win32.Machine.Mod

@@ -5,7 +5,7 @@ MODULE Machine;
 IMPORT SYSTEM, Trace, Kernel32;
 
 CONST
-	Version = "WinAos Revision 5614 (04.07.2014)";
+	Version = "WinAos (32bit) ";
 
 	DefaultConfigFile = "aos.ini";
 	DefaultGenericConfigFile = "aosg.ini";
@@ -533,6 +533,19 @@ BEGIN
 	fullName[j] := 0X;
 END ToExecutablePath;
 
+PROCEDURE Append(VAR s: ARRAY OF CHAR; CONST t: ARRAY OF CHAR);
+VAR i,j: LONGINT;
+BEGIN
+	i := 0; 
+	WHILE(s[i] # 0X) DO INC(i) END;
+	j := 0;
+	WHILE (t[j] # 0X) DO
+		s[i] := t[j];
+		INC(i); INC(j);
+	END;
+	s[i] := 0X;
+END Append;
+
 PROCEDURE Init*;
 VAR vendor: Vendor; ver: LONGINT; hfile: Kernel32.HANDLE;
 BEGIN
@@ -543,6 +556,7 @@ BEGIN
 	boottime:=GetTimer();
 
 	COPY( Version, version );
+	Append(version, SYSTEM.Date);
 	CPUID(vendor, ver, features,features2);	 SetupSSE2Ext;
 	fcr := (FCR() - {0,2,3,10,11}) + {0..5,8,9};	(* default FCR RC=00B *)