From owner-p4-projects@FreeBSD.ORG  Mon Apr  7 19:53:13 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E57537B404; Mon,  7 Apr 2003 19:53:13 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7ADC237B401
	for <perforce@freebsd.org>; Mon,  7 Apr 2003 19:53:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2624943FAF
	for <perforce@freebsd.org>; Mon,  7 Apr 2003 19:53:12 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h382rB0U070934
	for <perforce@freebsd.org>; Mon, 7 Apr 2003 19:53:11 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h382rBD1070931
	for perforce@freebsd.org; Mon, 7 Apr 2003 19:53:11 -0700 (PDT)
Date: Mon, 7 Apr 2003 19:53:11 -0700 (PDT)
Message-Id: <200304080253.h382rBD1070931@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28476 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2003 02:53:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=28476

Change 28476 by peter@peter_daintree on 2003/04/07 19:53:11

	Make sure we dont blow up in cpu_switch() for unknown reasons.
	Blow up for known reasons instead.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#14 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#14 (text+ko) ====

@@ -59,6 +59,10 @@
  * 16(%rsp) = newtd
  */
 ENTRY(cpu_throw)
+	movq	$nothrow, %rdi
+	call	serial_puts
+	movq	$nothrow, %rdi
+	call	panic
 	xorq	%rsi, %rsi
 	movl	PCPU(CPUID), %esi
 	movq	8(%rsp),%rcx			/* Old thread */
@@ -90,6 +94,11 @@
  */
 ENTRY(cpu_switch)
 
+	movq	$noswitch, %rdi
+	call	serial_puts
+	movq	$noswitch, %rdi
+	call	panic
+
 	/* Switch to new thread.  First, save context. */
 	movq	8(%rsp),%rcx
 
@@ -232,6 +241,8 @@
 sw0_3:	.asciz	"cpu_switch: no newthread supplied"
 #endif
 
+noswitch:	.asciz	"cpu_switch: called!"
+nothrow:	.asciz	"cpu_throw: called!"
 /*
  * savectx(pcb)
  * Update pcb, saving current processor state.