PERFORCE change 32404 for review
John Baldwin
jhb at FreeBSD.org
Mon Jun 2 12:54:49 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=32404
Change 32404 by jhb at jhb_laptop on 2003/06/02 12:53:55
IFC @32401.
Affected files ...
.. //depot/projects/smpng/sys/alpha/include/bus.h#10 integrate
.. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/locore.S#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/support.S#4 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/smpng/sys/amd64/ia32/Makefile#2 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#2 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscalls.c#1 branch
.. //depot/projects/smpng/sys/amd64/ia32/syscalls.conf#2 integrate
.. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/asm.h#4 integrate
.. //depot/projects/smpng/sys/amd64/include/bus_dma.h#4 integrate
.. //depot/projects/smpng/sys/amd64/include/db_machdep.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/profile.h#2 integrate
.. //depot/projects/smpng/sys/boot/forth/beastie.4th#1 branch
.. //depot/projects/smpng/sys/boot/forth/frames.4th#1 branch
.. //depot/projects/smpng/sys/boot/forth/screen.4th#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#2 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#8 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/Makefile#11 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/loader.rc#1 branch
.. //depot/projects/smpng/sys/cam/cam.c#3 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.c#10 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#16 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#8 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_ch.h#2 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#8 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#15 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#5 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#5 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_socket.h#4 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#11 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#12 integrate
.. //depot/projects/smpng/sys/conf/Makefile.amd64#4 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#4 integrate
.. //depot/projects/smpng/sys/conf/files.i386#41 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#42 integrate
.. //depot/projects/smpng/sys/conf/kern.mk#6 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#21 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#5 integrate
.. //depot/projects/smpng/sys/ddb/db_break.c#5 integrate
.. //depot/projects/smpng/sys/ddb/db_command.c#11 integrate
.. //depot/projects/smpng/sys/ddb/db_input.c#6 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#9 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#12 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#10 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#11 integrate
.. //depot/projects/smpng/sys/dev/amd/amd.c#4 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#30 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#28 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#13 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt.c#9 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#4 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#15 integrate
.. //depot/projects/smpng/sys/dev/ccd/ccd.c#25 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#15 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#9 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#13 integrate
.. //depot/projects/smpng/sys/dev/exca/exca.c#7 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#37 integrate
.. //depot/projects/smpng/sys/dev/ips/ips_ioctl.c#2 integrate
.. //depot/projects/smpng/sys/dev/isp/isp.c#28 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_target.c#9 integrate
.. //depot/projects/smpng/sys/dev/mcd/mcd.c#5 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#37 integrate
.. //depot/projects/smpng/sys/dev/mii/bmtphy.c#4 integrate
.. //depot/projects/smpng/sys/dev/mii/dcphy.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/lxtphy.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#7 integrate
.. //depot/projects/smpng/sys/dev/mii/mlphy.c#7 integrate
.. //depot/projects/smpng/sys/dev/mii/nsgphy.c#10 integrate
.. //depot/projects/smpng/sys/dev/mii/pnphy.c#8 integrate
.. //depot/projects/smpng/sys/dev/musycc/musycc.c#5 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#28 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#24 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#30 integrate
.. //depot/projects/smpng/sys/dev/snc/if_snc.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#1 branch
.. //depot/projects/smpng/sys/dev/sound/pci/au88x0.h#1 branch
.. //depot/projects/smpng/sys/dev/streams/streams.c#13 integrate
.. //depot/projects/smpng/sys/dev/syscons/fade/fade_saver.c#2 integrate
.. //depot/projects/smpng/sys/dev/syscons/scmouse.c#9 integrate
.. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#12 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_port.h#14 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#3 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe.c#8 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#28 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#22 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#17 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#9 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#25 integrate
.. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#14 integrate
.. //depot/projects/smpng/sys/geom/bde/g_bde.c#11 integrate
.. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#12 integrate
.. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#10 integrate
.. //depot/projects/smpng/sys/geom/geom.h#28 integrate
.. //depot/projects/smpng/sys/geom/geom_aes.c#11 integrate
.. //depot/projects/smpng/sys/geom/geom_apple.c#6 integrate
.. //depot/projects/smpng/sys/geom/geom_bsd.c#31 integrate
.. //depot/projects/smpng/sys/geom/geom_ctl.c#11 integrate
.. //depot/projects/smpng/sys/geom/geom_ctl.h#5 integrate
.. //depot/projects/smpng/sys/geom/geom_dev.c#25 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#27 integrate
.. //depot/projects/smpng/sys/geom/geom_ext.h#3 delete
.. //depot/projects/smpng/sys/geom/geom_gpt.c#12 integrate
.. //depot/projects/smpng/sys/geom/geom_mbr.c#21 integrate
.. //depot/projects/smpng/sys/geom/geom_mirror.c#5 integrate
.. //depot/projects/smpng/sys/geom/geom_pc98.c#19 integrate
.. //depot/projects/smpng/sys/geom/geom_slice.c#22 integrate
.. //depot/projects/smpng/sys/geom/geom_slice.h#14 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#27 integrate
.. //depot/projects/smpng/sys/geom/geom_sunlabel.c#22 integrate
.. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#5 integrate
.. //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_trig.c#2 integrate
.. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#6 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#9 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#16 integrate
.. //depot/projects/smpng/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/smpng/sys/i386/bios/mca_machdep.c#2 integrate
.. //depot/projects/smpng/sys/i386/bios/smapi.c#2 integrate
.. //depot/projects/smpng/sys/i386/bios/smapi_bios.S#2 integrate
.. //depot/projects/smpng/sys/i386/bios/smbios.c#2 integrate
.. //depot/projects/smpng/sys/i386/bios/vpd.c#2 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#38 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#60 integrate
.. //depot/projects/smpng/sys/i386/i386/atomic.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/autoconf.c#15 integrate
.. //depot/projects/smpng/sys/i386/i386/bios.c#16 integrate
.. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#18 integrate
.. //depot/projects/smpng/sys/i386/i386/critical.c#6 integrate
.. //depot/projects/smpng/sys/i386/i386/db_disasm.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/db_interface.c#17 integrate
.. //depot/projects/smpng/sys/i386/i386/db_trace.c#11 integrate
.. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/genassym.c#23 integrate
.. //depot/projects/smpng/sys/i386/i386/i386-gdbstub.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/i686_mem.c#6 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#21 integrate
.. //depot/projects/smpng/sys/i386/i386/in_cksum.c#4 integrate
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#17 integrate
.. //depot/projects/smpng/sys/i386/i386/k6_mem.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#60 integrate
.. //depot/projects/smpng/sys/i386/i386/math_emulate.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/mem.c#17 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_clock.c#6 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#46 integrate
.. //depot/projects/smpng/sys/i386/i386/mpapic.c#13 integrate
.. //depot/projects/smpng/sys/i386/i386/nexus.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/perfmon.c#10 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#38 integrate
.. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#28 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#58 integrate
.. //depot/projects/smpng/sys/i386/i386/tsc.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/vm86.c#16 integrate
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#36 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_errno.c#2 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#7 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#11 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#5 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#5 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#10 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_msg.c#3 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_other.c#5 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#10 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#9 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#8 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.c#6 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#10 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#14 integrate
.. //depot/projects/smpng/sys/i386/include/asm.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/bus_dma.h#6 integrate
.. //depot/projects/smpng/sys/i386/include/profile.h#7 integrate
.. //depot/projects/smpng/sys/i386/isa/asc.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#25 integrate
.. //depot/projects/smpng/sys/i386/isa/cronyx.c#2 integrate
.. //depot/projects/smpng/sys/i386/isa/ctx.c#7 integrate
.. //depot/projects/smpng/sys/i386/isa/cx.c#9 integrate
.. //depot/projects/smpng/sys/i386/isa/cy.c#18 integrate
.. //depot/projects/smpng/sys/i386/isa/elink.c#3 integrate
.. //depot/projects/smpng/sys/i386/isa/gpib.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/gsc.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/if_cx.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/if_el.c#7 integrate
.. //depot/projects/smpng/sys/i386/isa/if_le.c#11 integrate
.. //depot/projects/smpng/sys/i386/isa/if_rdp.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/intr_machdep.c#20 integrate
.. //depot/projects/smpng/sys/i386/isa/isa.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/isa_compat.c#2 integrate
.. //depot/projects/smpng/sys/i386/isa/isa_dma.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/istallion.c#9 integrate
.. //depot/projects/smpng/sys/i386/isa/ithread.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/loran.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/mse.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/npx.c#34 integrate
.. //depot/projects/smpng/sys/i386/isa/pcaudio.c#10 integrate
.. //depot/projects/smpng/sys/i386/isa/pcf.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/pmtimer.c#4 integrate
.. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/smpng/sys/i386/isa/spic.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/spigot.c#13 integrate
.. //depot/projects/smpng/sys/i386/isa/spkr.c#12 integrate
.. //depot/projects/smpng/sys/i386/isa/stallion.c#10 integrate
.. //depot/projects/smpng/sys/i386/isa/vesa.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/wt.c#7 integrate
.. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#12 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#9 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_genassym.c#4 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#23 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#8 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#10 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#33 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_bus.c#14 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#18 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#9 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#7 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#8 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#6 integrate
.. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#7 integrate
.. //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#5 integrate
.. //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.c#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#57 integrate
.. //depot/projects/smpng/sys/ia64/ia64/syscall.s#3 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#49 integrate
.. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#25 integrate
.. //depot/projects/smpng/sys/ia64/include/_regset.h#2 integrate
.. //depot/projects/smpng/sys/ia64/include/bus.h#10 integrate
.. //depot/projects/smpng/sys/isa/fd.c#21 integrate
.. //depot/projects/smpng/sys/isa/pnp.c#7 integrate
.. //depot/projects/smpng/sys/isa/ppc.c#7 integrate
.. //depot/projects/smpng/sys/isa/psm.c#14 integrate
.. //depot/projects/smpng/sys/isa/vga_isa.c#7 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#6 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#27 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#35 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#20 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#46 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#61 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#30 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#69 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#51 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#31 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_uuid.c#5 integrate
.. //depot/projects/smpng/sys/kern/subr_mbuf.c#33 integrate
.. //depot/projects/smpng/sys/kern/subr_prf.c#29 integrate
.. //depot/projects/smpng/sys/kern/subr_rman.c#12 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#98 integrate
.. //depot/projects/smpng/sys/kern/sysv_ipc.c#11 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#23 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#34 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#45 integrate
.. //depot/projects/smpng/sys/kern/vfs_cluster.c#25 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#55 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#56 integrate
.. //depot/projects/smpng/sys/modules/Makefile#53 integrate
.. //depot/projects/smpng/sys/modules/geom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_apple/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_bde/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_bsd/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_gpt/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_mbr/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_pc98/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/geom_sunlabel/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/sound/driver/au88x0/Makefile#1 branch
.. //depot/projects/smpng/sys/net/if_atmsubr.c#10 integrate
.. //depot/projects/smpng/sys/net/if_ef.c#11 integrate
.. //depot/projects/smpng/sys/net/if_media.h#8 integrate
.. //depot/projects/smpng/sys/netinet/ip_encap.c#11 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#38 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#34 integrate
.. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#16 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#19 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#25 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#16 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#8 integrate
.. //depot/projects/smpng/sys/pc98/pc98/clock.c#17 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#23 integrate
.. //depot/projects/smpng/sys/pc98/pc98/ppc.c#5 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#28 integrate
.. //depot/projects/smpng/sys/pci/alpm.c#5 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#38 integrate
.. //depot/projects/smpng/sys/pci/if_de.c#10 integrate
.. //depot/projects/smpng/sys/pci/if_devar.h#4 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#17 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#29 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#19 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#18 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#21 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#27 integrate
.. //depot/projects/smpng/sys/pci/ncr.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#15 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#8 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#15 integrate
.. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#7 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus.h#15 integrate
.. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/isa/isa.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#10 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#22 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#8 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/sparcbus_if.m#2 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#11 integrate
.. //depot/projects/smpng/sys/sys/buf.h#19 integrate
.. //depot/projects/smpng/sys/sys/chio.h#2 integrate
.. //depot/projects/smpng/sys/sys/devicestat.h#7 integrate
.. //depot/projects/smpng/sys/sys/filedesc.h#17 integrate
.. //depot/projects/smpng/sys/sys/param.h#41 integrate
.. //depot/projects/smpng/sys/sys/proc.h#88 integrate
.. //depot/projects/smpng/sys/sys/sem.h#6 integrate
.. //depot/projects/smpng/sys/sys/uuid.h#3 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#33 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#22 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#41 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#18 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#27 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#13 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#28 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#37 integrate
.. //depot/projects/smpng/sys/vm/vm_object.h#19 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/include/bus.h#10 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.20 2003/05/27 04:59:56 scottl Exp $ */
+/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.21 2003/05/30 20:40:32 hmp Exp $ */
#ifndef _ALPHA_BUS_H_
#define _ALPHA_BUS_H_
@@ -469,7 +469,7 @@
#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */
#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */
#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */
-#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */
+#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */
#define BUS_DMA_ISA 0x10 /* map memory for ISA dma */
#define BUS_DMA_BUS2 0x20 /* placeholders for bus functions... */
#define BUS_DMA_BUS3 0x40
==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.8 2003/05/01 01:05:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $
*/
/*
@@ -36,9 +36,9 @@
#include "acpi.h"
-u_long i386_acpi_root;
+u_long amd64_acpi_root;
-SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &i386_acpi_root, 0,
+SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
"The physical address of the RSDP");
ACPI_STATUS
@@ -59,7 +59,7 @@
ACPI_POINTER ptr;
ACPI_STATUS status;
- if (i386_acpi_root == 0) {
+ if (amd64_acpi_root == 0) {
/*
* The loader passes the physical address at which it found the
* RSDP in a hint. We could recover this rather than searching
@@ -67,11 +67,11 @@
*/
status = AcpiFindRootPointer(Flags, &ptr);
if (status == AE_OK)
- i386_acpi_root = ptr.Pointer.Physical;
+ amd64_acpi_root = ptr.Pointer.Physical;
} else
status = AE_OK;
RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER;
- RsdpPhysicalAddress->Pointer.Physical = i386_acpi_root;
+ RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root;
return (status);
}
==== //depot/projects/smpng/sys/amd64/amd64/locore.S#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.174 2003/05/23 05:04:53 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.175 2003/05/31 06:54:28 peter Exp $
*/
#include <machine/asmacros.h>
@@ -69,17 +69,15 @@
/* Find the metadata pointers before we lose them */
movq %rsp, %rbp
- xorq %rax, %rax
- movl 4(%rbp),%eax /* modulep */
- movq %rax,modulep
- movl 8(%rbp),%eax /* kernend */
- movq %rax,physfree
+ movl 4(%rbp),%edi /* modulep (arg 1) */
+ movl 8(%rbp),%esi /* kernend (arg 2) */
/* Get onto a stack that we can trust - there is no going back now. */
movq $bootstack,%rsp
- xorq %rbp, %rbp
+ xorl %ebp, %ebp
call hammer_time /* set up cpu for unix operation */
+ movq %rax,%rsp /* set up kstack for mi_startup() */
call mi_startup /* autoconfiguration, mountroot etc */
0: hlt
jmp 0b
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#8 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.580 2003/05/23 05:04:53 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.582 2003/05/31 07:00:08 peter Exp $
*/
#include "opt_atalk.h"
@@ -112,7 +112,7 @@
#include <sys/ptrace.h>
#include <machine/sigframe.h>
-extern void hammer_time(void);
+extern u_int64_t hammer_time(u_int64_t, u_int64_t);
extern void dblfault_handler(void);
extern void printcpuinfo(void); /* XXX header file */
@@ -131,9 +131,6 @@
int _udatasel, _ucodesel, _ucode32sel;
u_long atdevbase;
-u_int64_t modulep; /* phys addr of metadata table */
-u_int64_t physfree; /* first free page after kernel */
-
int cold = 1;
long Maxmem = 0;
@@ -1070,19 +1067,8 @@
avail_end = phys_avail[pa_indx];
}
-static u_int64_t
-allocpages(int n)
-{
- u_int64_t ret;
-
- ret = physfree;
- bzero((void *)ret, n * PAGE_SIZE);
- physfree += n * PAGE_SIZE;
- return (ret);
-}
-
-void
-hammer_time(void)
+u_int64_t
+hammer_time(u_int64_t modulep, u_int64_t physfree)
{
caddr_t kmdp;
int gsel_tss, off, x;
@@ -1095,10 +1081,15 @@
msr = rdmsr(MSR_EFER) | EFER_NXE;
wrmsr(MSR_EFER, msr);
- proc0.p_uarea = (struct user *)(allocpages(UAREA_PAGES) + KERNBASE);
- thread0.td_kstack = allocpages(KSTACK_PAGES) + KERNBASE;
+ proc0.p_uarea = (struct user *)(physfree + KERNBASE);
+ bzero(proc0.p_uarea, UAREA_PAGES * PAGE_SIZE);
+ physfree += UAREA_PAGES * PAGE_SIZE;
+ thread0.td_kstack = physfree + KERNBASE;
+ bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE);
+ physfree += KSTACK_PAGES * PAGE_SIZE;
thread0.td_pcb = (struct pcb *)
(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+
atdevbase = ISA_HOLE_START + KERNBASE;
/*
@@ -1244,6 +1235,9 @@
env = getenv("kernelname");
if (env != NULL)
strlcpy(kernelname, env, sizeof(kernelname));
+
+ /* Location of kernel stack for locore */
+ return ((u_int64_t)thread0.td_pcb);
}
void
@@ -1651,5 +1645,3 @@
}
#endif /* DDB */
-
-MODULE_VERSION(acpi, 100);
==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.52 2003/05/23 05:04:53 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $
*/
/*
@@ -411,7 +411,6 @@
nexus_setup_intr(device_t bus, device_t child, struct resource *irq,
int flags, void (*ihand)(void *), void *arg, void **cookiep)
{
- driver_t *driver;
int error;
/* somebody tried to setup an irq that failed to allocate! */
@@ -422,8 +421,6 @@
if ((irq->r_flags & RF_SHAREABLE) == 0)
flags |= INTR_EXCL;
- driver = device_get_driver(child);
-
/*
* We depend here on rman_activate_resource() being idempotent.
*/
==== //depot/projects/smpng/sys/amd64/amd64/support.S#4 (text+ko) ====
@@ -30,9 +30,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.100 2003/05/14 03:38:13 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.101 2003/05/30 00:58:48 peter Exp $
*/
+#include "opt_ddb.h"
+
#include <machine/asmacros.h>
#include <machine/pmap.h>
@@ -624,3 +626,36 @@
pushq $KCSEL
pushq %rax
lretq
+
+#ifdef DDB
+/*****************************************************************************/
+/* setjump, longjump */
+/*****************************************************************************/
+
+ENTRY(setjmp)
+ movq %rbx,0(%rdi) /* save rbx */
+ movq %rsp,8(%rdi) /* save rsp */
+ movq %rbp,16(%rdi) /* save rbp */
+ movq %r12,24(%rdi) /* save r12 */
+ movq %r13,32(%rdi) /* save r13 */
+ movq %r14,40(%rdi) /* save r14 */
+ movq %r15,48(%rdi) /* save r15 */
+ movq 0(%rsp),%rdx /* get rta */
+ movq %rdx,56(%rdi) /* save rip */
+ xorl %eax,%eax /* return(0); */
+ ret
+
+ENTRY(longjmp)
+ movq 0(%rdi),%rbx /* restore rbx */
+ movq 8(%rdi),%rsp /* restore rsp */
+ movq 16(%rdi),%rbp /* restore rbp */
+ movq 24(%rdi),%r12 /* restore r12 */
+ movq 32(%rdi),%r13 /* restore r13 */
+ movq 40(%rdi),%r14 /* restore r14 */
+ movq 48(%rdi),%r15 /* restore r15 */
+ movq 56(%rdi),%rdx /* get rta */
+ movq %rdx,0(%rsp) /* put in return frame */
+ xorl %eax,%eax /* return(1); */
+ incl %eax
+ ret
+#endif
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#4 (text+ko) ====
@@ -16,46 +16,51 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.385 2003/05/14 04:10:48 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.387 2003/06/01 20:26:38 obrien Exp $
machine amd64
cpu HAMMER
ident GENERIC
-maxusers 0
-options IA32
-options COMPAT_FREEBSD4
-makeoptions NO_MODULES=not_yet
-
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
+#makeoptions DEBUG=-g
+makeoptions NO_MODULES=not_yet
+
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
options FFS #Berkeley Fast Filesystem
options SOFTUPDATES #Enable FFS soft updates support
options MD_ROOT #MD is a potential root device
options NFSCLIENT #Network Filesystem Client
-options NFSSERVER
-options NFS_ROOT #NFS usable as root device, requires NFSCLIENT
+options NFSSERVER #Network Filesystem Server
+options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+options COMPAT_FREEBSD4 #Compatible with FreeBSD4
+options IA32
+options KTRACE
+options SYSVSHM #SYSV-style shared memory
+options SYSVMSG #SYSV-style message queues
+options SYSVSEM #SYSV-style semaphores
+
# Debugging for use in -current
+#options DDB
+#options ALT_BREAK_TO_DEBUGGER
options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-
-options SYSVMSG
-options SYSVSEM
-options SYSVSHM
+#options WITNESS
device isa
device pci
+device acpi
+#options ACPI_DEBUG
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
device atapicd # ATAPI CDROM drives
-
-options KTRACE
+options ATA_STATIC_ID #Static device numbering
# atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc # AT keyboard controller
@@ -91,8 +96,11 @@
device loop # Network loopback
device ether # Ethernet support
device md # Memory "disks"
-device pty
-device bpf
+device pty # Pseudo-ttys (telnet etc)
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+device bpf # Berkeley packet filter
# USB support
#device uhci # UHCI PCI->USB interface
==== //depot/projects/smpng/sys/amd64/ia32/Makefile#2 (text+ko) ====
@@ -1,15 +1,16 @@
# Makefile for syscall tables
#
-# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.1 2002/04/10 19:34:51 dfr Exp $
+# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.2 2003/05/31 06:49:53 peter Exp $
all:
@echo "make sysent only"
sysent: ia32_sysent.c ia32_syscall.h ia32_proto.h
-ia32_sysent.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \
+ia32_sysent.c ia32_syscalls.c ia32_syscall.h ia32_proto.h: ../../kern/makesyscalls.sh \
syscalls.master syscalls.conf
-mv -f ia32_sysent.c ia32_sysent.c.bak
+ -mv -f ia32_syscalls.c ia32_syscalls.c.bak
-mv -f ia32_syscall.h ia32_syscall.h.bak
-mv -f ia32_proto.h ia32_proto.h.bak
sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.1 2003/05/14 04:10:48 peter Exp $
+ * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.2 2003/05/31 06:49:53 peter Exp $
*/
/*
@@ -83,6 +83,7 @@
#define IDTVEC(name) __CONCAT(X,name)
extern inthand_t IDTVEC(int0x80_syscall), IDTVEC(rsvd);
+extern const char *ia32_syscallnames[];
void ia32_syscall(struct trapframe frame); /* Called from asm code */
@@ -251,7 +252,7 @@
cred_free_thread(td);
#endif
WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
- (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???");
+ (code >= 0 && code < SYS_MAXSYSCALL) ? ia32_syscallnames[code] : "???");
mtx_assert(&sched_lock, MA_NOTOWNED);
mtx_assert(&Giant, MA_NOTOWNED);
}
==== //depot/projects/smpng/sys/amd64/ia32/syscalls.conf#2 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.1 2002/04/10 19:34:51 dfr Exp $
-sysnames="/dev/null"
+# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.2 2003/05/31 06:49:53 peter Exp $
+sysnames="ia32_syscalls.c"
sysproto="ia32_proto.h"
sysproto_h=_IA32_SYSPROTO_H_
syshdr="ia32_syscall.h"
==== //depot/projects/smpng/sys/amd64/include/asm.h#4 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90
- * $FreeBSD: src/sys/amd64/include/asm.h,v 1.13 2003/05/24 18:24:03 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.14 2003/06/02 05:59:35 peter Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -58,7 +58,7 @@
* to a possibly-modified form that will be invisible to C programs.
*/
#define CNAME(csym) csym
-#define HIDENAME(asmsym) __CONCAT(.,asmsym)
+#define HIDENAME(asmsym) .asmsym
/* XXX should use .p2align 4,0x90 for -m486. */
#define _START_ENTRY .text; .p2align 2,0x90
==== //depot/projects/smpng/sys/amd64/include/bus_dma.h#4 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.21 2003/05/27 04:59:56 scottl Exp $ */
+/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.22 2003/05/30 20:40:33 hmp Exp $ */
#ifndef _AMD64_BUS_DMA_H_
#define _AMD64_BUS_DMA_H_
@@ -78,7 +78,7 @@
#define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */
#define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */
#define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */
-#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */
+#define BUS_DMA_COHERENT 0x04 /* hint map memory in a coherent way */
#define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x20
#define BUS_DMA_BUS3 0x40
==== //depot/projects/smpng/sys/amd64/include/db_machdep.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*
- * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.18 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.19 2003/05/30 01:01:07 peter Exp $
*/
#ifndef _MACHINE_DB_MACHDEP_H_
@@ -33,12 +33,12 @@
#include <machine/psl.h>
#include <machine/trap.h>
-#define i386_saved_state trapframe
+#define amd64_saved_state trapframe
typedef vm_offset_t db_addr_t; /* address - unsigned */
typedef long db_expr_t; /* expression - signed */
-typedef struct i386_saved_state db_regs_t;
+typedef struct amd64_saved_state db_regs_t;
extern db_regs_t ddb_regs; /* register state */
#define DDB_REGS (&ddb_regs)
@@ -48,12 +48,12 @@
#define BKPT_SIZE (1) /* size of breakpoint inst */
#define BKPT_SET(inst) (BKPT_INST)
-#define BKPT_SKIP ddb_regs.tf_eip += 1
+#define BKPT_SKIP ddb_regs.tf_rip += 1
-#define FIXUP_PC_AFTER_BREAK ddb_regs.tf_eip -= 1;
+#define FIXUP_PC_AFTER_BREAK ddb_regs.tf_rip -= 1;
-#define db_clear_single_step(regs) ((regs)->tf_eflags &= ~PSL_T)
-#define db_set_single_step(regs) ((regs)->tf_eflags |= PSL_T)
+#define db_clear_single_step(regs) ((regs)->tf_rflags &= ~PSL_T)
+#define db_set_single_step(regs) ((regs)->tf_rflags |= PSL_T)
#define IS_BREAKPOINT_TRAP(type, code) ((type) == T_BPTFLT)
/*
==== //depot/projects/smpng/sys/amd64/include/profile.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/amd64/include/profile.h,v 1.31 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/profile.h,v 1.32 2003/06/02 00:28:39 obrien Exp $
*/
#ifndef _MACHINE_PROFILE_H_
@@ -94,14 +94,14 @@
* \
* selfpc = pc pushed by call to mcount \
*/ \
- asm("movq 8(%%rbp),%0" : "=r" (selfpc)); \
+ __asm("movq 8(%%rbp),%0" : "=r" (selfpc)); \
/* \
* frompc = pc pushed by call to mcount's caller. \
* The caller's stack frame has already been built, so %ebp is \
* the caller's frame pointer. The caller's raddr is in the \
* caller's frame following the caller's caller's frame pointer.\
*/ \
- asm("movq (%%rbp),%0" : "=r" (frompc)); \
+ __asm("movq (%%rbp),%0" : "=r" (frompc)); \
frompc = ((uintfptr_t *)frompc)[1]; \
_mcount(frompc, selfpc); \
}
==== //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#2 (text+ko) ====
@@ -13,7 +13,7 @@
# purpose.
#
-# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.25 2000/12/19 00:17:36 rnordier Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.26 2003/06/01 20:41:04 obrien Exp $
# A 512-byte boot manager.
@@ -32,6 +32,7 @@
.set KEY_ENTER,0x1c # Enter key scan code
.set KEY_F1,0x3b # F1 key scan code
+ .set KEY_1,0x02 # #1 key scan code
#
# Addresses in the sector of embedded data values.
@@ -228,6 +229,9 @@
#
subb $KEY_F1,%al # Less F1 scan code
cmpb $0x4,%al # F1..F5?
+ jna main.12 # Yes
+ subb $(KEY_1 - KEY_F1),%al # Less #1 scan code
+ cmpb $0x4,%al # #1..#5?
ja main.10 # No
#
# We have a selection.
@@ -364,7 +368,7 @@
#
# These values indicate bootable types we know the names of
#
- .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83
+ .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x83
.byte 0x9f, 0xa5, 0xa6, 0xa9
#
# These are offsets that match the known names above and point to the strings
@@ -377,7 +381,6 @@
.byte os_dos-. # Windows
.byte os_dos-. # Windows
.byte os_dos-. # Windows
- .byte os_unix-. # UNIX
.byte os_linux-. # Linux
.byte os_bsd-. # BSD/OS
.byte os_freebsd-. # FreeBSD
@@ -389,7 +392,6 @@
#
os_misc: .ascii "?"; .byte '?'|0x80
os_dos: .ascii "DO"; .byte 'S'|0x80
-os_unix: .ascii "UNI"; .byte 'X'|0x80
os_linux: .ascii "Linu"; .byte 'x'|0x80
os_freebsd: .ascii "Free"
os_bsd: .ascii "BS"; .byte 'D'|0x80
==== //depot/projects/smpng/sys/boot/i386/libi386/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.29 2003/05/01 03:56:29 peter Exp $
+# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.30 2003/06/02 02:37:27 obrien Exp $
#
LIB= i386
INTERNALLIB= true
@@ -7,7 +7,7 @@
biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
comconsole.c devicename.c elf32_freebsd.c \
elf64_freebsd.c gatea20.c \
- i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
+ i386_copy.c i386_module.c nullconsole.c pxe.c \
time.c vidconsole.c amd64_tramp.S
CFLAGS+= -ffreestanding
@@ -39,11 +39,14 @@
.if exists(${.CURDIR}/../../../i386/include)
beforedepend ${OBJS}: machine
+CLEANFILES+= machine
machine:
ln -sf ${.CURDIR}/../../../i386/include machine
.endif
-CLEANFILES+= machine
+OBJS+= pxetramp.o
+pxetramp.o: pxetramp.s
+ as -o ${.TARGET} ${.ALLSRC:M*pxetramp*}
.include <bsd.lib.mk>
==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.63 2003/01/18 23:09:56 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.65 2003/05/31 05:25:17 scottl Exp $
PROG= loader
STRIP=
@@ -102,10 +102,11 @@
.PATH: ${.CURDIR}/../../forth
FILES= ${PROG}.help loader.4th support.4th loader.conf
+FILES+= screen.4th frames.4th beastie.4th
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+= loader.rc
+FILES+= ${.CURDIR}/loader.rc
.endif
.include <${.CURDIR}/../Makefile.inc>
==== //depot/projects/smpng/sys/cam/cam.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cam/cam.c,v 1.5 2002/01/09 03:38:58 msmith Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list