Pārlūkot izejas kodu

Removed debug tracing and some old unused stuff

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@6738 8c9fc860-2736-0410-a75d-ab315db34111
felixf 9 gadi atpakaļ
vecāks
revīzija
5b63592fd6
1 mainītis faili ar 2 papildinājumiem un 31 dzēšanām
  1. 2 31
      source/Win32.Objects.Mod

+ 2 - 31
source/Win32.Objects.Mod

@@ -36,10 +36,6 @@ CONST
 	halt* = 2222;
 	halt* = 2222;
 	haltUnbreakable* = 2223;
 	haltUnbreakable* = 2223;
 
 
-	(* constant used in GC Process.FindPointers *)
-	InitDiff = MAX(LONGINT);
-
-	AddressSize = SIZEOF (ADDRESS);
 
 
 TYPE
 TYPE
 	CpuCyclesArray* = ARRAY Machine.MaxCPU OF HUGEINT;
 	CpuCyclesArray* = ARRAY Machine.MaxCPU OF HUGEINT;
@@ -163,8 +159,6 @@ TYPE
 		PROCEDURE FindRoots;   (* override, called while GC, replaces Threads.CheckStacks *)
 		PROCEDURE FindRoots;   (* override, called while GC, replaces Threads.CheckStacks *)
 		VAR sp: LONGINT; res: Kernel32.BOOL; pc, bp: ADDRESS;
 		VAR sp: LONGINT; res: Kernel32.BOOL; pc, bp: ADDRESS;
 			n,adr: ADDRESS; desc: Modules.ProcedureDescPointer; i: LONGINT; p {UNTRACED}: ANY;
 			n,adr: ADDRESS; desc: Modules.ProcedureDescPointer; i: LONGINT; p {UNTRACED}: ANY;
-			name: ARRAY 256 OF CHAR;
-			sb, startbp,startsp,startpc,endpc,ignored: ADDRESS;
 		BEGIN
 		BEGIN
 			IF (handle = 0) OR (mode = Terminated) OR (mode < Ready) (* procedure Wrapper not yet started *)
 			IF (handle = 0) OR (mode = Terminated) OR (mode < Ready) (* procedure Wrapper not yet started *)
 			OR (priority > High) (* stack of GC and realtime processes not traced *) THEN
 			OR (priority > High) (* stack of GC and realtime processes not traced *) THEN
@@ -187,7 +181,6 @@ TYPE
 					ASSERT(res >= 0);
 					ASSERT(res >= 0);
 				END;
 				END;
 			END;
 			END;
-			sb := stackBottom; startbp := bp; startsp := sp; 
 			(* stack garbage collection *)
 			(* stack garbage collection *)
 
 
 			IF Heaps.GCType= Heaps.HeuristicStackInspectionGC THEN
 			IF Heaps.GCType= Heaps.HeuristicStackInspectionGC THEN
@@ -201,28 +194,8 @@ TYPE
 				WHILE (bp # Heaps.NilVal) & (sp <= bp) & (bp <= stackBottom)  DO
 				WHILE (bp # Heaps.NilVal) & (sp <= bp) & (bp <= stackBottom)  DO
 					SYSTEM.GET(bp, n);
 					SYSTEM.GET(bp, n);
 					IF ODD(n) THEN (* procedure descriptor at bp *)
 					IF ODD(n) THEN (* procedure descriptor at bp *)
-						DEC(n);
-						desc := SYSTEM.VAL(Modules.ProcedureDescPointer, n);
+						desc := SYSTEM.VAL(Modules.ProcedureDescPointer, n-1);
 						IF desc # NIL THEN
 						IF desc # NIL THEN
-							(*
-							GetProcedureName(pc, name, ignored);
-							*)
-							startpc := desc.pcFrom;
-							endpc := desc.pcLimit;
-							IF endpc = 0CCCCCCCCH THEN
-								TRACE(sp,state.SP);
-								TRACE(bp,state.BP);
-								TRACE(pc, state.PC);
-								TRACE(n, desc);
-								TRACE(sb, stackBottom);
-								TRACE(mode);
-								Trace.Ln;
-								Trace.Memory(sp, sb-sp);
-								Trace.Ln;
-								Trace.String("id = "); Trace.Int(id,1); Trace.Ln;
-								LOOP END;
-							END;
-							(*TRACE(desc.pcFrom, desc.pcLimit, desc.offsets);*)
 							FOR i := 0 TO LEN(desc.offsets)-1 DO
 							FOR i := 0 TO LEN(desc.offsets)-1 DO
 								adr := bp + desc.offsets[i]; (* pointer at offset *)
 								adr := bp + desc.offsets[i]; (* pointer at offset *)
 								SYSTEM.GET(adr, p); (* load pointer *)
 								SYSTEM.GET(adr, p); (* load pointer *)
@@ -231,10 +204,8 @@ TYPE
 								END;
 								END;
 							END;
 							END;
 						END;
 						END;
-						SYSTEM.GET(bp + 2*SIZEOF(ADDRESS), pc);
 						SYSTEM.GET(bp + SIZEOF(ADDRESS), bp);
 						SYSTEM.GET(bp + SIZEOF(ADDRESS), bp);
 					ELSE (* classical stack frame *)
 					ELSE (* classical stack frame *)
-						SYSTEM.GET(bp + SIZEOF(ADDRESS), pc);
 						bp := n; 
 						bp := n; 
 					END;
 					END;
 				END;
 				END;
@@ -1215,7 +1186,7 @@ END NumReady;
 	return the number of cycles since the process has been created. If FALSE, return the number of cycles
 	return the number of cycles since the process has been created. If FALSE, return the number of cycles
 	consumed since the last time asked. *)
 	consumed since the last time asked. *)
 PROCEDURE GetCpuCycles*(process : Process; VAR cpuCycles : CpuCyclesArray; all : BOOLEAN);
 PROCEDURE GetCpuCycles*(process : Process; VAR cpuCycles : CpuCyclesArray; all : BOOLEAN);
-VAR res : Kernel32.BOOL; temp : HUGEINT; i : LONGINT;
+VAR res : Kernel32.BOOL; temp : HUGEINT; 
 BEGIN
 BEGIN
 	ASSERT(process # NIL);
 	ASSERT(process # NIL);
 	IF (Kernel32.QueryThreadCycleTime # NIL) THEN
 	IF (Kernel32.QueryThreadCycleTime # NIL) THEN