xnu-344.49.tar.gz

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

diff --git a/osfmk/ppc/low_trace.h b/osfmk/ppc/low_trace.h
index 389852db9b3332ea580cabd72c6758c953f85dfe..90551671c1807bcc80a726925554226e98c332cb 100644 (file)
--- a/osfmk/ppc/low_trace.h
+++ b/osfmk/ppc/low_trace.h
@@ -39,7 +39,6 @@
 #ifndef _LOW_TRACE_H_
 #define _LOW_TRACE_H_
 
-#pragma pack(4)                                                        /* Make sure the structure stays as we defined it */
 typedef struct LowTraceRecord {
 
        unsigned short  LTR_cpu;                        /* 0000 - CPU address */
@@ -47,29 +46,22 @@ typedef struct LowTraceRecord {
        unsigned int    LTR_timeHi;                     /* 0004 - High order time */
        unsigned int    LTR_timeLo;                     /* 0008 - Low order time */
        unsigned int    LTR_cr;                         /* 000C - CR */
-       unsigned int    LTR_dsisr;                      /* 0010 - DSISR */
-       unsigned int    LTR_rsvd0;                      /* 0014 - reserved */
-       uint64_t                LTR_srr0;                       /* 0018 - SRR0 */
-
-       uint64_t                LTR_srr1;                       /* 0020 - SRR1 */
-       uint64_t                LTR_dar;                        /* 0028 - DAR */
-       uint64_t                LTR_save;                       /* 0030 - savearea */
-       uint64_t                LTR_lr;                         /* 0038 - LR */
-
-       uint64_t                LTR_ctr;                        /* 0040 - CTR */
-       uint64_t                LTR_r0;                         /* 0048 - R0 */
-       uint64_t                LTR_r1;                         /* 0050 - R1 */
-       uint64_t                LTR_r2;                         /* 0058 - R2 */
-
-       uint64_t                LTR_r3;                         /* 0060 - R3 */
-       uint64_t                LTR_r4;                         /* 0068 - R4 */
-       uint64_t                LTR_r5;                         /* 0070 - R5 */
-       uint64_t                LTR_r6;                         /* 0078 - R6 */
+       unsigned int    LTR_srr0;                       /* 0010 - SRR0 */
+       unsigned int    LTR_srr1;                       /* 0014 - SRR1 */
+       unsigned int    LTR_dar;                        /* 0018 - DAR */
+       unsigned int    LTR_save;                       /* 001C - savearea */
+       
+       unsigned int    LTR_lr;                         /* 0020 - LR */
+       unsigned int    LTR_ctr;                        /* 0024 - CTR */
+       unsigned int    LTR_r0;                         /* 0028 - R0 */
+       unsigned int    LTR_r1;                         /* 002C - R1 */
+       unsigned int    LTR_r2;                         /* 0030 - R2 */
+       unsigned int    LTR_r3;                         /* 0034 - R3 */
+       unsigned int    LTR_r4;                         /* 0038 - R4 */
+       unsigned int    LTR_r5;                         /* 003C - R5 */
 
 } LowTraceRecord;              
-#pragma pack()
 
-#pragma pack(4)                                                        /* Make sure the structure stays as we defined it */
 typedef struct traceWork {
 
        unsigned int traceCurr;                         /* Address of next slot */
@@ -77,10 +69,8 @@ typedef struct traceWork {
        unsigned int traceStart;                        /* Start of trace table */
        unsigned int traceEnd;                          /* End of trace table */
        unsigned int traceMsnd;                         /* Saved trace mask */
-       unsigned int traceSize;                         /* Size of trace table. Min 1 page */
-       unsigned int traceGas[2];
+       unsigned int traceGas[3];
 } traceWork;
-#pragma pack()
 
 extern traceWork trcWork;
 extern unsigned int lastTrace;                 /* Value of low-level exception trace controls */