xnu-4903.241.1.tar.gz

[apple/xnu.git] / osfmk / i386 / Diagnostics.h

diff --git a/osfmk/i386/Diagnostics.h b/osfmk/i386/Diagnostics.h
index c8d385c7bca02f4bd09df9fc4414e04b1715c63b..133ddc463a7ba0610f019c7fd8e9aef24ff16b2f 100644 (file)
--- a/osfmk/i386/Diagnostics.h
+++ b/osfmk/i386/Diagnostics.h
@@ -35,18 +35,16 @@
 /*
  *     Here are the Diagnostic interface interfaces
  *     Lovingly crafted by Bill Angell using traditional methods
- *     Keep selectors in sync with the PPC version where possible.     
  */
 #ifdef KERNEL_PRIVATE
 
 #ifndef _DIAGNOSTICS_H_
 #define _DIAGNOSTICS_H_
 
-#ifdef __ppc__
-#error This file is not useful on PowerPC.
+#if !(defined(__i386__) || defined(__x86_64__))
+#error This file is not useful on non-Intel
 #endif
 
-int diagCall(x86_saved_state_t *regs);
 int diagCall64(x86_saved_state_t *regs);
 
 #define diagSCnum 0x00006000
@@ -61,44 +59,35 @@ int diagCall64(x86_saved_state_t *regs);
 #define dgBootScreen 7
 #define dgFlush 8
 #define dgAlign 9
-#define dgprw 10
+#define dgGzallocTest 10
 #define dgmck 11
 #define dg64 12
 #define dgProbeRead 13
 #define dgCPNull 14
 #define dgPerfMon 15
 #define dgMapPage 16
-#define dgScom 17
+#define dgPowerStat 17
 #define dgBind 18
-#define dgPproc 19
 #define dgAcntg 20
 #define dgKlra 21
-#define dgKfree 22
+#define dgEnaPMC 22
 #define        dgWar 23
 #define dgNapStat 24
 #define dgRuptStat 25
-
+#define        dgPermCheck 26
 
 typedef struct diagWork {                      /* Diagnostic work area */
 
        unsigned int dgLock;                    /* Lock if needed */
        unsigned int dgFlags;                   /* Flags */
 #define enaExpTrace 0x00000001
-#define enaExpTraceb 31
 #define enaUsrFCall 0x00000002
-#define enaUsrFCallb 30
 #define enaUsrPhyMp 0x00000004
-#define enaUsrPhyMpb 29
 #define enaDiagSCs  0x00000008
-#define enaDiagSCsb  28
 #define enaDiagDM  0x00000010
-#define enaDiagSDMb  27
 #define enaDiagEM  0x00000020
-#define enaDiagEMb  26
 #define enaDiagTrap  0x00000040
-#define enaDiagTrapb  25
 #define enaNotifyEM  0x00000080
-#define enaNotifyEMb  24
        
        unsigned int dgMisc0;
        unsigned int dgMisc1;
@@ -111,7 +100,21 @@ typedef struct diagWork {                  /* Diagnostic work area */
 
 extern diagWork dgWork;
 
+#define FIXED_PMC (1 << 30)
+#define FIXED_PMC0 (FIXED_PMC)
+#define FIXED_PMC1 (FIXED_PMC | 1)
+#define FIXED_PMC2 (FIXED_PMC | 2)
+#define GPMC0 (0)
+#define GPMC1 (1)
+#define GPMC2 (2)
+#define GPMC3 (3)
 
+static inline uint64_t read_pmc(uint32_t counter)
+{
+       uint32_t lo = 0, hi = 0;
+       __asm__ volatile("rdpmc" : "=a" (lo), "=d" (hi) : "c" (counter));
+       return ((((uint64_t)hi) << 32) | ((uint64_t)lo));
+}
 #endif /* _DIAGNOSTICS_H_ */
 
 #endif /* KERNEL_PRIVATE */