Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 22 May 2002 19:20:51 -0700 (PDT)
From:      Jonathan Mini <mini@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 11759 for review
Message-ID:  <200205230220.g4N2Kp283440@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11759

Change 11759 by mini@mini_stylus on 2002/05/22 19:20:51

	Pointy hat to me, I seem to have selected the wrong label.
	userout -> out, which is what we use in -CURRENT (and makes
	more sense anyways).

Affected files ...

... //depot/projects/kse/sys/i386/i386/trap.c#42 edit

Differences ...

==== //depot/projects/kse/sys/i386/i386/trap.c#42 (text+ko) ====

@@ -286,7 +286,7 @@
 #ifdef DEV_NPX
 			ucode = npxtrap();
 			if (ucode == -1)
-				goto userout;
+				goto out;
 #else
 			ucode = code;
 #endif
@@ -336,7 +336,7 @@
 			}
 #endif
 			if (i == -1)
-				goto userout;
+				goto out;
 			if (i == 0)
 				goto user;
 
@@ -361,7 +361,7 @@
 				lastalert = time_second;
 			}
 			mtx_unlock(&Giant);
-			goto userout;
+			goto out;
 #else /* !POWERFAIL_NMI */
 			/* machine/parity/power fail/"kitchen sink" faults */
 			/* XXX Giant */
@@ -376,7 +376,7 @@
 					kdb_trap (type, 0, &frame);
 				}
 #endif /* DDB */
-				goto userout;
+				goto out;
 			} else if (panic_on_nmi)
 				panic("NMI indicates hardware failure");
 			break;
@@ -397,7 +397,7 @@
 #ifdef DEV_NPX
 			/* transparent fault (due to context switch "late") */
 			if (npxdna())
-				goto userout;
+				goto out;
 #endif
 			if (!pmath_emulate) {
 				i = SIGFPE;
@@ -409,7 +409,7 @@
 			mtx_unlock(&Giant);
 			if (i == 0) {
 				if (!(frame.tf_eflags & PSL_T))
-					goto userout;
+					goto out;
 				frame.tf_eflags &= ~PSL_T;
 				i = SIGTRAP;
 			}
@@ -434,7 +434,7 @@
 		switch (type) {
 		case T_PAGEFLT:			/* page fault */
 			(void) trap_pfault(&frame, FALSE, eva);
-			goto userout;
+			goto out;
 
 		case T_DNA:
 #ifdef DEV_NPX
@@ -444,7 +444,7 @@
 			 * registered such use.
 			 */
 			if (npxdna())
-				goto userout;
+				goto out;
 #endif
 			break;
 
@@ -464,7 +464,7 @@
 					 * returns to original process
 					 */
 					vm86_trap((struct vm86frame *)&frame);
-				goto userout;
+				goto out;
 			}
 			if (type == T_STKFLT)
 				break;
@@ -492,7 +492,7 @@
 				PROC_LOCK(p);
 				psignal(p, SIGBUS);
 				PROC_UNLOCK(p);
-				goto userout;
+				goto out;
 			}
 
 			/*
@@ -507,25 +507,25 @@
 			 */
 			if (frame.tf_eip == (int)doreti_iret) {
 				frame.tf_eip = (int)doreti_iret_fault;
-				goto userout;
+				goto out;
 			}
 			if (frame.tf_eip == (int)doreti_popl_ds) {
 				frame.tf_eip = (int)doreti_popl_ds_fault;
-				goto userout;
+				goto out;
 			}
 			if (frame.tf_eip == (int)doreti_popl_es) {
 				frame.tf_eip = (int)doreti_popl_es_fault;
-				goto userout;
+				goto out;
 			}
 			if (frame.tf_eip == (int)doreti_popl_fs) {
 				frame.tf_eip = (int)doreti_popl_fs_fault;
-				goto userout;
+				goto out;
 			}
 			if (PCPU_GET(curpcb) != NULL &&
 			    PCPU_GET(curpcb)->pcb_onfault != NULL) {
 				frame.tf_eip =
 				    (int)PCPU_GET(curpcb)->pcb_onfault;
-				goto userout;
+				goto out;
 			}
 			break;
 
@@ -541,7 +541,7 @@
 			 */
 			if (frame.tf_eflags & PSL_NT) {
 				frame.tf_eflags &= ~PSL_NT;
-				goto userout;
+				goto out;
 			}
 			break;
 
@@ -553,7 +553,7 @@
 				 * silently until the syscall handler has
 				 * saved the flags.
 				 */
-				goto userout;
+				goto out;
 			}
 			if (frame.tf_eip == (int)IDTVEC(lcall_syscall) + 1) {
 				/*
@@ -561,7 +561,7 @@
 				 * flags.  Stop single stepping it.
 				 */
 				frame.tf_eflags &= ~PSL_T;
-				goto userout;
+				goto out;
 			}
 			/*
 			 * Ignore debug register trace traps due to
@@ -580,7 +580,7 @@
 				 * processor doesn't
 				 */
 				load_dr6(rdr6() & 0xfffffff0);
-				goto userout;
+				goto out;
 			}
 			/*
 			 * Fall through (TRCTRAP kernel mode, kernel address)
@@ -593,7 +593,7 @@
 #ifdef DDB
 			/* XXX Giant */
 			if (kdb_trap (type, 0, &frame))
-				goto userout;
+				goto out;
 #endif
 			break;
 
@@ -607,7 +607,7 @@
 				lastalert = time_second;
 			}
 			mtx_unlock(&Giant);
-			goto userout;
+			goto out;
 #else /* !POWERFAIL_NMI */
 			/* XXX Giant */
 			/* machine/parity/power fail/"kitchen sink" faults */
@@ -622,16 +622,16 @@
 					kdb_trap (type, 0, &frame);
 				}
 #endif /* DDB */
-				goto userout;
+				goto out;
 			} else if (panic_on_nmi == 0)
-				goto userout;
+				goto out;
 			/* FALL THROUGH */
 #endif /* POWERFAIL_NMI */
 #endif /* DEV_ISA */
 		}
 
 		trap_fatal(&frame, eva);
-		goto userout;
+		goto out;
 	}
 
 	/* Translate fault for emulators (e.g. Linux) */
@@ -653,7 +653,7 @@
 user:
 	userret(td, &frame, sticks);
 	mtx_assert(&Giant, MA_NOTOWNED);
-userout:
+out:
 	return;
 }
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205230220.g4N2Kp283440>