From owner-p4-projects@FreeBSD.ORG Mon May 20 23:24:54 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D777992; Mon, 20 May 2013 23:24:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C24EC990 for ; Mon, 20 May 2013 23:24:53 +0000 (UTC) (envelope-from prw35@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 97E2DDD for ; Mon, 20 May 2013 23:24:53 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r4KNOr00013621 for ; Mon, 20 May 2013 23:24:53 GMT (envelope-from prw35@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r4KNOr89013618 for perforce@freebsd.org; Mon, 20 May 2013 23:24:53 GMT (envelope-from prw35@FreeBSD.org) Date: Mon, 20 May 2013 23:24:53 GMT Message-Id: <201305202324.r4KNOr89013618@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to prw35@FreeBSD.org using -f From: Philip Withnall Subject: PERFORCE change 228887 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2013 23:24:54 -0000 http://p4web.freebsd.org/@@228887?ac=10 Change 228887 by prw35@pwithnall_zenith on 2013/05/20 23:24:43 Fix printing of capability register tags in cheri_log_exception() The tag for $c0 was being printed for all registers. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#13 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#13 (text+ko) ==== @@ -288,7 +288,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c0, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 0); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 0); @@ -296,7 +296,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c1, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 0); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 1); @@ -304,7 +304,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c2, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 0); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 2); @@ -312,7 +312,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c3, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 0); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 3); @@ -320,7 +320,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c24, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 0); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 24); @@ -328,7 +328,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c26, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 0); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 26); @@ -336,7 +336,7 @@ intr_disable(); CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_pcc, 0); CHERI_GETCAPREG(CHERI_CR_KR1C, c); - CHERI_CGETTAG(ctag, 31); + CHERI_CGETTAG(ctag, CHERI_CR_KR1C); intr_enable(); CHERI_REG_PRINT(c, ctag, 31);