xnu-792.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 249c55f40af966562c5208f5b8faf3f63b43154f..8d90afd7df761bd50ceddb082b6ca6cca474a142 100644 (file)
--- a/osfmk/kdp/ml/ppc/kdp_machdep.c
+++ b/osfmk/kdp/ml/ppc/kdp_machdep.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -27,6 +27,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


@@ -382,21 +383,20 @@ kdp_machine_hostinfo(
     kdp_hostinfo_t *hostinfo
 )
 {
     kdp_hostinfo_t *hostinfo
 )
 {

-    machine_slot_t     m;

     int                        i;
 
     hostinfo->cpus_mask = 0;
     hostinfo->cpu_type = 0;
 
     for (i = 0; i < machine_info.max_cpus; i++) {
     int                        i;
 
     hostinfo->cpus_mask = 0;
     hostinfo->cpu_type = 0;
 
     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);

         }
     }
 }
         }
     }
 }


@@ -414,7 +414,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


@@ -608,7 +613,6 @@ kdp_print_backtrace(
 {
        extern void kdp_print_registers(struct savearea *);
        extern void print_backtrace(struct savearea *);
 {
        extern void kdp_print_registers(struct savearea *);
        extern void print_backtrace(struct savearea *);

-       extern unsigned int debug_mode, disableDebugOuput;

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


@@ -620,7 +624,7 @@ kdp_print_backtrace(
        while(1);
 }
 
        while(1);
 }
 

-unsigned int kdp_ml_get_breakinsn()
+unsigned int kdp_ml_get_breakinsn(void)

 {
   return 0x7fe00008;
 }
 {
   return 0x7fe00008;
 }