]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/ppc/Diagnostics.c
xnu-792.tar.gz
[apple/xnu.git] / osfmk / ppc / Diagnostics.c
index ffa7e0f6481c252667d0034d63b8ebbc22c370dc..0e858703495933db4d880af52f9b5ec1ebe3a1fb 100644 (file)
@@ -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@
  * 
 #include <mach/boolean.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <mach/boolean.h>
 #include <kern/thread.h>
 #include <kern/task.h>
+#include <kern/ipc_kobject.h>
 #include <mach/vm_param.h>
 #include <mach/vm_param.h>
+#include <ipc/port.h>
+#include <ipc/ipc_entry.h>
+#include <ipc/ipc_space.h>
+#include <ipc/ipc_object.h>
+#include <ipc/ipc_port.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/pmap.h>
+#include <ppc/cpu_internal.h>
 #include <ppc/exception.h>
 #include <ppc/Firmware.h>
 #include <ppc/low_trace.h>
 #include <ppc/exception.h>
 #include <ppc/Firmware.h>
 #include <ppc/low_trace.h>
 #include <ppc/mappings.h>
 #include <ppc/pmap.h>
 #include <ppc/mem.h>
 #include <ppc/mappings.h>
 #include <ppc/pmap.h>
 #include <ppc/mem.h>
-#include <ppc/pmap_internals.h>
 #include <ppc/savearea.h>
 #include <ppc/Diagnostics.h>
 #include <ppc/savearea.h>
 #include <ppc/Diagnostics.h>
-#include <ppc/machine_cpu.h>
 #include <pexpert/pexpert.h>
 #include <pexpert/pexpert.h>
-#include <ppc/POWERMAC/video_console.h>
+#include <console/video_console.h>
 #include <ppc/trap.h>
 
 extern struct vc_info vinfo;
 #include <ppc/trap.h>
 
 extern struct vc_info vinfo;
+extern uint32_t warFlags;
+#define warDisMBpoff   0x80000000
 
 kern_return_t testPerfTrap(int trapno, struct savearea *ss, 
 
 kern_return_t testPerfTrap(int trapno, struct savearea *ss, 
-       unsigned int dsisr, unsigned int dar);
+       unsigned int dsisr, addr64_t dar);
+
 
 int diagCall(struct savearea *save) {
 
 
 int diagCall(struct savearea *save) {
 
@@ -75,8 +83,16 @@ int diagCall(struct savearea *save) {
        } ttt, adj;
        natural_t tbu, tbu2, tbl;
        struct per_proc_info *per_proc;                                 /* Area for my per_proc address */
        } ttt, adj;
        natural_t tbu, tbu2, tbl;
        struct per_proc_info *per_proc;                                 /* Area for my per_proc address */
-       int cpu;
-       unsigned int tstrt, tend, temp, temp2;
+       int cpu, ret, subc;
+       unsigned int tstrt, tend, temp, temp2, *baddr, oldwar;
+       addr64_t src, snk;
+       uint64_t scom, hid1, hid4, srrwrk, stat;
+       scomcomm sarea;
+       ipc_port_t port;
+       ipc_entry_t ientry;
+       processor_t prssr;
+       vm_address_t addrs;
+       
 
        if(!(dgWork.dgFlags & enaDiagSCs)) return 0;    /* If not enabled, cause an exception */
 
 
        if(!(dgWork.dgFlags & enaDiagSCs)) return 0;    /* If not enabled, cause an exception */
 
@@ -116,7 +132,7 @@ int diagCall(struct savearea *save) {
  */
                case dgLRA:
                
  */
                case dgLRA:
                
-                       save->save_r3 = pmap_extract(current_act()->map->pmap, save->save_r4);  /* Get read address */
+                       save->save_r3 = pmap_find_phys(current_thread()->map->pmap, save->save_r4);     /* Get read address */
                        
                        return -1;                                                              /* Return no AST checking... */
                        
                        
                        return -1;                                                              /* Return no AST checking... */
                        
@@ -125,11 +141,58 @@ int diagCall(struct savearea *save) {
  */
                case dgpcpy:
                
  */
                case dgpcpy:
                
-#if 0
-                       save->save_r3 = copyp2v(save->save_r4, save->save_r5, save->save_r6);   /* Copy the physical page */
+               
+#if 1
+                       src = (save->save_r4 << 32) | (0x00000000FFFFFFFFULL & save->save_r5);  /* Merge into 64-bit */
+                       snk = (save->save_r6 << 32) | (0x00000000FFFFFFFFULL & save->save_r7);  /* Merge into 64-bit */
+                       save->save_r3 = copypv(src, snk, save->save_r8, save->save_r9); /* Copy the physical page */
 #endif                 
                        return 1;                                                               /* Return and check for ASTs... */
                        
 #endif                 
                        return 1;                                                               /* Return and check for ASTs... */
                        
+/*
+ *             Read/Write physical memory
+ */
+               case dgprw:
+               
+                       src = (save->save_r5 << 32) | (0x00000000FFFFFFFFULL & save->save_r6);  /* Merge into 64-bit */
+                       
+                       switch(save->save_r4) {                                 /* Select the actual function */
+
+                               case 0:
+                                       save->save_r3 = (uint64_t)ml_phys_read_byte((unsigned int)src);
+                                       break;
+                       
+                               case 1:
+                                       save->save_r3 = (uint64_t)ml_phys_read_byte_64(src);
+                                       break;
+                               
+                               case 2:
+                                       save->save_r3 = (uint64_t)ml_phys_read((unsigned int)src);
+                                       break;
+                               
+                               case 3:
+                                       save->save_r3 = (uint64_t)ml_phys_read_64(src);
+                                       break;
+
+                               case 4:
+                                       ml_phys_write_byte((unsigned int)src, (unsigned int)save->save_r7);
+                                       break;
+                       
+                               case 5:
+                                       ml_phys_write_byte_64(src, (unsigned int)save->save_r7);
+                                       break;
+                               
+                               case 6:
+                                       ml_phys_write((unsigned int)src, (unsigned int)save->save_r7);
+                                       break;
+                               
+                               case 7:
+                                       ml_phys_write_64(src, (unsigned int)save->save_r7);
+                                       break;
+                       }
+
+                       return 1;                                                               /* Return and check for ASTs... */
+                       
                        
 /*
  *             Soft reset processor
                        
 /*
  *             Soft reset processor
@@ -138,14 +201,14 @@ int diagCall(struct savearea *save) {
                
                        cpu = save->save_r4;                                    /* Get the requested CPU number */
                        
                
                        cpu = save->save_r4;                                    /* Get the requested CPU number */
                        
-                       if(cpu >= NCPUS) {                                              /* Check for bogus cpu */
+                       if(cpu >= MAX_CPUS) {                                           /* Check for bogus cpu */
                                save->save_r3 = KERN_FAILURE;           /* Set failure */
                                return 1;
                        }
                
                                save->save_r3 = KERN_FAILURE;           /* Set failure */
                                return 1;
                        }
                
-                       if(!machine_slot[cpu].running) return KERN_FAILURE;     /* It is not running */ 
+                       per_proc = PerProcTable[cpu].ppe_vaddr;         /* Point to the processor */
+                       if(!per_proc->running) return KERN_FAILURE;     /* It is not running */ 
 
 
-                       per_proc = &per_proc_info[cpu];                 /* Point to the processor */
                        
                        (void)PE_cpu_start(per_proc->cpu_id, 
                                                per_proc->start_paddr, (vm_offset_t)per_proc);
                        
                        (void)PE_cpu_start(per_proc->cpu_id, 
                                                per_proc->start_paddr, (vm_offset_t)per_proc);
@@ -159,16 +222,7 @@ int diagCall(struct savearea *save) {
  */
                case dgFlush:
                
  */
                case dgFlush:
                
-#if 1
                        cacheInit();                                                    /* Blow cache */
                        cacheInit();                                                    /* Blow cache */
-#else
-                       asm volatile("  mftb %0" : "=r" (tstrt));
-                       tend = tstrt;                   
-                       while((tend - tstrt) < 0x000A2837) {
-                               asm volatile("  mftb %0" : "=r" (tend));
-                       }
-
-#endif
                        return 1;                                                               /* Return and check for ASTs... */
 
 /*
                        return 1;                                                               /* Return and check for ASTs... */
 
 /*
@@ -176,8 +230,10 @@ int diagCall(struct savearea *save) {
  */
                case dgtest:
                
  */
                case dgtest:
                
-                       if(save->save_r4) perfTrapHook = testPerfTrap;
-                       else perfTrapHook = 0;
+                       kprintf("Trying to hang\n");
+                       baddr = (unsigned int)&baddr | 1;               /* Make an odd address */
+                       __asm__ volatile("lwarx r2,0,%0" : : "r" (baddr));
+                       kprintf("Didn't hang\n");
 
                        return 1;                                                               /* Return and check for ASTs... */
                        
 
                        return 1;                                                               /* Return and check for ASTs... */
                        
@@ -189,9 +245,9 @@ int diagCall(struct savearea *save) {
  *             parms - vaddr, paddr, size, prot, attributes
  */
                case dgBMphys:
  *             parms - vaddr, paddr, size, prot, attributes
  */
                case dgBMphys:
-               
-                       pmap_map_block(current_act()->map->pmap, save->save_r4, save->save_r5, save->save_r6,   /* Map in the block */
-                               save->save_r7, save->save_r8, 0);
+                                       
+                       pmap_map_block(current_thread()->map->pmap, (addr64_t)save->save_r4,    /* Map in the block */ 
+                               save->save_r5, save->save_r6, save->save_r7, save->save_r8, 0);
 
                        return 1;                                                               /* Return and check for ASTs... */
                
 
                        return 1;                                                               /* Return and check for ASTs... */
                
@@ -203,35 +259,23 @@ int diagCall(struct savearea *save) {
  */
                case dgUnMap:
                
  */
                case dgUnMap:
                
-                       (void)mapping_remove(current_act()->map->pmap, save->save_r4);  /* Remove mapping */
+                       (void)mapping_remove(current_thread()->map->pmap, save->save_r4);       /* Remove mapping */
                        return 1;                                                               /* Return and check for ASTs... */
        
                        
 /*
  *             Allows direct control of alignment handling.
  *
                        return 1;                                                               /* Return and check for ASTs... */
        
                        
 /*
  *             Allows direct control of alignment handling.
  *
- *             The bottom two bits of the parameter are used to set the two control bits:
- *             0b00 - !trapUnalignbit - !notifyUnalignbit - default - instruction is emulated
- *             0b01 - !trapUnalignbit -  notifyUnalignbit - emulation is done, but traps afterwards
- *             0b10 -  trapUnalignbit - !notifyUnalignbit - no emulation - causes exception
- *             0b11 -  trapUnalignbit -  notifyUnalignbit - no emulation - causes exception
+ *             The bottom bit of the parameter is used to set the control bit, enaNotifyEM.
  */
                case dgAlign:
                
  */
                case dgAlign:
                
-                       temp = current_act()->mact.specFlags;   /* Save the old values */
+                       temp = dgWork.dgFlags;                          /* Save the old values */
                        
                        
-                       temp = ((current_act()->mact.specFlags >> (31 - trapUnalignbit - 1))    /* Reformat them to pass back */
-                               | (current_act()->mact.specFlags >> (31 - notifyUnalignbit))) & 3;
-                               
-                       temp2 = ((save->save_r4 << (31 - trapUnalignbit - 1)) & trapUnalign)    /* Move parms into flag format */
-                               | ((save->save_r4 << (31 - notifyUnalignbit)) & notifyUnalign);
-
-                       current_act()->mact.specFlags &= ~(trapUnalign | notifyUnalign);                /* Clean the old ones */
-                       current_act()->mact.specFlags |= temp2;                                                                 /* Set the new ones */
-                       
-                       per_proc_info[cpu_number()].spcFlags = current_act()->mact.specFlags;
-                       
-                       save->save_r3 = temp;
+                       temp2 = (save->save_r4 & 1) << (31 - enaNotifyEMb);     /* Move parms into flag format */
+                       dgWork.dgFlags = (temp & ~enaNotifyEM) | temp2; /* Set the flag */
+               
+                       save->save_r3 = (temp >> (31 - enaNotifyEMb)) & 1;      /* Return the original */
                        
                        return 1;                                                               /* Return and check for ASTs... */
                        
                        
                        return 1;                                                               /* Return and check for ASTs... */
                        
@@ -240,14 +284,265 @@ int diagCall(struct savearea *save) {
  */
                case dgBootScreen:
                        
  */
                case dgBootScreen:
                        
-#if 0
                        ml_set_interrupts_enabled(1);
                        ml_set_interrupts_enabled(1);
-                       (void)copyout((char *)&vinfo, (char *)save->save_r4, sizeof(struct vc_info));   /* Copy out the video info */
+                       (void)copyout((char *)&vinfo, save->save_r4, sizeof(struct vc_info));   /* Copy out the video info */ 
                        ml_set_interrupts_enabled(0);
                        ml_set_interrupts_enabled(0);
-#endif
                        return 1;                                                               /* Return and check for ASTs... */
                        
                        return 1;                                                               /* Return and check for ASTs... */
                        
+/*
+ *             Don't return info for boot screen
+ */
+               case dgCPNull:
+                       
+                       ml_set_interrupts_enabled(1);
+                       (void)copyout((char *)&vinfo, save->save_r4, 0);        /* Copy out nothing */
+                       ml_set_interrupts_enabled(0);
+                       return 1;                                                               /* Return and check for ASTs... */
+                       
+/*
+ *             Test machine check handler - only on 64-bit machines
+ */
+               case dgmck:
+                       if(!(PerProcTable[0].ppe_vaddr->pf.Available & pf64Bit)) return 0;      /* Leave if not correct machine */
+
+                       fwEmMck(save->save_r4, save->save_r5, save->save_r6, save->save_r7, save->save_r8, save->save_r9);      /* Start injecting */ 
+
+                       return -1;                                                              /* Return and don't check for ASTs... */
+
+/*
+ *             Set 64-bit on or off - only on 64-bit machines
+ */
+               case dg64:
+                       if(!(PerProcTable[0].ppe_vaddr->pf.Available & pf64Bit)) return 0;      /* Leave if not correct machine */
+
+                       srrwrk = save->save_srr1 >> 63;                 /* Save the old 64-bit bit */
+                       
+                       save->save_srr1 = (save->save_srr1 & 0x7FFFFFFFFFFFFFFFULL) | (save->save_r4 << 63);    /* Set the requested mode */
+                       save->save_r3 = srrwrk;                                 /* Return the old value */
+
+                       task_clear_64BitAddr(current_thread()->task);
+                       if((save->save_r4 & 1)) task_set_64BitAddr(current_thread()->task);
+
+                       return -1;                                                              /* Return and don't check for ASTs... */
+               
+/*
+ *             Test the probe read function
+ */
+
+               case dgProbeRead:
                
                
+                       src = (save->save_r4 << 32) | (0x00000000FFFFFFFFULL & save->save_r5);  /* Merge into 64-bit */
+                       save->save_r3 = ml_probe_read_64(src, &temp);   /* Try the address */
+                       save->save_r4 = temp;                                   /* Return the data */
+                       return -1;                                                              /* Regurn and don't check for ASTs */
+               
+/*
+ *             Do perf monitor stuff
+ */
+
+               case dgPerfMon:
+               
+                       setPmon(save->save_r4, save->save_r5);  /* Go load up MMCR0 and MMCR1 */
+                       return -1;                                                              /* Regurn and don't check for ASTs */
+
+/*
+ *             Map a page
+ *             Don't bother to check for any errors.
+ *             parms - vaddr, paddr, prot, attributes
+ */
+               case dgMapPage:
+                                       
+                       (void)mapping_make(current_thread()->map->pmap, /* Map in the page */ 
+                               (addr64_t)(((save->save_r5 & 0xFFFFFFFF) << 32) | (save->save_r5 & 0xFFFFFFFF)), save->save_r6, 0, 1, VM_PROT_READ|VM_PROT_WRITE);
+
+                       return -1;                                                              /* Return and check for ASTs... */
+               
+/*
+ *             SCOM interface
+ *             parms - pointer to scomcomm
+ */
+               case dgScom:
+                                       
+                       ret = copyin(save->save_r4, (void *)&sarea, sizeof(scomcomm));  /* Get the data */
+                       if(ret) return 0;                                               /* Copyin failed - return an exception */
+                       
+                       sarea.scomstat = 0xFFFFFFFFFFFFFFFFULL; /* Clear status */
+                       cpu = cpu_number();                                             /* Get us */
+                       
+                       if((sarea.scomcpu < real_ncpus) && PerProcTable[sarea.scomcpu].ppe_vaddr->running) {
+                               if(sarea.scomcpu == cpu) {                      /* Is it us? */
+                                       if(sarea.scomfunc) {                    /* Are we writing */
+                                               sarea.scomstat = ml_scom_write(sarea.scomreg, sarea.scomdata);  /* Write scom */
+                                       }
+                                       else {
+                                               sarea.scomstat = ml_scom_read(sarea.scomreg, &sarea.scomdata);  /* Read scom */
+                                       }
+                               }
+                               else {                                                                  /* Otherwise, tell the other processor */
+                                       (void)cpu_signal(sarea.scomcpu, SIGPcpureq, CPRQscom ,(unsigned int)&sarea);    /* Ask him to do this */
+                                       (void)hw_cpu_sync((unsigned long)&sarea.scomstat, LockTimeOut); /* Wait for the other processor to get its temperature */
+                               }
+                       }
+
+                       ret = copyout((void *)&sarea, save->save_r4, sizeof(scomcomm)); /* Get the data */
+                       if(ret) return 0;                                               /* Copyin failed - return an exception */
+       
+                       return -1;                                                              /* Return and check for ASTs... */
+               
+/*
+ *             Bind current thread to a processor. Parm is processor port.  If port is 0, unbind. 
+ */
+       
+               case dgBind:
+
+                       if(save->save_r4 == 0) {                                /* Are we unbinding? */
+                               thread_bind(current_thread(), PROCESSOR_NULL);  /* Unbind us */
+                               save->save_r3 = KERN_SUCCESS;           /* Set success */
+                               return -1;                                                      /* Return and check asts */
+                       }
+
+                       ret = ipc_right_lookup_write(current_space(), (mach_port_name_t)save->save_r4, 
+                               &ientry);                                                       /* Look up the IPC entry */
+                       
+                       if(ret != KERN_SUCCESS) {                               /* Couldn't find it */
+                               save->save_r3 = ret;                            /* Pass back return */
+                               return -1;                                                      /* Return and check asts */
+                       }
+
+                       port = (ipc_port_t)ientry->ie_object;   /* Get the actual port */
+
+                       if (!ip_active(port) || (ip_kotype(port) != IKOT_PROCESSOR)) {  /* Active and a processor? */
+                               is_write_unlock(current_space());       /* Unlock the space */
+                               save->save_r3 = KERN_INVALID_ARGUMENT;  /* This port is not a processor */
+                               return -1;                                                      /* Return and check asts */
+                       }
+
+                       prssr = (processor_t)port->ip_kobject;  /* Extract the processor */
+                       is_write_unlock(current_space());               /* All done with the space now, unlock it */
+                       
+/*
+ *                     The following probably isn't valid if a processor is in the processor going offline,
+ *                     but who cares, this is a diagnostic interface...
+ */
+                       
+                       if(prssr->state == PROCESSOR_SHUTDOWN) {        /* Are we trying to bind to an offline processor? */
+                               save->save_r3 = KERN_INVALID_ARGUMENT;  /* This processor is offline */
+                               return -1;                                                      /* Return and check asts */
+                       }
+               
+                       thread_bind(current_thread(), prssr);   /* Bind us to the processor */
+                       thread_block(THREAD_CONTINUE_NULL);             /* Make it so */
+       
+                       save->save_r3 = KERN_SUCCESS;                   /* Set success */
+                       return -1;                                                              /* Return and check asts */
+                       
+/*
+ *             Return per_proc for the named processor.  Pass in a port.  Returns per_proc or 0 if failure
+ */
+       
+               case dgPproc:
+
+                       ret = ipc_right_lookup_write(current_space(), (mach_port_name_t)save->save_r4, 
+                               &ientry);                                                       /* Look up the IPC entry */
+                       
+                       if(ret != KERN_SUCCESS) {                               /* Couldn't find it */
+                               save->save_r3 = 0;                                      /* Pass back return */
+                               return -1;                                                      /* Return and check asts */
+                       }
+
+                       port = (ipc_port_t)ientry->ie_object;   /* Get the actualy port */
+
+                       if (!ip_active(port) || (ip_kotype(port) != IKOT_PROCESSOR)) {  /* Active and a processor? */
+                               is_write_unlock(current_space());       /* Unlock the space */
+                               save->save_r3 = 0;                                      /* This port is not a processor */
+                               return -1;                                                      /* Return and check asts */
+                       }
+
+                       prssr = (processor_t)port->ip_kobject;  /* Extract the processor */
+                       is_write_unlock(current_space());               /* All done with the space now, unlock it */
+                       
+                       save->save_r3 = (uint64_t)PerProcTable[prssr->processor_data.slot_num].ppe_vaddr;       /* Pass back ther per proc */
+                       return -1;                                                              /* Return and check asts */
+
+/*
+ *             Allocate contiguous memory in the kernel. Pass in size, pass back vaddr or 0 for error
+ *             Note that this must be explicitly released by the user.  There is an "issue"
+ *             if we try to allocate directly into the user: the contiguous area has a kernel wire
+ *             on it.   If we terminate, we will hang waiting for wire to be released.  Ain't no
+ *             way that will happen,  so we do it in the kernel and make them release it.  That way
+ *             we will leak rather than hang. 
+ *             
+ */
+               case dgAcntg:
+                                       
+                       addrs = 0;                                                              /* Clear just in case */
+                       
+                       ret = kmem_alloc_contig(kernel_map, &addrs, (vm_size_t)save->save_r4,
+                               PAGE_MASK, 0);                                          /* That which does not make us stronger, kills us... */
+                       if(ret != KERN_SUCCESS) addrs = 0;              /* Pass 0 if error */
+               
+                       save->save_r3 = (uint64_t)addrs;                /* Pass back whatever */
+                       return -1;                                                              /* Return and check for ASTs... */
+               
+
+/*
+ *             Return physical address of a page in the kernel
+ */
+               case dgKlra:
+               
+                       save->save_r3 = pmap_find_phys(kernel_pmap, save->save_r4);     /* Get read address */
+                       return -1;                                                              /* Return no AST checking... */
+
+/*
+ *             Release kernel memory - intent is to release congiguous memory
+ */
+               case dgKfree:
+               
+                       kmem_free( kernel_map, (vm_address_t) save->save_r4, (vm_size_t)save->save_r5);
+                       return -1;                                                              /* Return no AST checking... */
+
+               
+               case dgWar:                                                                     /* Set or reset workaround flags */
+               
+                       save->save_r3 = (uint32_t)warFlags;             /* Get the old flags */
+                       oldwar = warFlags;                                              /* Remember the old war flags */
+                       
+                       subc = (int32_t)save->save_r4;                  /* Extract the subcommand */
+                       switch(subc) {                                                  /* Do what we need */
+                               case 1:                                                         /* Replace all */
+                                       warFlags = (uint32_t)save->save_r5;     /* Do them all */
+                                       break;
+                               
+                               case 2:                                                         /* Turn on selected workarounds */
+                                       warFlags = warFlags | (uint32_t)save->save_r5;
+                                       break;
+                                       
+                               case 3:                                                         /* Turn off selected workarounds */
+                                       warFlags = warFlags & ~((uint32_t)save->save_r5);
+                                       break;
+                               
+                               case 4:                                                         /* Start up selected workaround */
+                                       break;
+                               
+                               case 5:                                                         /* Stop selected workaround */
+                                       break;
+                               
+                               case 6:                                                         /* Reset specific workaround parameters to default */
+                                       break;
+                               
+                               case 7:                                                         /* Set workaround parameters */
+                                       break;
+
+                               default:
+                               
+                                       break;
+                                       
+                       }
+
+                       save->save_r3 = oldwar;                                 /* Pass back original */
+                       return -1;                              
+
+
                default:                                                                        /* Handle invalid ones */
                        return 0;                                                               /* Return an exception */
                
                default:                                                                        /* Handle invalid ones */
                        return 0;                                                               /* Return an exception */
                
@@ -256,7 +551,7 @@ int diagCall(struct savearea *save) {
 };
 
 kern_return_t testPerfTrap(int trapno, struct savearea *ss, 
 };
 
 kern_return_t testPerfTrap(int trapno, struct savearea *ss, 
-       unsigned int dsisr, unsigned int dar) {
+       unsigned int dsisr, addr64_t dar) {
 
        if(trapno != T_ALIGNMENT) return KERN_FAILURE;
 
 
        if(trapno != T_ALIGNMENT) return KERN_FAILURE;
 
@@ -266,3 +561,4 @@ kern_return_t testPerfTrap(int trapno, struct savearea *ss,
        return KERN_SUCCESS;
 
 }
        return KERN_SUCCESS;
 
 }
+