Преглед изворни кода

Removed obsolete compatibility layer

git-svn-id: https://svn-dept.inf.ethz.ch/svn/lecturers/a2/trunk@8722 8c9fc860-2736-0410-a75d-ab315db34111
negelef пре 6 година
родитељ
комит
350e4c3985
2 измењених фајлова са 8 додато и 19 уклоњено
  1. 0 15
      source/ARM.Machine.Mod
  2. 8 4
      source/WMPerfMonTabSystem.Mod

+ 0 - 15
source/ARM.Machine.Mod

@@ -15,11 +15,6 @@ CONST
 	(* Interrupts Dummy Test *)
 	DummyTest = FALSE;
 	
-	(*
-		Used for compatibility with WMPerfMon
-	*)
-	MMX* = 23; (** bits in features variable *)
-
 	(* Lock levels *)
 	TraceOutput* = 0;
 	Memory* = 1;
@@ -126,14 +121,6 @@ CONST
 
 	Preemption* = 31;	(** flag for BreakAll() *)
 
-	(* TEMP. Temporary implementation to get Objects to compile *)
-	SSESupport* = FALSE;
-	SSE2Support* = FALSE;
-	KernelLevel * = 1;
-	UserLevel* = 1;
-	(*CS* = 1;*)
-	VMBit* = 2;
-
 	(** Period at which the CPU timer interrupts, in micro seconds *)
 	TimerPeriod* = 1000;
 
@@ -227,8 +214,6 @@ TYPE
 VAR
 	version -: ARRAY 64 OF CHAR;
 	
-	features-: SET;	(** processor features *)
-
 	sp, fp: ADDRESS;
 
 	(** Interrupt Mask *)

+ 8 - 4
source/WMPerfMonTabSystem.Mod

@@ -191,14 +191,18 @@ TYPE
 
 			uptimeLabel := Perf.NewIndicator("--", WMComponents.AlignClient, 0, 0); line.AddContent(uptimeLabel);
 
-			(* 4th Line: MMX/SSE/SSE2 capabilities *)
+			(* 4th Line: capabilities *)
 
 			line := Perf.NewPanel(WMComponents.AlignTop, 0, Perf.LineHeight); panel.AddContent(line);
 			label := Perf.NewLabel("Capabilities:", WMComponents.AlignLeft, 100, 0); line.AddContent(label);
 
-			caption := "MMX: "; AppendBoolean(caption, Machine.MMX IN Machine.features);
-			Strings.Append(caption, ", SSE: "); AppendBoolean(caption, Machine.SSESupport);
-			Strings.Append(caption, ", SSE2: "); AppendBoolean(caption, Machine.SSE2Support);
+			#IF I386 OR AMD64 THEN
+				caption := "MMX: "; AppendBoolean(caption, Machine.MMX IN Machine.features);
+				Strings.Append(caption, ", SSE: "); AppendBoolean(caption, Machine.SSESupport);
+				Strings.Append(caption, ", SSE2: "); AppendBoolean(caption, Machine.SSE2Support);
+			#ELSE
+				caption := "None";
+			#END
 
 			label := Perf.NewLabel(caption, WMComponents.AlignClient, 0, 0); line.AddContent(label);