xnu-792.21.3.tar.gz

[apple/xnu.git] / osfmk / kdp / ml / ppc / kdp_machdep.c

diff --git a/osfmk/kdp/ml/ppc/kdp_machdep.c b/osfmk/kdp/ml/ppc/kdp_machdep.c
index f6cef9205396439b9dfe3370e917dd67fae87fa7..2c7e59f81585784edfcc21a02f1e72b541d74263 100644 (file)
--- a/osfmk/kdp/ml/ppc/kdp_machdep.c
+++ b/osfmk/kdp/ml/ppc/kdp_machdep.c
@@ -1,34 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1997 Apple Computer, Inc.  All rights reserved.
- * Copyright (c) 1994 NeXT Computer, Inc.  All rights reserved.
- *
- * machdep/ppc/kdp_machdep.c
- *
- * Machine-dependent code for Remote Debugging Protocol
- *
- * March, 1997 Created.        Umesh Vaishampayan [umeshv@NeXT.com]
- *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
  
 #include <mach/mach_types.h>
  */
  
 #include <mach/mach_types.h>


@@ -38,6 +33,7 @@
 #include <kdp/kdp_internal.h>
 #include <ppc/savearea.h>
 #include <kern/debug.h>
 #include <kdp/kdp_internal.h>
 #include <ppc/savearea.h>
 #include <kern/debug.h>

+#include <IOKit/IOPlatformExpert.h>

 
 #define KDP_TEST_HARNESS 0
 #if KDP_TEST_HARNESS
 
 #define KDP_TEST_HARNESS 0
 #if KDP_TEST_HARNESS


@@ -48,7 +44,7 @@
 
 void print_saved_state(void *);
 void kdp_call(void);
 
 void print_saved_state(void *);
 void kdp_call(void);

-void kdp_trap( unsigned int, struct ppc_thread_state *);
+void kdp_trap( unsigned int, struct savearea   *saved_state);

 int kdp_getc(void);
 boolean_t kdp_call_kdb(void);
 
 int kdp_getc(void);
 boolean_t kdp_call_kdb(void);
 


@@ -122,51 +118,101 @@ kdp_getintegerstate(
     struct ppc_thread_state            *state
 )
 {
     struct ppc_thread_state            *state
 )
 {

-    struct ppc_thread_state    *saved_state;
+    struct savearea    *saved_state;

    
     saved_state = kdp.saved_state;
    
     bzero((char *)state,sizeof (struct ppc_thread_state)) ;
 
    
     saved_state = kdp.saved_state;
    
     bzero((char *)state,sizeof (struct ppc_thread_state)) ;
 

-    state->srr0        = saved_state->srr0;
-    state->srr1        = saved_state->srr1;
-    state->r0  = saved_state->r0;
-    state->r1  = saved_state->r1;
-    state->r2  = saved_state->r2;
-    state->r3  = saved_state->r3;
-    state->r4  = saved_state->r4;
-    state->r5  = saved_state->r5;
-    state->r6  = saved_state->r6;
-    state->r7  = saved_state->r7;
-    state->r8  = saved_state->r8;
-    state->r9  = saved_state->r9;
-    state->r10 = saved_state->r10;
-    state->r11 = saved_state->r11;
-    state->r12 = saved_state->r12;
-    state->r13 = saved_state->r13;
-    state->r14 = saved_state->r14;
-    state->r15 = saved_state->r15;
-    state->r16 = saved_state->r16;
-    state->r17 = saved_state->r17;
-    state->r18 = saved_state->r18;
-    state->r19 = saved_state->r19;
-    state->r20 = saved_state->r20;
-    state->r21 = saved_state->r21;
-    state->r22 = saved_state->r22;
-    state->r23 = saved_state->r23;
-    state->r24 = saved_state->r24;
-    state->r25 = saved_state->r25;
-    state->r26 = saved_state->r26;
-    state->r27 = saved_state->r27;
-    state->r28 = saved_state->r28;
-    state->r29 = saved_state->r29;
-    state->r30 = saved_state->r30;
-    state->r31 = saved_state->r31;
-    state->cr  = saved_state->cr;
-    state->xer = saved_state->xer;
-    state->lr  = saved_state->lr;
-    state->ctr = saved_state->ctr;
-    state->mq  = saved_state->mq; /* This is BOGUS ! (601) ONLY */
+    state->srr0        = (unsigned int)saved_state->save_srr0;
+    state->srr1        = (unsigned int)saved_state->save_srr1;
+    state->r0  = (unsigned int)saved_state->save_r0;
+    state->r1  = (unsigned int)saved_state->save_r1;
+    state->r2  = (unsigned int)saved_state->save_r2;
+    state->r3  = (unsigned int)saved_state->save_r3;
+    state->r4  = (unsigned int)saved_state->save_r4;
+    state->r5  = (unsigned int)saved_state->save_r5;
+    state->r6  = (unsigned int)saved_state->save_r6;
+    state->r7  = (unsigned int)saved_state->save_r7;
+    state->r8  = (unsigned int)saved_state->save_r8;
+    state->r9  = (unsigned int)saved_state->save_r9;
+    state->r10 = (unsigned int)saved_state->save_r10;
+    state->r11 = (unsigned int)saved_state->save_r11;
+    state->r12 = (unsigned int)saved_state->save_r12;
+    state->r13 = (unsigned int)saved_state->save_r13;
+    state->r14 = (unsigned int)saved_state->save_r14;
+    state->r15 = (unsigned int)saved_state->save_r15;
+    state->r16 = (unsigned int)saved_state->save_r16;
+    state->r17 = (unsigned int)saved_state->save_r17;
+    state->r18 = (unsigned int)saved_state->save_r18;
+    state->r19 = (unsigned int)saved_state->save_r19;
+    state->r20 = (unsigned int)saved_state->save_r20;
+    state->r21 = (unsigned int)saved_state->save_r21;
+    state->r22 = (unsigned int)saved_state->save_r22;
+    state->r23 = (unsigned int)saved_state->save_r23;
+    state->r24 = (unsigned int)saved_state->save_r24;
+    state->r25 = (unsigned int)saved_state->save_r25;
+    state->r26 = (unsigned int)saved_state->save_r26;
+    state->r27 = (unsigned int)saved_state->save_r27;
+    state->r28 = (unsigned int)saved_state->save_r28;
+    state->r29 = (unsigned int)saved_state->save_r29;
+    state->r30 = (unsigned int)saved_state->save_r30;
+    state->r31 = (unsigned int)saved_state->save_r31;
+    state->cr  = (unsigned int)saved_state->save_cr;
+    state->xer = (unsigned int)saved_state->save_xer;
+    state->lr  = (unsigned int)saved_state->save_lr;
+    state->ctr = (unsigned int)saved_state->save_ctr;
+}
+
+static void
+kdp_getintegerstate64(
+    struct ppc_thread_state64  *state
+)
+{
+    struct savearea    *saved_state;
+   
+    saved_state = kdp.saved_state;
+   
+    bzero((char *)state,sizeof (struct ppc_thread_state64)) ;
+
+    state->srr0        = saved_state->save_srr0;
+    state->srr1        = saved_state->save_srr1;
+    state->r0  = saved_state->save_r0;
+    state->r1  = saved_state->save_r1;
+    state->r2  = saved_state->save_r2;
+    state->r3  = saved_state->save_r3;
+    state->r4  = saved_state->save_r4;
+    state->r5  = saved_state->save_r5;
+    state->r6  = saved_state->save_r6;
+    state->r7  = saved_state->save_r7;
+    state->r8  = saved_state->save_r8;
+    state->r9  = saved_state->save_r9;
+    state->r10 = saved_state->save_r10;
+    state->r11 = saved_state->save_r11;
+    state->r12 = saved_state->save_r12;
+    state->r13 = saved_state->save_r13;
+    state->r14 = saved_state->save_r14;
+    state->r15 = saved_state->save_r15;
+    state->r16 = saved_state->save_r16;
+    state->r17 = saved_state->save_r17;
+    state->r18 = saved_state->save_r18;
+    state->r19 = saved_state->save_r19;
+    state->r20 = saved_state->save_r20;
+    state->r21 = saved_state->save_r21;
+    state->r22 = saved_state->save_r22;
+    state->r23 = saved_state->save_r23;
+    state->r24 = saved_state->save_r24;
+    state->r25 = saved_state->save_r25;
+    state->r26 = saved_state->save_r26;
+    state->r27 = saved_state->save_r27;
+    state->r28 = saved_state->save_r28;
+    state->r29 = saved_state->save_r29;
+    state->r30 = saved_state->save_r30;
+    state->r31 = saved_state->save_r31;
+    state->cr  = saved_state->save_cr;
+    state->xer = saved_state->save_xer;
+    state->lr  = saved_state->save_lr;
+    state->ctr = saved_state->save_ctr;

 }
 
 kdp_error_t
 }
 
 kdp_error_t


@@ -184,13 +230,19 @@ kdp_machine_read_regs(
                kdp_getintegerstate((struct ppc_thread_state *)data);
                *size = PPC_THREAD_STATE_COUNT * sizeof(int);
                return KDPERR_NO_ERROR;
                kdp_getintegerstate((struct ppc_thread_state *)data);
                *size = PPC_THREAD_STATE_COUNT * sizeof(int);
                return KDPERR_NO_ERROR;

-       
+
+    case PPC_THREAD_STATE64:
+               dprintf(("kdp_readregs THREAD_STATE\n"));
+               kdp_getintegerstate64((struct ppc_thread_state64 *)data);
+               *size = PPC_THREAD_STATE64_COUNT * sizeof(int);
+               return KDPERR_NO_ERROR;
+

     case PPC_FLOAT_STATE:
                dprintf(("kdp_readregs THREAD_FPSTATE\n"));
                bzero((char *)data ,sizeof(struct ppc_float_state));    
                *size = PPC_FLOAT_STATE_COUNT * sizeof(int);
                return KDPERR_NO_ERROR;
     case PPC_FLOAT_STATE:
                dprintf(("kdp_readregs THREAD_FPSTATE\n"));
                bzero((char *)data ,sizeof(struct ppc_float_state));    
                *size = PPC_FLOAT_STATE_COUNT * sizeof(int);
                return KDPERR_NO_ERROR;

-       
+

     default:
                dprintf(("kdp_readregs bad flavor %d\n"));
                return KDPERR_BADFLAVOR;
     default:
                dprintf(("kdp_readregs bad flavor %d\n"));
                return KDPERR_BADFLAVOR;


@@ -202,49 +254,97 @@ kdp_setintegerstate(
     struct ppc_thread_state            *state
 )
 {
     struct ppc_thread_state            *state
 )
 {

-    struct ppc_thread_state    *saved_state;
+    struct savearea    *saved_state;

    
     saved_state = kdp.saved_state;
 
    
     saved_state = kdp.saved_state;
 

-    saved_state->srr0  = state->srr0;
-    saved_state->srr1  = state->srr1;
-    saved_state->r0    = state->r0;
-    saved_state->r1    = state->r1;
-    saved_state->r2    = state->r2;
-    saved_state->r3    = state->r3;
-    saved_state->r4    = state->r4;
-    saved_state->r5    = state->r5;
-    saved_state->r6    = state->r6;
-    saved_state->r7    = state->r7;
-    saved_state->r8    = state->r8;
-    saved_state->r9    = state->r9;
-    saved_state->r10   = state->r10;
-    saved_state->r11   = state->r11;
-    saved_state->r12   = state->r12;
-    saved_state->r13   = state->r13;
-    saved_state->r14   = state->r14;
-    saved_state->r15   = state->r15;
-    saved_state->r16   = state->r16;
-    saved_state->r17   = state->r17;
-    saved_state->r18   = state->r18;
-    saved_state->r19   = state->r19;
-    saved_state->r20   = state->r20;
-    saved_state->r21   = state->r21;
-    saved_state->r22   = state->r22;
-    saved_state->r23   = state->r23;
-    saved_state->r24   = state->r24;
-    saved_state->r25   = state->r25;
-    saved_state->r26   = state->r26;
-    saved_state->r27   = state->r27;
-    saved_state->r28   = state->r28;
-    saved_state->r29   = state->r29;
-    saved_state->r30   = state->r30;
-    saved_state->r31   = state->r31;
-    saved_state->cr    = state->cr;
-    saved_state->xer   = state->xer;
-    saved_state->lr    = state->lr;
-    saved_state->ctr   = state->ctr;
-    saved_state->mq    = state->mq; /* BOGUS! (601)ONLY */
+    saved_state->save_srr0     = state->srr0;
+    saved_state->save_srr1     = state->srr1;
+    saved_state->save_r0       = state->r0;
+    saved_state->save_r1       = state->r1;
+    saved_state->save_r2       = state->r2;
+    saved_state->save_r3       = state->r3;
+    saved_state->save_r4       = state->r4;
+    saved_state->save_r5       = state->r5;
+    saved_state->save_r6       = state->r6;
+    saved_state->save_r7       = state->r7;
+    saved_state->save_r8       = state->r8;
+    saved_state->save_r9       = state->r9;
+    saved_state->save_r10      = state->r10;
+    saved_state->save_r11      = state->r11;
+    saved_state->save_r12      = state->r12;
+    saved_state->save_r13      = state->r13;
+    saved_state->save_r14      = state->r14;
+    saved_state->save_r15      = state->r15;
+    saved_state->save_r16      = state->r16;
+    saved_state->save_r17      = state->r17;
+    saved_state->save_r18      = state->r18;
+    saved_state->save_r19      = state->r19;
+    saved_state->save_r20      = state->r20;
+    saved_state->save_r21      = state->r21;
+    saved_state->save_r22      = state->r22;
+    saved_state->save_r23      = state->r23;
+    saved_state->save_r24      = state->r24;
+    saved_state->save_r25      = state->r25;
+    saved_state->save_r26      = state->r26;
+    saved_state->save_r27      = state->r27;
+    saved_state->save_r28      = state->r28;
+    saved_state->save_r29      = state->r29;
+    saved_state->save_r30      = state->r30;
+    saved_state->save_r31      = state->r31;
+    saved_state->save_cr       = state->cr;
+    saved_state->save_xer      = state->xer;
+    saved_state->save_lr       = state->lr;
+    saved_state->save_ctr      = state->ctr;
+}
+
+static void
+kdp_setintegerstate64(
+    struct ppc_thread_state64          *state
+)
+{
+    struct savearea    *saved_state;
+   
+    saved_state = kdp.saved_state;
+
+    saved_state->save_srr0     = state->srr0;
+    saved_state->save_srr1     = state->srr1;
+    saved_state->save_r0       = state->r0;
+    saved_state->save_r1       = state->r1;
+    saved_state->save_r2       = state->r2;
+    saved_state->save_r3       = state->r3;
+    saved_state->save_r4       = state->r4;
+    saved_state->save_r5       = state->r5;
+    saved_state->save_r6       = state->r6;
+    saved_state->save_r7       = state->r7;
+    saved_state->save_r8       = state->r8;
+    saved_state->save_r9       = state->r9;
+    saved_state->save_r10      = state->r10;
+    saved_state->save_r11      = state->r11;
+    saved_state->save_r12      = state->r12;
+    saved_state->save_r13      = state->r13;
+    saved_state->save_r14      = state->r14;
+    saved_state->save_r15      = state->r15;
+    saved_state->save_r16      = state->r16;
+    saved_state->save_r17      = state->r17;
+    saved_state->save_r18      = state->r18;
+    saved_state->save_r19      = state->r19;
+    saved_state->save_r20      = state->r20;
+    saved_state->save_r21      = state->r21;
+    saved_state->save_r22      = state->r22;
+    saved_state->save_r23      = state->r23;
+    saved_state->save_r24      = state->r24;
+    saved_state->save_r25      = state->r25;
+    saved_state->save_r26      = state->r26;
+    saved_state->save_r27      = state->r27;
+    saved_state->save_r28      = state->r28;
+    saved_state->save_r29      = state->r29;
+    saved_state->save_r30      = state->r30;
+    saved_state->save_r31      = state->r31;
+    saved_state->save_cr       = state->cr;
+    saved_state->save_xer      = state->xer;
+    saved_state->save_lr       = state->lr;
+    saved_state->save_ctr      = state->ctr;

 }
 
 kdp_error_t
 }
 
 kdp_error_t


@@ -265,11 +365,19 @@ kdp_machine_write_regs(
                DumpTheSave((struct savearea *)data);           /* (TEST/DEBUG) */
 #endif
                return KDPERR_NO_ERROR;
                DumpTheSave((struct savearea *)data);           /* (TEST/DEBUG) */
 #endif
                return KDPERR_NO_ERROR;

-       
+
+    case PPC_THREAD_STATE64:
+               dprintf(("kdp_writeregs THREAD_STATE64\n"));
+               kdp_setintegerstate64((struct ppc_thread_state64 *)data);
+
+#if KDP_TEST_HARNESS
+               DumpTheSave((struct savearea *)data);           /* (TEST/DEBUG) */
+#endif
+               return KDPERR_NO_ERROR;

     case PPC_FLOAT_STATE:
                dprintf(("kdp_writeregs THREAD_FPSTATE\n"));
                return KDPERR_NO_ERROR;
     case PPC_FLOAT_STATE:
                dprintf(("kdp_writeregs THREAD_FPSTATE\n"));
                return KDPERR_NO_ERROR;

-       
+

     default:
                dprintf(("kdp_writeregs bad flavor %d\n"));
                return KDPERR_BADFLAVOR;
     default:
                dprintf(("kdp_writeregs bad flavor %d\n"));
                return KDPERR_BADFLAVOR;


@@ -281,20 +389,20 @@ kdp_machine_hostinfo(
     kdp_hostinfo_t *hostinfo
 )
 {
     kdp_hostinfo_t *hostinfo
 )
 {

-    machine_slot_t     m;

     int                        i;
 
     hostinfo->cpus_mask = 0;
     int                        i;
 
     hostinfo->cpus_mask = 0;

+    hostinfo->cpu_type = 0;

 
     for (i = 0; i < machine_info.max_cpus; i++) {
 
     for (i = 0; i < machine_info.max_cpus; i++) {

-        m = &machine_slot[i];
-        if (!m->is_cpu)
+        if ((PerProcTable[i].ppe_vaddr == (struct per_proc_info *)NULL) || 
+           !(PerProcTable[i].ppe_vaddr->running))

             continue;
        
         hostinfo->cpus_mask |= (1 << i);
         if (hostinfo->cpu_type == 0) {
             continue;
        
         hostinfo->cpus_mask |= (1 << i);
         if (hostinfo->cpu_type == 0) {

-            hostinfo->cpu_type = m->cpu_type;
-            hostinfo->cpu_subtype = m->cpu_subtype;
+            hostinfo->cpu_type = slot_type(i);
+            hostinfo->cpu_subtype = slot_subtype(i);

         }
     }
 }
         }
     }
 }


@@ -312,7 +420,12 @@ kdp_panic(
 void
 kdp_reboot(void)
 {
 void
 kdp_reboot(void)
 {

-       halt_all_cpus(TRUE);;
+       printf("Attempting system restart...");
+       /* Call the platform specific restart*/
+       if (PE_halt_restart) 
+               (*PE_halt_restart)(kPERestartCPU);
+       /* If we do reach this, give up */
+       halt_all_cpus(TRUE);

 }
 
 int
 }
 
 int


@@ -426,20 +539,17 @@ int kdp_noisy;
 void
 kdp_trap(
     unsigned int               exception,
 void
 kdp_trap(
     unsigned int               exception,

-    struct ppc_thread_state    *saved_state
+    struct savearea    *saved_state

 )
 {
        unsigned int *fp;
 )
 {
        unsigned int *fp;

-        unsigned int register sp;
-       struct ppc_thread_state *state;
+       unsigned int sp;
+       struct savearea *state;

 
        if (kdp_noisy) {
                if (kdp_backtrace) {
                        printf("\nvector=%x, \n", exception/4);
 
        if (kdp_noisy) {
                if (kdp_backtrace) {
                        printf("\nvector=%x, \n", exception/4);

-#ifdef XXX
-                       regDump(saved_state);
-#endif
-                       sp = saved_state->r1;
+                       sp = saved_state->save_r1;

                        printf("stack backtrace - sp(%x)  ", sp);
                        fp = (unsigned int *) *((unsigned int *)sp);
                        while (fp) {
                        printf("stack backtrace - sp(%x)  ", sp);
                        fp = (unsigned int *) *((unsigned int *)sp);
                        while (fp) {


@@ -454,23 +564,21 @@ kdp_trap(
                }
 #endif
        
                }
 #endif
        

-       printf("vector=%d  ", exception/4);
+               printf("vector=%d  ", exception/4);

        }
        }

-

        kdp_raise_exception(kdp_code(exception), 0, 0, saved_state);
 
        if (kdp_noisy)
                printf("kdp_trap: kdp_raise_exception() ret\n");
 
        kdp_raise_exception(kdp_code(exception), 0, 0, saved_state);
 
        if (kdp_noisy)
                printf("kdp_trap: kdp_raise_exception() ret\n");
 

-       if (*((int *)saved_state->srr0) == 0x7c800008)
-               saved_state->srr0 += 4; /* BKPT_SIZE */
-               
-       if(saved_state->srr1 & (MASK(MSR_SE) | MASK(MSR_BE))) { /* Are we just stepping or continuing */
+       if ((unsigned int)(saved_state->save_srr0) == 0x7c800008)
+               saved_state->save_srr0 += 4;                    /* BKPT_SIZE */
+
+       if(saved_state->save_srr1 & (MASK(MSR_SE) | MASK(MSR_BE))) {    /* Are we just stepping or continuing */

                db_run_mode = STEP_ONCE;                                /* We are stepping */
        }
        else db_run_mode = STEP_CONTINUE;                       /* Otherwise we are continuing */
                db_run_mode = STEP_ONCE;                                /* We are stepping */
        }
        else db_run_mode = STEP_CONTINUE;                       /* Otherwise we are continuing */

-
-
+       

 #ifdef XXX
        mtspr(dabr, kdp_dabr);
 #endif
 #ifdef XXX
        mtspr(dabr, kdp_dabr);
 #endif


@@ -484,36 +592,33 @@ kdp_call_kdb(
        return(TRUE);
 }
 
        return(TRUE);
 }
 

-void kdp_print_registers(struct ppc_saved_state *state)
+void kdp_print_registers(struct savearea *state)

 {
        int i;
        for (i=0; i<32; i++) {
                if ((i % 8) == 0)
                        printf("\n%4d :",i);
 {
        int i;
        for (i=0; i<32; i++) {
                if ((i % 8) == 0)
                        printf("\n%4d :",i);

-                       printf(" %08x",*(&state->r0+i));
+                       printf(" %08x",*(&state->save_r0+i));

        }
        printf("\n");
        }
        printf("\n");

-       printf("cr        = 0x%08x\t\t",state->cr);
-       printf("xer       = 0x%08x\n",state->xer);
-       printf("lr        = 0x%08x\t\t",state->lr);
-       printf("ctr       = 0x%08x\n",state->ctr);
-       printf("srr0(iar) = 0x%08x\t\t",state->srr0);
-       printf("srr1(msr) = 0x%08B\n",state->srr1,
+       printf("cr        = 0x%08x\t\t",state->save_cr);
+       printf("xer       = 0x%08x\n",state->save_xer);
+       printf("lr        = 0x%08x\t\t",state->save_lr);
+       printf("ctr       = 0x%08x\n",state->save_ctr);
+       printf("srr0(iar) = 0x%08x\t\t",state->save_srr0);
+       printf("srr1(msr) = 0x%08B\n",state->save_srr1,

                "\x10\x11""EE\x12PR\x13""FP\x14ME\x15""FE0\x16SE\x18"
                "FE1\x19""AL\x1a""EP\x1bIT\x1c""DT");
                "\x10\x11""EE\x12PR\x13""FP\x14ME\x15""FE0\x16SE\x18"
                "FE1\x19""AL\x1a""EP\x1bIT\x1c""DT");

-       printf("mq        = 0x%08x\t\t",state->mq);
-       printf("sr_copyin = 0x%08x\n",state->sr_copyin);

        printf("\n");
 }
 
 void
 kdp_print_backtrace(
     unsigned int                exception,
        printf("\n");
 }
 
 void
 kdp_print_backtrace(
     unsigned int                exception,

-    struct ppc_saved_state     *saved_state)
+    struct savearea     *saved_state)

 {
 {

-       extern void kdp_print_registers(struct ppc_saved_state *);
-       extern void print_backtrace(struct ppc_saved_state *);
-       extern unsigned int debug_mode, disableDebugOuput;
+       extern void kdp_print_registers(struct savearea *);
+       extern void print_backtrace(struct savearea *);

 
        disableDebugOuput = FALSE;
        debug_mode = TRUE;
 
        disableDebugOuput = FALSE;
        debug_mode = TRUE;


@@ -524,3 +629,8 @@ kdp_print_backtrace(
        printf("panic: We are hanging here...\n");
        while(1);
 }
        printf("panic: We are hanging here...\n");
        while(1);
 }

+
+unsigned int kdp_ml_get_breakinsn(void)
+{
+  return 0x7fe00008;
+}