From owner-p4-projects@FreeBSD.ORG Sat Jul 28 11:39:30 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66C1D1065673; Sat, 28 Jul 2012 11:39:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FA221065670 for ; Sat, 28 Jul 2012 11:39:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 06E1B8FC08 for ; Sat, 28 Jul 2012 11:39:28 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6SBdRQA040341 for ; Sat, 28 Jul 2012 11:39:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6SBdRlc040338 for perforce@freebsd.org; Sat, 28 Jul 2012 11:39:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Jul 2012 11:39:27 GMT Message-Id: <201207281139.q6SBdRlc040338@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 215041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2012 11:39:30 -0000 http://p4web.freebsd.org/@@215041?ac=10 Change 215041 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/07/28 11:38:28 Add explicit comments that C2 EPCC is saved and restored by SAVE_CP2_CONTEXT() and RESTORE_CP2_CONTEXT() near saving and restoring of C0 EPC. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/exception.S#6 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#7 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/exception.S#6 (text+ko) ==== @@ -484,6 +484,9 @@ SAVE_U_PCB_REG(a2, BADVADDR, k1) SAVE_U_PCB_REG(a3, PC, k1) #ifdef CPU_CHERI + /* + * Note: This saves EPCC, matching the explicit EPC save above. + */ SAVE_CP2_CONTEXT(t0, k1) #endif REG_S a3, CALLFRAME_RA(sp) # for debugging @@ -536,6 +539,9 @@ SAVE_U_PCB_REG(a1, SR, k1) #ifdef CPU_CHERI + /* + * Note: This restores EPCC, matching the explicit EPC restore below. + */ RESTORE_CP2_CONTEXT(t0, k1) #endif RESTORE_U_PCB_REG(t0, MULLO, k1) @@ -754,6 +760,9 @@ SAVE_U_PCB_REG(a1, CAUSE, k1) SAVE_U_PCB_REG(a3, PC, k1) # PC in a3, note used later! #ifdef CPU_CHERI + /* + * Note: This saves EPCC, matching the explicit EPC save above. + */ SAVE_CP2_CONTEXT(t0, k1) #endif PTR_SUBU sp, k1, CALLFRAME_SIZ # switch to kernel SP @@ -815,6 +824,9 @@ SAVE_U_PCB_REG(a1, SR, k1) #ifdef CPU_CHERI + /* + * Note: This restores EPCC, matching the explicit EPC restore below. + */ RESTORE_CP2_CONTEXT(t0, k1) #endif RESTORE_U_PCB_REG(s0, S0, k1) ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#7 (text+ko) ==== @@ -122,6 +122,9 @@ PTR_L k1, PC_CURPCB(k1) #ifdef CPU_CHERI + /* + * Note: This restores EPCC, matching the explicit EPC restore below. + */ RESTORE_CP2_CONTEXT(t0, k1) #endif RESTORE_U_PCB_REG(t0, MULLO, k1)