xnu-1228.12.14.tar.gz

[apple/xnu.git] / osfmk / ppc / hw_counters.h

diff --git a/osfmk/ppc/hw_counters.h b/osfmk/ppc/hw_counters.h
index 712c9f3e52d5613b1fbd6b7026d6a95c79417101..99b984a50a8c3b84a016b22465952f7bb479dcf9 100644 (file)
--- a/osfmk/ppc/hw_counters.h
+++ b/osfmk/ppc/hw_counters.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  *
@@ -33,6 +36,7 @@
 #error This file is only useful on PowerPC.
 #endif
 
+#pragma pack(4)                                                                /* Make sure the structure stays as we defined it */
 
 typedef struct hw_counters {   
 
@@ -58,8 +62,9 @@ typedef struct hw_counters {
        unsigned int hw_rsvd3;                                  /* Reserved */
        unsigned int hw_InstBreakpoints;                /* Instruction breakpoint */
        unsigned int hw_SystemManagements;              /* System management */
-       unsigned int hw_rsvd4;                                  /* Reserved */
-       unsigned int hw_AltivecAssists;                 /* Altivec Assist */
+       unsigned int hw_AltivecAssists;                 /* Altivec Assist */
+       unsigned int hw_Thermal;                                /* Thermals */
+       unsigned int hw_rsvd5;                                  /* Reserved */
        unsigned int hw_rsvd6;                                  /* Reserved */
        unsigned int hw_rsvd7;                                  /* Reserved */
        unsigned int hw_rsvd8;                                  /* Reserved */
@@ -68,15 +73,24 @@ typedef struct hw_counters {
        unsigned int hw_rsvd11;                                 /* Reserved */
        unsigned int hw_rsvd12;                                 /* Reserved */
        unsigned int hw_rsvd13;                                 /* Reserved */
-       unsigned int hw_rsvd14;                                 /* Reserved */
        unsigned int hw_Trace601;                               /* Trace */
        unsigned int hw_SIGPs;                                  /* SIGP */
        unsigned int hw_Preemptions;                    /* Preemption */
        unsigned int hw_ContextSwitchs;                 /* Context switch */
+       unsigned int hw_Shutdowns;                              /* Shutdowns */
+       unsigned int hw_Chokes;                                 /* System ABENDs */
+       unsigned int hw_DataSegments;                   /* Data Segment Interruptions */
+       unsigned int hw_InstructionSegments;    /* Instruction Segment Interruptions */
+       unsigned int hw_SoftPatches;                    /* Soft Patch interruptions */
+       unsigned int hw_Maintenances;                   /* Maintenance interruptions */
+       unsigned int hw_Instrumentations;               /* Instrumentation interruptions */
+       unsigned int hw_rsvd14;                                 /* Reswerved */
+       unsigned int hw_hdec;                                   /* Hypervisor decrementer */
        
-       unsigned int hw_spare[27];                              /* Pad to 256 bytes */
+       unsigned int hw_spare[18];                              /* Pad to 256 bytes */
 
 } hw_counters;
+#pragma pack()
 
 extern hw_counters hw_counts(NCPUS);