Module Name: src
Committed By: matt
Date: Wed Feb 16 18:42:33 UTC 2011
Modified Files:
src/sys/arch/powerpc/include: cpu.h
Log Message:
Fix CLKF_INTR
Add debug evcnt.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.74 src/sys/arch/powerpc/include/cpu.h:1.75
--- src/sys/arch/powerpc/include/cpu.h:1.74 Tue Jan 18 01:02:54 2011
+++ src/sys/arch/powerpc/include/cpu.h Wed Feb 16 18:42:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.74 2011/01/18 01:02:54 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.75 2011/02/16 18:42:33 matt Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -136,6 +136,7 @@
struct evcnt ci_ev_isi; /* user ISI traps */
struct evcnt ci_ev_isi_fatal; /* user ISI trap failures */
struct evcnt ci_ev_pgm; /* user PGM traps */
+ struct evcnt ci_ev_debug; /* user debug traps */
struct evcnt ci_ev_fpu; /* FPU traps */
struct evcnt ci_ev_fpusw; /* FPU context switch */
struct evcnt ci_ev_ali; /* Alignment traps */
@@ -323,7 +324,7 @@
#define CLKF_USERMODE(frame) (((frame)->cf_srr1 & PSL_PR) != 0)
#define CLKF_PC(frame) ((frame)->cf_srr0)
-#define CLKF_INTR(frame) ((frame)->cf_idepth >= 0)
+#define CLKF_INTR(frame) ((frame)->cf_idepth > 0)
#define LWP_PC(l) (trapframe(l)->tf_srr0)