simplified and unified trap installation

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7445 8c9fc860-2736-0410-a75d-ab315db34111

source/Generic.Linux.I386.Unix.Mod

@@ -149,12 +149,13 @@ TYPE
 	ConditionType = ARRAY 12 OF WORD;
 
 	Sigset_t= ARRAY 32 OF ADDRESS;
-	SignalHandler = PROCEDURE ( sig: LONGINT; scp, ucp: ADDRESS );
+	SignalTrap = PROCEDURE ( sig: LONGINT; mc: Mcontext );
 	
 	pid_t*		= LONGINT;
 	path_t*	= ARRAY OF CHAR;
 	arg_t*		= ARRAY OF CHAR;
 	argv_t*	= ARRAY OF arg_t;
+	off_t*	= SIZE;
 
 
 CONST
@@ -800,11 +801,11 @@ VAR
 	END CopyContext;
 
 
-	PROCEDURE ModifyContext*( cont: Ucontext;  pc, bp, sp: LONGINT );
+	PROCEDURE ModifyContext*( cont: Mcontext;  pc, bp, sp: LONGINT );
 	BEGIN
-		cont.mc.r_pc := pc;
-		cont.mc.r_bp := bp;
-		cont.mc.r_sp := sp;
+		cont.r_pc := pc;
+		cont.r_bp := bp;
+		cont.r_sp := sp;
 	END ModifyContext;
 
 	PROCEDURE Perror*( CONST msg: ARRAY OF CHAR );
@@ -910,21 +911,22 @@ VAR
 
 
 
-	VAR trap: SignalHandler;
+	VAR trap: SignalTrap;
 
-	PROCEDURE {C} SigHandler  ( sig: LONGINT; scp: ADDRESS; ucp: ADDRESS); (* reversed arguments !! *)
+	PROCEDURE {C} SigHandler  ( sig: LONGINT; scp: ADDRESS; ucp: Ucontext ); (* reversed arguments !! *)
 	BEGIN
 		IF trap # NIL THEN
-			trap( sig, scp, ucp );
+			Trace.Address( ucp ); Trace.Ln;
+			trap( sig, S.VAL( Mcontext, ADDRESSOF( ucp.mc ) ) )
 		ELSE
 			TRACE( sig, scp, ucp )
 		END;
 	END SigHandler;
 
-	PROCEDURE InstallSignalHandler* ( h: SignalHandler );
+	PROCEDURE InstallTrap* ( h: SignalTrap );
 	BEGIN
 		trap := h;
-	END InstallSignalHandler;
+	END InstallTrap;
 
 
 
@@ -938,13 +940,12 @@ VAR
 		IF sig = SIGSEGV THEN (* segmentation violation *)
 			act.sa_flags :=  SA_SIGINFO +  SA_ONSTACK +  SA_NODEFER;
 		ELSE
-			act.sa_flags :=  SA_SIGINFO + (* SA_ONSTACK + *) SA_NODEFER;
+			act.sa_flags :=  SA_SIGINFO + SA_NODEFER;
 		END;
 		act.sa_handler := ADDRESS OF SigHandler;
 		IF sigaction( sig, ADDRESS OF act, 0 ) # 0 THEN
 			Perror("sigaction");
-		END;
-
+		END
 	END InstallHandler;
 
 	PROCEDURE fstat*  ( fd: LONGINT;  VAR buf: Status ): LONGINT;

source/Generic.Solaris.I386.Unix.Mod

@@ -326,7 +326,7 @@ TYPE
 			END;
 
 	Sigset = ARRAY 4 OF SET;
-	SignalHandler = PROCEDURE ( sig: LONGINT; scp, ucp: ADDRESS ); 
+	SignalTrap = PROCEDURE ( sig: LONGINT; mc: Mcontext ); 
 
 	Stack* = RECORD
 				sp*	: ADDRESS;
@@ -386,20 +386,20 @@ TYPE
 	END;
 			
 	pid_t*	= LONGINT;
+	off_t* = SIZE;
 	
 	OberonXErrorHandler* = PROCEDURE ( disp, err: ADDRESS ): LONGINT;
 	OberonXIOErrorHandler* = PROCEDURE ( disp: ADDRESS ): LONGINT;
 	
 	
 VAR
-	suspend_mutex: MutexDesc;
 	handler_done: BOOLEAN;
 	mainthread: Thread_t;
 	sasuspend: Sigaction;
 	
 	argc-: LONGINT;  argv-: ADDRESS;  environ: ADDRESS;
 	
-	trap: SignalHandler;
+	trap: SignalTrap;
 	
 	oberonXErrorHandler: OberonXErrorHandler; 
 	oberonXIOErrorHandler: OberonXIOErrorHandler;
@@ -537,12 +537,12 @@ VAR
 	libraryPaths: ARRAY 7 OF ARRAY 32 OF CHAR;
 	noPaths: LONGINT;
 	
-	PROCEDURE ModifyContext*( cont: Ucontext;  pc, bp, sp: LONGINT );
+	PROCEDURE ModifyContext*( cont: Mcontext;  pc, bp, sp: LONGINT );
 	BEGIN
-		cont.mc.r_pc := pc;
-		cont.mc.r_bp := bp;
-		cont.mc.r_nsp := sp;	
-		cont.mc.r_sp := sp;	
+		cont.r_pc := pc;
+		cont.r_bp := bp;
+		cont.r_nsp := sp;	
+		cont.r_sp := sp;	
 	END ModifyContext;
 	
 	PROCEDURE CopyContext*( CONST from: McontextDesc; VAR to: McontextDesc );
@@ -579,16 +579,16 @@ VAR
 			suspendHandler( ucp );
 			handler_done := TRUE;
 		ELSIF trap # NIL THEN 
-			trap( sig, scp, ucp );
+			trap( sig, S.VAL( Mcontext, ADDRESSOF( ucp.mc ) ) );
 		ELSE
 			Trace.String( "Unix.SigHandler: sig = " ); Trace.Int( sig, 0 ); Trace.Ln;  exit( -1 );
 		END;
 	END SigHandler;
 	
-	PROCEDURE InstallSignalHandler* ( h: SignalHandler );
+	PROCEDURE InstallTrap* ( h: SignalTrap );
 	BEGIN
 		trap := h;
-	END InstallSignalHandler;
+	END InstallTrap;
 
 	
 	PROCEDURE InstallHandler( sig: LONGINT );
@@ -624,7 +624,6 @@ VAR
 	
 	PROCEDURE ThrInitialize*( VAR low, high: LONGINT ): BOOLEAN;
 	BEGIN	    
-		ASSERT( pthread_mutex_init( ADDRESSOF( suspend_mutex ), NIL ) = 0);
 		mainthread := pthread_self();
 		high := sched_get_priority_max( SCHED_OTHER );
 		low := sched_get_priority_min( SCHED_OTHER );

source/Generic.Unix.Traps.Mod

@@ -6,7 +6,7 @@ MODULE Traps;  (** AUTHOR "G.F."; PURPOSE "Exception Trap and symbolic debugging
 (* 2000.02.06	g.f.	UnixOberon release 2.3.6d	*)
 (* 2006.07.09	g.f.	UnixAos version	*)
 
-IMPORT S := SYSTEM, Trace, Glue, Unix, Objects, Machine, Heaps, Streams, Modules, Reflection,
+IMPORT S := SYSTEM, Trace, Unix, Objects, Machine, Streams, Modules, Reflection,
 		TrapWriters, Commands, StdIO;
 
 CONST
@@ -87,19 +87,21 @@ VAR
 
 	END FinishTrap;
 
-	PROCEDURE Registers(CONST c:Unix.McontextDesc; w: Streams.Writer);
+	PROCEDURE Registers( CONST mc: Unix.Mcontext; w: Streams.Writer );
 	BEGIN
-		w.String("EAX= "); w.Address(c.r_ax);
-		w.String(" EBX= "); w.Address(c.r_bx);
-		w.String(" ECX= "); w.Address(c.r_cx);
-		w.String(" EDX= "); w.Address(c.r_dx);
-		w.String(" ESI= "); w.Address(c.r_si);
-		w.String(" EDI= "); w.Address(c.r_di);
-		w.Ln;
+		w.String( "SP  = " );  w.Address( mc.r_sp );  
+		w.String( " FP  = " );  w.Address( mc.r_bp );
+		w.String( " PC  = " );  w.Address( mc.r_pc );  w.Ln;
+		w.String( "EAX = "); w.Address( mc.r_ax );
+		w.String(" EBX = "); w.Address( mc.r_bx );
+		w.String(" ECX = "); w.Address( mc.r_cx );
+		w.String(" EDX = "); w.Address( mc.r_dx );
+		w.String(" ESI = "); w.Address( mc.r_si );
+		w.String(" EDI = "); w.Address( mc.r_di );  w.Ln;
 	END Registers;
 
 
-	PROCEDURE Trap( sig: LONGINT;  ucp: Unix.Ucontext);
+	PROCEDURE Trap( sig: LONGINT;  mc: Unix.Mcontext);
 	VAR
 		pc, sp, bp: ADDRESS;
 		trapno: LONGINT;
@@ -107,24 +109,18 @@ VAR
 		handler: ExceptionHandler;
 		w: Streams.Writer;
 	BEGIN
-		LockTrap;
-		IF trace THEN
-			Machine.Acquire( Machine.TraceOutput );
-			Trace.Ln;
-			Trace.String( "Aos Trap:  signal = " );  Trace.Int( sig, 0 );
-			Trace.String( ",  ucp = " );  Trace.Address( S.VAL( ADDRESS, ucp ) );
-			Trace.String( ", traphandling  level = " ); Trace.Int( trapHandlingLevel, 1 );
-			Trace.Ln;
-			Machine.Acquire( Machine.TraceOutput );
+		IF sig IN {1, 2, 14, 15} (* SIGHUP, SIGINT, SIGALRM, SIGTERM *) THEN
+			(* ignore *) RETURN
 		END;
 		
+		LockTrap;
+		
 		INC( trapHandlingLevel );
 		IF trapHandlingLevel > MaxRecursion THEN  
 			UnlockTrap;
 			Objects.Terminate
 		END;
 		
-
 		w := TrapWriters.GetWriter();
 		w.Char( 1X );   (* begin of trap text *)
 
@@ -133,17 +129,15 @@ VAR
 		IF trapHandlingLevel = 1 THEN
 			w.String( "Trap " );
 		ELSE
-			w.String( "[recursive Trap] " );
+			w.String( "[Recursive Trap] " );
 		END;
-				
-		sp := ucp.mc.r_sp;
 		CASE sig OF
 		| 1:		w.String( "1 (Hangup signal)" );
 		| 2:  	w.String( "2 (User interrupt)" );
 		| 3:		w.String( "3 (Quit signal)" );
 		| 4:  	w.String( "4 (Illegal instruction)" );
 		| 5:   	w.String( "5." );
-				S.GET( sp, trapno );  w.Int( trapno, 0 );
+				S.GET( mc.r_sp, trapno );  w.Int( trapno, 0 );
 				CASE trapno OF
 				| 1:		w.String( "  (WITH guard failed)" )
 				| 2:		w.String( "  (CASE invalid)" )
@@ -167,23 +161,20 @@ VAR
 		ELSE
 			w.String( "(Signal " );  w.Int( sig, 0 );  w.Char( ')' );
 		END;
+		w.Ln; w.Ln;
+		Registers( mc, w );	
 		w.Ln;
 		
 		process := Objects.CurrentProcess( );
-		pc := ucp.mc.r_pc;  bp := ucp.mc.r_bp;
+		sp := mc.r_sp;  pc := mc.r_pc;  bp := mc.r_bp;
 		IF pc = 0 THEN
 			(* assume call of procedure variable with value NIL *)
 			S.GET( sp, pc );   (* get return address on top of stack *)
 		END;
-		w.Ln;
-					
-		w.String( "    sp = " );  w.Address( sp );  w.String( ", fp = " );  w.Address( bp );
-		w.String( ", pc = " );  w.Address( pc );  w.Ln;
-		w.Ln;
-		Registers( ucp.mc, w );
+		
 		IF process # NIL THEN
 			Reflection.StackTraceBack( w, pc, bp, sp, Objects.GetStackBottom( process ), TRUE, FALSE );
-			SearchExceptionHandler( process, ucp, handler ); 
+			SearchExceptionHandler( process, mc, handler ); 
 		ELSE
 			(* avoid recusive trap in case of faulty module Objects *)
 			Reflection.StackTraceBack( w, pc, bp, sp, sp+512, TRUE, FALSE );
@@ -201,7 +192,7 @@ VAR
 				w.Ln;
 				w.String( "### program continues with exception handler ###" );   w.Ln;
 
-				Unix.ModifyContext( ucp, handler.pc, handler.fp, handler.sp );
+				Unix.ModifyContext( mc, handler.pc, handler.fp, handler.sp );
 				RETURN  (*! to exception handler !! *)
 			END
 		END;
@@ -227,7 +218,7 @@ VAR
 		END;
 	END UnlockOberon;
 
-	PROCEDURE CheckBP(fp: ADDRESS): ADDRESS;
+	PROCEDURE CheckBP( fp: ADDRESS ): ADDRESS;
 	VAR n: ADDRESS;
 	BEGIN
 		IF (fp # NIL) THEN
@@ -239,11 +230,11 @@ VAR
 	
 	
 
-	PROCEDURE SearchExceptionHandler( process: Objects.Process;  cont: Unix.Ucontext;  VAR handler: ExceptionHandler );
+	PROCEDURE SearchExceptionHandler( process: Objects.Process;  mc: Unix.Mcontext;  VAR handler: ExceptionHandler );
 	VAR entry, fp, sp, pc: ADDRESS;
 	BEGIN
 		handler.pc := 0;  (* no handler *)
-		pc := cont.mc.r_pc;  fp := cont.mc.r_bp;  sp := cont.mc.r_sp;
+		pc := mc.r_pc;  fp := mc.r_bp;  sp := mc.r_sp;
 		IF pc = 0 THEN
 			(* assume call of procedure variable with value NIL *)
 			S.GET( sp, pc );   (* get return address on top of stack *)
@@ -263,19 +254,9 @@ VAR
 	END SearchExceptionHandler;
 
 
-	PROCEDURE SignalHandler( signal: LONGINT;  scp, ucp: ADDRESS );
-		(* 'dummy' for 16 byte stack alignment, MacOS! *)
-	BEGIN
-		IF ~(signal IN  {1, 2, 14, 15}) (* SIGHUP, SIGINT, SIGALRM, SIGTERM *) THEN
-			Trap( signal, S.VAL( Unix.Ucontext, ucp ))
-		END
-	END SignalHandler;
-
-
-
 BEGIN
 	trapMutex := Unix.NewRecursiveMtx( );
 	trace := FALSE;  
-	Unix.InstallSignalHandler( SignalHandler );
+	Unix.InstallTrap( Trap );
 	unix := StdIO.env
 END Traps.