PERFORCE change 228887 for review

[Philip Withnall]

http://p4web.freebsd.org/@@228887?ac=10

Change 228887 by prw35 at 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);