PERFORCE change 57483 for review
John Baldwin
jhb at FreeBSD.org
Fri Jul 16 13:38:22 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=57483
Change 57483 by jhb at jhb_slimer on 2004/07/16 20:38:04
IFC @57478.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/alpha-gdbstub.c#5 delete
.. //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#6 integrate
.. //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#6 integrate
.. //depot/projects/smpng/sys/alpha/alpha/db_interface.c#10 integrate
.. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#10 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#9 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#7 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#8 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#8 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#6 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#7 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#9 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#8 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#9 integrate
.. //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#6 integrate
.. //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#1 branch
.. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#29 integrate
.. //depot/projects/smpng/sys/alpha/alpha/machdep.c#69 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#59 integrate
.. //depot/projects/smpng/sys/alpha/alpha/promcons.c#19 integrate
.. //depot/projects/smpng/sys/alpha/alpha/trap.c#53 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#37 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#5 integrate
.. //depot/projects/smpng/sys/alpha/conf/NOTES#8 integrate
.. //depot/projects/smpng/sys/alpha/include/db_machdep.h#6 integrate
.. //depot/projects/smpng/sys/alpha/include/gdb_machdep.h#1 branch
.. //depot/projects/smpng/sys/alpha/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/alpha/include/pcb.h#5 integrate
.. //depot/projects/smpng/sys/alpha/include/ptrace.h#7 integrate
.. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#18 integrate
.. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#16 integrate
.. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#4 delete
.. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/gdb_machdep.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#25 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#27 integrate
.. //depot/projects/smpng/sys/amd64/amd64/support.S#11 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#19 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#18 integrate
.. //depot/projects/smpng/sys/amd64/include/db_machdep.h#3 integrate
.. //depot/projects/smpng/sys/amd64/include/frame.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/pcb.h#9 integrate
.. //depot/projects/smpng/sys/amd64/include/pmap.h#12 integrate
.. //depot/projects/smpng/sys/amd64/isa/clock.c#8 integrate
.. //depot/projects/smpng/sys/arm/arm/db_interface.c#2 integrate
.. //depot/projects/smpng/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/smpng/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#4 integrate
.. //depot/projects/smpng/sys/arm/include/bus_memio.h#1 branch
.. //depot/projects/smpng/sys/arm/include/bus_pio.h#1 branch
.. //depot/projects/smpng/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/db_machdep.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/frame.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/arm/include/pcb.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/setjmp.h#2 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#27 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.h#3 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#21 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_low.h#4 integrate
.. //depot/projects/smpng/sys/coda/coda_fbsd.c#9 integrate
.. //depot/projects/smpng/sys/coda/coda_vfsops.c#15 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_socket.c#16 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#16 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#12 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#17 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#16 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#17 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#16 integrate
.. //depot/projects/smpng/sys/conf/NOTES#74 integrate
.. //depot/projects/smpng/sys/conf/files#115 integrate
.. //depot/projects/smpng/sys/conf/files.alpha#30 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#19 integrate
.. //depot/projects/smpng/sys/conf/files.i386#64 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#42 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#61 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#20 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#40 integrate
.. //depot/projects/smpng/sys/conf/options#81 integrate
.. //depot/projects/smpng/sys/conf/options.alpha#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/fla/COPYRIGHT#2 delete
.. //depot/projects/smpng/sys/contrib/dev/fla/README#2 delete
.. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#11 delete
.. //depot/projects/smpng/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete
.. //depot/projects/smpng/sys/contrib/dev/fla/msysosak.h#2 delete
.. //depot/projects/smpng/sys/contrib/dev/fla/patch.00#2 delete
.. //depot/projects/smpng/sys/contrib/dev/fla/prep.fla.sh#2 delete
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#15 integrate
.. //depot/projects/smpng/sys/ddb/db_access.c#4 integrate
.. //depot/projects/smpng/sys/ddb/db_break.c#7 integrate
.. //depot/projects/smpng/sys/ddb/db_command.c#18 integrate
.. //depot/projects/smpng/sys/ddb/db_elf.c#7 delete
.. //depot/projects/smpng/sys/ddb/db_kld.c#4 delete
.. //depot/projects/smpng/sys/ddb/db_main.c#1 branch
.. //depot/projects/smpng/sys/ddb/db_output.c#10 integrate
.. //depot/projects/smpng/sys/ddb/db_print.c#3 integrate
.. //depot/projects/smpng/sys/ddb/db_ps.c#26 integrate
.. //depot/projects/smpng/sys/ddb/db_run.c#7 integrate
.. //depot/projects/smpng/sys/ddb/db_sysctl.c#3 delete
.. //depot/projects/smpng/sys/ddb/db_thread.c#1 branch
.. //depot/projects/smpng/sys/ddb/db_trap.c#3 delete
.. //depot/projects/smpng/sys/ddb/db_variables.c#4 integrate
.. //depot/projects/smpng/sys/ddb/db_variables.h#3 integrate
.. //depot/projects/smpng/sys/ddb/ddb.h#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#68 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#19 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#2 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#13 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#44 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#14 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#54 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#41 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_mem.c#6 integrate
.. //depot/projects/smpng/sys/dev/ct/ct.c#6 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#9 integrate
.. //depot/projects/smpng/sys/dev/cy/cy.c#5 integrate
.. //depot/projects/smpng/sys/dev/dcons/dcons.c#5 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.c#24 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.h#8 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#23 integrate
.. //depot/projects/smpng/sys/dev/fb/creator.c#5 integrate
.. //depot/projects/smpng/sys/dev/fb/fb.c#11 integrate
.. //depot/projects/smpng/sys/dev/fb/splashreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#1 branch
.. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#2 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_pccard.c#2 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdcvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#34 integrate
.. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#12 integrate
.. //depot/projects/smpng/sys/dev/harp/if_harp.c#5 integrate
.. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#7 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#9 integrate
.. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#9 integrate
.. //depot/projects/smpng/sys/dev/led/led.c#9 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#51 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#4 integrate
.. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#7 integrate
.. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#22 integrate
.. //depot/projects/smpng/sys/dev/nsp/nsp.c#8 integrate
.. //depot/projects/smpng/sys/dev/null/null.c#17 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#18 integrate
.. //depot/projects/smpng/sys/dev/ofw/openpromio.c#5 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.c#25 integrate
.. //depot/projects/smpng/sys/dev/rc/rc.c#13 integrate
.. //depot/projects/smpng/sys/dev/rp/rp.c#16 integrate
.. //depot/projects/smpng/sys/dev/rp/rpvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/sab/sab.c#20 integrate
.. //depot/projects/smpng/sys/dev/si/si.c#15 integrate
.. //depot/projects/smpng/sys/dev/si/si.h#3 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#47 integrate
.. //depot/projects/smpng/sys/dev/snp/snp.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/driver.c#3 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/es1888.c#4 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ess.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#4 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/mss.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#13 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#22 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csa.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#20 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#13 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ich.c#28 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#18 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/solo.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#18 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#13 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#18 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#24 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#18 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#5 integrate
.. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#8 integrate
.. //depot/projects/smpng/sys/dev/streams/streams.c#19 integrate
.. //depot/projects/smpng/sys/dev/sx/sx.c#4 integrate
.. //depot/projects/smpng/sys/dev/sx/sx.h#3 integrate
.. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#7 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#40 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.h#9 integrate
.. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#10 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_core.c#5 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dbg.c#1 branch
.. //depot/projects/smpng/sys/dev/uart/uart_tty.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/ubser.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#56 integrate
.. //depot/projects/smpng/sys/dev/utopia/utopia.c#6 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinum.c#18 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#5 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#7 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#18 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinummemory.c#8 integrate
.. //depot/projects/smpng/sys/dev/zs/zs.c#17 integrate
.. //depot/projects/smpng/sys/doc/Doxyfile#1 branch
.. //depot/projects/smpng/sys/doc/Makefile#1 branch
.. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#13 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc.h#5 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#13 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#21 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#31 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#21 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#9 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#12 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#15 integrate
.. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#13 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#18 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#20 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#15 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#23 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#15 integrate
.. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#17 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#18 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#19 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#16 integrate
.. //depot/projects/smpng/sys/gdb/gdb.h#1 branch
.. //depot/projects/smpng/sys/gdb/gdb_int.h#1 branch
.. //depot/projects/smpng/sys/gdb/gdb_main.c#1 branch
.. //depot/projects/smpng/sys/gdb/gdb_packet.c#1 branch
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#5 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.c#3 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.h#3 integrate
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#8 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#34 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#26 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#51 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#84 integrate
.. //depot/projects/smpng/sys/i386/conf/OLDCARD#9 integrate
.. //depot/projects/smpng/sys/i386/i386/db_interface.c#25 integrate
.. //depot/projects/smpng/sys/i386/i386/db_trace.c#14 integrate
.. //depot/projects/smpng/sys/i386/i386/gdb_machdep.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/i386-gdbstub.c#7 delete
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#76 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#64 integrate
.. //depot/projects/smpng/sys/i386/i386/swtch.s#24 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#70 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#6 integrate
.. //depot/projects/smpng/sys/i386/include/db_machdep.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/frame.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/gdb_machdep.h#1 branch
.. //depot/projects/smpng/sys/i386/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/i386/include/pcb.h#12 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#36 integrate
.. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#15 integrate
.. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#7 integrate
.. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/vesa.c#12 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#39 integrate
.. //depot/projects/smpng/sys/i4b/include/i4b_global.h#4 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#38 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#16 integrate
.. //depot/projects/smpng/sys/ia64/ia64/db_interface.c#18 integrate
.. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#14 integrate
.. //depot/projects/smpng/sys/ia64/ia64/gdb_machdep.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia64/ia64-gdbstub.c#3 delete
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#81 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#58 integrate
.. //depot/projects/smpng/sys/ia64/ia64/ssc.c#14 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#65 integrate
.. //depot/projects/smpng/sys/ia64/ia64/unwind.c#11 integrate
.. //depot/projects/smpng/sys/ia64/include/db_machdep.h#8 integrate
.. //depot/projects/smpng/sys/ia64/include/gdb_machdep.h#1 branch
.. //depot/projects/smpng/sys/ia64/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/ia64/include/md_var.h#15 integrate
.. //depot/projects/smpng/sys/ia64/include/pcb.h#10 integrate
.. //depot/projects/smpng/sys/ia64/include/pmap.h#18 integrate
.. //depot/projects/smpng/sys/ia64/include/unwind.h#6 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#28 integrate
.. //depot/projects/smpng/sys/kern/device_if.m#2 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#44 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#45 integrate
.. //depot/projects/smpng/sys/kern/kern_clock.c#36 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#27 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#62 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#72 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#79 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#78 integrate
.. //depot/projects/smpng/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/smpng/sys/kern/kern_ktrace.c#40 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#37 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#37 integrate
.. //depot/projects/smpng/sys/kern/kern_malloc.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_module.c#13 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#80 integrate
.. //depot/projects/smpng/sys/kern/kern_prot.c#82 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#43 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#92 integrate
.. //depot/projects/smpng/sys/kern/kern_subr.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#73 integrate
.. //depot/projects/smpng/sys/kern/kern_syscalls.c#5 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#17 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#60 integrate
.. //depot/projects/smpng/sys/kern/kern_umtx.c#11 integrate
.. //depot/projects/smpng/sys/kern/link_elf.c#25 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#4 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#29 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#34 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#37 integrate
.. //depot/projects/smpng/sys/kern/subr_kdb.c#1 branch
.. //depot/projects/smpng/sys/kern/subr_prf.c#36 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#117 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#34 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#38 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#45 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#46 integrate
.. //depot/projects/smpng/sys/kern/tty.c#45 integrate
.. //depot/projects/smpng/sys/kern/tty_conf.c#6 integrate
.. //depot/projects/smpng/sys/kern/tty_cons.c#28 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#32 integrate
.. //depot/projects/smpng/sys/kern/tty_subr.c#7 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#53 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#56 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#27 integrate
.. //depot/projects/smpng/sys/kern/vfs_export.c#14 integrate
.. //depot/projects/smpng/sys/kern/vfs_init.c#14 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#18 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#29 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#76 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#76 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#46 integrate
.. //depot/projects/smpng/sys/libkern/qsort.c#6 integrate
.. //depot/projects/smpng/sys/libkern/qsort_r.c#1 branch
.. //depot/projects/smpng/sys/modules/dcons/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/fdc/Makefile#7 integrate
.. //depot/projects/smpng/sys/modules/firewire/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/firewire/fwip/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/sound/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/sound/pcm/Makefile#4 delete
.. //depot/projects/smpng/sys/modules/sound/sound/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/uart/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/usb/Makefile#6 integrate
.. //depot/projects/smpng/sys/net/if_disc.c#15 integrate
.. //depot/projects/smpng/sys/net/if_ef.c#16 integrate
.. //depot/projects/smpng/sys/net/if_faith.c#23 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#23 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#19 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#31 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#28 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#22 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#20 integrate
.. //depot/projects/smpng/sys/net/if_stf.c#27 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#35 integrate
.. //depot/projects/smpng/sys/net/if_var.h#27 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#29 integrate
.. //depot/projects/smpng/sys/net/ppp_tty.c#14 integrate
.. //depot/projects/smpng/sys/netatalk/aarp.c#14 integrate
.. //depot/projects/smpng/sys/netatalk/at_control.c#10 integrate
.. //depot/projects/smpng/sys/netatalk/at_rmx.c#3 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_input.c#11 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#3 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#2 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#20 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_var.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_base.c#24 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/ng_fec.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_frame_relay.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ppp.c#14 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#19 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#21 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tty.c#11 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#30 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#31 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#34 integrate
.. //depot/projects/smpng/sys/netinet/ip_icmp.c#29 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#33 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#57 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#30 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_fw.c#16 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#14 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#6 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#27 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#38 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#19 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#21 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#44 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#29 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#67 integrate
.. //depot/projects/smpng/sys/pc98/pc98/clock.c#26 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#35 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fdc_cbus.c#2 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fdcvar.h#2 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#45 integrate
.. //depot/projects/smpng/sys/pci/ncr.c#16 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#20 integrate
.. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#17 integrate
.. //depot/projects/smpng/sys/powerpc/include/db_machdep.h#6 integrate
.. //depot/projects/smpng/sys/powerpc/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/pcb.h#7 integrate
.. //depot/projects/smpng/sys/powerpc/include/pcpu.h#6 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#22 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/locore.S#5 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#51 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#42 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#37 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#10 integrate
.. //depot/projects/smpng/sys/rpc/rpcclnt.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#28 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#6 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#27 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#6 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#24 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#41 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#7 integrate
.. //depot/projects/smpng/sys/sparc64/creator/creator_upa.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/include/db_machdep.h#7 integrate
.. //depot/projects/smpng/sys/sparc64/include/frame.h#12 integrate
.. //depot/projects/smpng/sys/sparc64/include/gdb_machdep.h#1 branch
.. //depot/projects/smpng/sys/sparc64/include/kdb.h#1 branch
.. //depot/projects/smpng/sys/sparc64/include/pcb.h#12 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#33 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/db_interface.c#10 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#16 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/gdb_machdep.c#1 branch
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#63 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#22 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#49 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#57 integrate
.. //depot/projects/smpng/sys/sys/conf.h#28 integrate
.. //depot/projects/smpng/sys/sys/event.h#12 integrate
.. //depot/projects/smpng/sys/sys/eventvar.h#2 integrate
.. //depot/projects/smpng/sys/sys/exec.h#6 integrate
.. //depot/projects/smpng/sys/sys/kdb.h#1 branch
.. //depot/projects/smpng/sys/sys/kse.h#16 integrate
.. //depot/projects/smpng/sys/sys/libkern.h#15 integrate
.. //depot/projects/smpng/sys/sys/linker.h#13 integrate
.. //depot/projects/smpng/sys/sys/module.h#5 integrate
.. //depot/projects/smpng/sys/sys/mount.h#30 integrate
.. //depot/projects/smpng/sys/sys/param.h#65 integrate
.. //depot/projects/smpng/sys/sys/proc.h#119 integrate
.. //depot/projects/smpng/sys/sys/procfs.h#4 integrate
.. //depot/projects/smpng/sys/sys/ptrace.h#12 integrate
.. //depot/projects/smpng/sys/sys/signalvar.h#22 integrate
.. //depot/projects/smpng/sys/sys/socket.h#22 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#39 integrate
.. //depot/projects/smpng/sys/sys/sx.h#13 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#45 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#45 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#47 integrate
.. //depot/projects/smpng/sys/sys/systm.h#52 integrate
.. //depot/projects/smpng/sys/sys/tty.h#15 integrate
.. //depot/projects/smpng/sys/sys/uio.h#19 integrate
.. //depot/projects/smpng/sys/sys/user.h#20 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#46 integrate
.. //depot/projects/smpng/sys/tools/makeobjops.awk#5 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#33 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#10 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#55 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#29 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#16 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#63 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#53 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#48 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#6 (text+ko) ====
@@ -25,10 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $");
-
-#include "opt_ddb.h"
-#include "opt_dev_sc.h"
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -49,18 +46,6 @@
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
-#ifndef NO_SIO
-#ifndef CONSPEED
-#define CONSPEED TTYDEF_SPEED
-#endif
-static int comcnrate = CONSPEED;
-extern int comconsole;
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-#endif
-
-extern int sccnattach(void);
-
void api_up1000_init(void);
static void api_up1000_cons_init(void);
@@ -85,40 +70,15 @@
irongate_init();
-#ifndef NO_SIO
-#ifdef DDB
- siogdbattach(0x2f8, 57600);
-#endif
-#endif
-
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
-#ifndef NO_SIO
- /* serial console ... */
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
-
boothowto |= RB_SERIAL;
-#endif
break;
case 3:
- /* display console ... */
- /* XXX */
-#ifdef DEV_SC
- sccnattach();
-#else
- panic("not configured to use display && keyboard console");
-#endif
+ boothowto &= ~RB_SERIAL;
break;
default:
==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#6 (text+ko) ====
@@ -46,7 +46,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.10 2004/07/10 23:47:18 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -813,26 +813,9 @@
* (optional) alternate format. Return address of start of
* next instruction.
*/
-int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t);
-db_addr_t
-db_disasm(loc, altfmt)
- db_addr_t loc;
- boolean_t altfmt;
-{
- alpha_instruction inst;
-
- inst.bits = db_get_value(loc, 4, 0);
-
- loc += alpha_print_instruction(loc, inst, altfmt);
- return (loc);
-}
-
-int
-alpha_print_instruction(iadr, i, showregs)
- db_addr_t iadr;
- alpha_instruction i;
- boolean_t showregs;
+static int
+alpha_print_instr(db_addr_t iadr, alpha_instruction i, boolean_t showregs)
{
const char *opcode;
int ireg;
@@ -1038,7 +1021,7 @@
if (i.mem_format.opcode == op_ldah)
signed_immediate <<= 16;
db_printf(" <0x%lx>", signed_immediate +
- db_register_value(DDB_REGS, i.mem_format.rs));
+ db_register_value(i.mem_format.rs));
}
break;
case op_br:
@@ -1084,10 +1067,23 @@
db_printf(",");
db_printf("%s=0x%lx",
name_of_register[regnum[ireg]],
- db_register_value(DDB_REGS, regnum[ireg]));
+ db_register_value(regnum[ireg]));
}
db_printf(">");
}
db_printf("\n");
return (sizeof(alpha_instruction));
}
+
+db_addr_t
+db_disasm(loc, altfmt)
+ db_addr_t loc;
+ boolean_t altfmt;
+{
+ alpha_instruction inst;
+
+ inst.bits = db_get_value(loc, 4, 0);
+
+ loc += alpha_print_instr(loc, inst, altfmt);
+ return (loc);
+}
==== //depot/projects/smpng/sys/alpha/alpha/db_interface.c#10 (text+ko) ====
@@ -47,17 +47,15 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.28 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.29 2004/07/10 23:47:18 marcel Exp $");
#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/reboot.h>
#include <sys/systm.h>
+#include <sys/cons.h>
+#include <sys/kdb.h>
#include <sys/kernel.h>
-#include <sys/cons.h>
-#include <sys/ktr.h>
-#include <sys/lock.h>
#include <sys/pcpu.h>
+#include <sys/proc.h>
#include <sys/smp.h>
#include <vm/vm.h>
@@ -73,209 +71,104 @@
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
#include <ddb/db_variables.h>
-#include <machine/setjmp.h>
-static jmp_buf *db_nofault = 0;
-extern jmp_buf db_jmpbuf;
+static db_varfcn_t db_frame;
-extern void gdb_handle_exception(db_regs_t *, int, int);
-
-#if 0
-extern char *trap_type[];
-extern int trap_types;
-#endif
-
-int db_active;
-
-void ddbprinttrap(unsigned long, unsigned long, unsigned long,
- unsigned long);
-
struct db_variable db_regs[] = {
- { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL },
- { "t0", &ddb_regs.tf_regs[FRAME_T0], FCN_NULL },
- { "t1", &ddb_regs.tf_regs[FRAME_T1], FCN_NULL },
- { "t2", &ddb_regs.tf_regs[FRAME_T2], FCN_NULL },
- { "t3", &ddb_regs.tf_regs[FRAME_T3], FCN_NULL },
- { "t4", &ddb_regs.tf_regs[FRAME_T4], FCN_NULL },
- { "t5", &ddb_regs.tf_regs[FRAME_T5], FCN_NULL },
- { "t6", &ddb_regs.tf_regs[FRAME_T6], FCN_NULL },
- { "t7", &ddb_regs.tf_regs[FRAME_T7], FCN_NULL },
- { "s0", &ddb_regs.tf_regs[FRAME_S0], FCN_NULL },
- { "s1", &ddb_regs.tf_regs[FRAME_S1], FCN_NULL },
- { "s2", &ddb_regs.tf_regs[FRAME_S2], FCN_NULL },
- { "s3", &ddb_regs.tf_regs[FRAME_S3], FCN_NULL },
- { "s4", &ddb_regs.tf_regs[FRAME_S4], FCN_NULL },
- { "s5", &ddb_regs.tf_regs[FRAME_S5], FCN_NULL },
- { "s6", &ddb_regs.tf_regs[FRAME_S6], FCN_NULL },
- { "a0", &ddb_regs.tf_regs[FRAME_A0], FCN_NULL },
- { "a1", &ddb_regs.tf_regs[FRAME_A1], FCN_NULL },
- { "a2", &ddb_regs.tf_regs[FRAME_A2], FCN_NULL },
- { "a3", &ddb_regs.tf_regs[FRAME_A3], FCN_NULL },
- { "a4", &ddb_regs.tf_regs[FRAME_A4], FCN_NULL },
- { "a5", &ddb_regs.tf_regs[FRAME_A5], FCN_NULL },
- { "t8", &ddb_regs.tf_regs[FRAME_T8], FCN_NULL },
- { "t9", &ddb_regs.tf_regs[FRAME_T9], FCN_NULL },
- { "t10", &ddb_regs.tf_regs[FRAME_T10], FCN_NULL },
- { "t11", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL },
- { "ra", &ddb_regs.tf_regs[FRAME_RA], FCN_NULL },
- { "t12", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL },
- { "at", &ddb_regs.tf_regs[FRAME_AT], FCN_NULL },
- { "gp", &ddb_regs.tf_regs[FRAME_GP], FCN_NULL },
- { "sp", &ddb_regs.tf_regs[FRAME_SP], FCN_NULL },
- { "pc", &ddb_regs.tf_regs[FRAME_PC], FCN_NULL },
- { "ps", &ddb_regs.tf_regs[FRAME_PS], FCN_NULL },
- { "ai", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL },
- { "pv", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL },
+ { "v0", (db_expr_t *)FRAME_V0, db_frame },
+ { "t0", (db_expr_t *)FRAME_T0, db_frame },
+ { "t1", (db_expr_t *)FRAME_T1, db_frame },
+ { "t2", (db_expr_t *)FRAME_T2, db_frame },
+ { "t3", (db_expr_t *)FRAME_T3, db_frame },
+ { "t4", (db_expr_t *)FRAME_T4, db_frame },
+ { "t5", (db_expr_t *)FRAME_T5, db_frame },
+ { "t6", (db_expr_t *)FRAME_T6, db_frame },
+ { "t7", (db_expr_t *)FRAME_T7, db_frame },
+ { "s0", (db_expr_t *)FRAME_S0, db_frame },
+ { "s1", (db_expr_t *)FRAME_S1, db_frame },
+ { "s2", (db_expr_t *)FRAME_S2, db_frame },
+ { "s3", (db_expr_t *)FRAME_S3, db_frame },
+ { "s4", (db_expr_t *)FRAME_S4, db_frame },
+ { "s5", (db_expr_t *)FRAME_S5, db_frame },
+ { "s6", (db_expr_t *)FRAME_S6, db_frame },
+ { "a0", (db_expr_t *)FRAME_A0, db_frame },
+ { "a1", (db_expr_t *)FRAME_A1, db_frame },
+ { "a2", (db_expr_t *)FRAME_A2, db_frame },
+ { "a3", (db_expr_t *)FRAME_A3, db_frame },
+ { "a4", (db_expr_t *)FRAME_A4, db_frame },
+ { "a5", (db_expr_t *)FRAME_A5, db_frame },
+ { "t8", (db_expr_t *)FRAME_T8, db_frame },
+ { "t9", (db_expr_t *)FRAME_T9, db_frame },
+ { "t10", (db_expr_t *)FRAME_T10, db_frame },
+ { "t11", (db_expr_t *)FRAME_T11, db_frame },
+ { "ra", (db_expr_t *)FRAME_RA, db_frame },
+ { "t12", (db_expr_t *)FRAME_T12, db_frame },
+ { "at", (db_expr_t *)FRAME_AT, db_frame },
+ { "gp", (db_expr_t *)FRAME_GP, db_frame },
+ { "sp", (db_expr_t *)FRAME_SP, db_frame },
+ { "pc", (db_expr_t *)FRAME_PC, db_frame },
+ { "ps", (db_expr_t *)FRAME_PS, db_frame },
+ { "ai", (db_expr_t *)FRAME_T11, db_frame },
+ { "pv", (db_expr_t *)FRAME_T12, db_frame },
};
struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
-/*
- * Print trap reason.
- */
-void
-ddbprinttrap(a0, a1, a2, entry)
- unsigned long a0, a1, a2, entry;
+static int
+db_frame(struct db_variable *vp, db_expr_t *valuep, int op)
{
- /* XXX Implement. */
-
- printf("ddbprinttrap(0x%lx, 0x%lx, 0x%lx, 0x%lx)\n", a0, a1, a2,
- entry);
+ if (kdb_frame == NULL)
+ return (0);
+ if (op == DB_VAR_GET)
+ *valuep = kdb_frame->tf_regs[(uintptr_t)vp->valuep];
+ else
+ kdb_frame->tf_regs[(uintptr_t)vp->valuep] = *valuep;
+ return (1);
}
/*
- * ddb_trap - field a kernel trap
+ * Read bytes from kernel address space for debugger.
*/
int
-kdb_trap(a0, a1, a2, entry, regs)
- unsigned long a0, a1, a2, entry;
- db_regs_t *regs;
+db_read_bytes(vm_offset_t addr, size_t size, char *data)
{
- int ddb_mode = !(boothowto & RB_GDB);
- register_t s;
+ jmp_buf jb;
+ void *prev_jb;
+ char *src;
+ int ret;
- /*
- * Don't bother checking for usermode, since a benign entry
- * by the kernel (call to Debugger() or a breakpoint) has
- * already checked for usermode. If neither of those
- * conditions exist, something Bad has happened.
- */
-
- if (entry != ALPHA_KENTRY_IF ||
- (a0 != ALPHA_IF_CODE_BUGCHK && a0 != ALPHA_IF_CODE_BPT
- && a0 != ALPHA_IF_CODE_GENTRAP)) {
-#if 0
- if (ddb_mode) {
- db_printf("ddbprinttrap from 0x%lx\n", /* XXX */
- regs->tf_regs[FRAME_PC]);
- ddbprinttrap(a0, a1, a2, entry);
- /*
- * Tell caller "We did NOT handle the trap."
- * Caller should panic, or whatever.
- */
- return (0);
- }
-#endif
- if (db_nofault) {
- jmp_buf *no_fault = db_nofault;
- db_nofault = 0;
- longjmp(*no_fault, 1);
- }
+ prev_jb = kdb_jmpbuf(jb);
+ ret = setjmp(jb);
+ if (ret == 0) {
+ src = (char *)addr;
+ while (size-- > 0)
+ *data++ = *src++;
}
-
- /*
- * XXX Should switch to DDB's own stack, here.
- */
-
- ddb_regs = *regs;
-
- s = intr_disable();
-
-#ifdef SMP
-#ifdef DIAGNOSTIC
- db_printf("stopping %x\n", PCPU_GET(other_cpus));
-#endif
- stop_cpus(PCPU_GET(other_cpus));
-#ifdef DIAGNOSTIC
- db_printf("stopped_cpus=%x\n", stopped_cpus);
-#endif
-#endif
-
- db_active++;
-
- if (ddb_mode) {
- cndbctl(TRUE); /* DDB active, unblank video */
- db_trap(entry, a0); /* Where the work happens */
- cndbctl(FALSE); /* DDB inactive */
- } else
- gdb_handle_exception(&ddb_regs, entry, a0);
-
- db_active--;
-
-#ifdef SMP
- restart_cpus(stopped_cpus);
-#endif
-
- intr_restore(s);
-
- *regs = ddb_regs;
-
- /*
- * Tell caller "We HAVE handled the trap."
- */
- return (1);
+ (void)kdb_jmpbuf(prev_jb);
+ return (ret);
}
/*
- * Read bytes from kernel address space for debugger.
- */
-void
-db_read_bytes(addr, size, data)
- vm_offset_t addr;
- register size_t size;
- register char *data;
-{
- register char *src;
-
- db_nofault = &db_jmpbuf;
-
- src = (char *)addr;
- while (size-- > 0)
- *data++ = *src++;
-
- db_nofault = 0;
-}
-
-/*
* Write bytes to kernel address space for debugger.
*/
-void
-db_write_bytes(addr, size, data)
- vm_offset_t addr;
- register size_t size;
- register char *data;
+int
+db_write_bytes(vm_offset_t addr, size_t size, char *data)
{
- register char *dst;
+ jmp_buf jb;
+ void *prev_jb;
+ char *dst;
+ int ret;
- db_nofault = &db_jmpbuf;
-
- dst = (char *)addr;
- while (size-- > 0)
- *dst++ = *data++;
- alpha_pal_imb();
-
- db_nofault = 0;
-}
-
-void
-Debugger(const char* msg)
-{
- u_int saveintr;
-
- printf("%s\n", msg);
- saveintr = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH);
- __asm("call_pal 0x81"); /* XXX bugchk */
- alpha_pal_swpipl(saveintr);
+ prev_jb = kdb_jmpbuf(jb);
+ ret = setjmp(jb);
+ if (ret == 0) {
+ dst = (char *)addr;
+ while (size-- > 0)
+ *dst++ = *data++;
+ alpha_pal_imb();
+ }
+ (void)kdb_jmpbuf(prev_jb);
+ return (ret);
}
/*
@@ -338,9 +231,7 @@
};
u_long
-db_register_value(regs, regno)
- db_regs_t *regs;
- int regno;
+db_register_value(int regno)
{
if (regno > 31 || regno < 0) {
@@ -351,7 +242,7 @@
if (regno == 31)
return (0);
- return (regs->tf_regs[reg_to_frame[regno]]);
+ return (kdb_frame->tf_regs[reg_to_frame[regno]]);
}
/*
@@ -446,19 +337,6 @@
return (FALSE);
}
-#if 0
-boolean_t
-db_inst_spill(ins, regn)
- int ins, regn;
-{
- alpha_instruction insn;
-
- insn.bits = ins;
- return ((insn.mem_format.opcode == op_stq) &&
- (insn.mem_format.rd == regn));
-}
-#endif
-
boolean_t
db_inst_load(ins)
int ins;
@@ -520,10 +398,7 @@
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list