PERFORCE change 52814 for review
Warner Losh
imp at FreeBSD.org
Fri May 14 13:28:00 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=52814
Change 52814 by imp at imp_pacopaco on 2004/05/14 13:27:17
IFC @52800 power
Affected files ...
.. //depot/projects/power/sys/alpha/alpha/fp_emulate.c#2 integrate
.. //depot/projects/power/sys/alpha/alpha/ieee_float.c#2 integrate
.. //depot/projects/power/sys/alpha/include/fpu.h#2 integrate
.. //depot/projects/power/sys/amd64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/power/sys/amd64/include/acpica_machdep.h#4 integrate
.. //depot/projects/power/sys/arm/arm/autoconf.c#1 branch
.. //depot/projects/power/sys/arm/arm/bcopy_page.S#1 branch
.. //depot/projects/power/sys/arm/arm/bcopyinout.S#1 branch
.. //depot/projects/power/sys/arm/arm/bcopyinout_xscale.S#1 branch
.. //depot/projects/power/sys/arm/arm/blockio.S#1 branch
.. //depot/projects/power/sys/arm/arm/bootconfig.c#1 branch
.. //depot/projects/power/sys/arm/arm/bus_space_asm_generic.S#1 branch
.. //depot/projects/power/sys/arm/arm/busdma_machdep.c#1 branch
.. //depot/projects/power/sys/arm/arm/copystr.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc.c#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm10.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm3.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm67.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm8.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm9.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_armv4.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_sa1.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch
.. //depot/projects/power/sys/arm/arm/cpufunc_asm_xscale.S#1 branch
.. //depot/projects/power/sys/arm/arm/critical.c#1 branch
.. //depot/projects/power/sys/arm/arm/db_disasm.c#1 branch
.. //depot/projects/power/sys/arm/arm/db_interface.c#1 branch
.. //depot/projects/power/sys/arm/arm/db_trace.c#1 branch
.. //depot/projects/power/sys/arm/arm/disassem.c#1 branch
.. //depot/projects/power/sys/arm/arm/dump_machdep.c#1 branch
.. //depot/projects/power/sys/arm/arm/elf_machdep.c#1 branch
.. //depot/projects/power/sys/arm/arm/exception.S#1 branch
.. //depot/projects/power/sys/arm/arm/fiq.c#1 branch
.. //depot/projects/power/sys/arm/arm/fiq_subr.S#1 branch
.. //depot/projects/power/sys/arm/arm/fusu.S#1 branch
.. //depot/projects/power/sys/arm/arm/genassym.c#1 branch
.. //depot/projects/power/sys/arm/arm/identcpu.c#1 branch
.. //depot/projects/power/sys/arm/arm/in_cksum.c#1 branch
.. //depot/projects/power/sys/arm/arm/in_cksum_arm.S#1 branch
.. //depot/projects/power/sys/arm/arm/intr.c#1 branch
.. //depot/projects/power/sys/arm/arm/irq_dispatch.S#1 branch
.. //depot/projects/power/sys/arm/arm/locore.S#1 branch
.. //depot/projects/power/sys/arm/arm/machdep.c#1 branch
.. //depot/projects/power/sys/arm/arm/nexus.c#1 branch
.. //depot/projects/power/sys/arm/arm/nexus_io.c#1 branch
.. //depot/projects/power/sys/arm/arm/nexus_io_asm.S#1 branch
.. //depot/projects/power/sys/arm/arm/pmap.c#1 branch
.. //depot/projects/power/sys/arm/arm/setcpsr.S#1 branch
.. //depot/projects/power/sys/arm/arm/setstack.s#1 branch
.. //depot/projects/power/sys/arm/arm/support.S#1 branch
.. //depot/projects/power/sys/arm/arm/swtch.S#1 branch
.. //depot/projects/power/sys/arm/arm/sys_machdep.c#1 branch
.. //depot/projects/power/sys/arm/arm/trap.c#1 branch
.. //depot/projects/power/sys/arm/arm/uio_machdep.c#1 branch
.. //depot/projects/power/sys/arm/arm/undefined.c#1 branch
.. //depot/projects/power/sys/arm/arm/vectors.S#1 branch
.. //depot/projects/power/sys/arm/arm/vm_machdep.c#1 branch
.. //depot/projects/power/sys/arm/conf/SIMICS#1 branch
.. //depot/projects/power/sys/arm/include/_inttypes.h#1 branch
.. //depot/projects/power/sys/arm/include/_types.h#3 integrate
.. //depot/projects/power/sys/arm/include/armreg.h#1 branch
.. //depot/projects/power/sys/arm/include/asm.h#1 branch
.. //depot/projects/power/sys/arm/include/asmacros.h#1 branch
.. //depot/projects/power/sys/arm/include/atomic.h#1 branch
.. //depot/projects/power/sys/arm/include/blockio.h#1 branch
.. //depot/projects/power/sys/arm/include/bootconfig.h#1 branch
.. //depot/projects/power/sys/arm/include/bus.h#1 branch
.. //depot/projects/power/sys/arm/include/clock.h#1 branch
.. //depot/projects/power/sys/arm/include/cpu.h#1 branch
.. //depot/projects/power/sys/arm/include/cpuconf.h#1 branch
.. //depot/projects/power/sys/arm/include/cpufunc.h#1 branch
.. //depot/projects/power/sys/arm/include/critical.h#1 branch
.. //depot/projects/power/sys/arm/include/db_machdep.h#1 branch
.. //depot/projects/power/sys/arm/include/disassem.h#1 branch
.. //depot/projects/power/sys/arm/include/elf.h#3 integrate
.. //depot/projects/power/sys/arm/include/endian.h#2 integrate
.. //depot/projects/power/sys/arm/include/fiq.h#1 branch
.. //depot/projects/power/sys/arm/include/float.h#1 branch
.. //depot/projects/power/sys/arm/include/floatingpoint.h#1 branch
.. //depot/projects/power/sys/arm/include/fp.h#1 branch
.. //depot/projects/power/sys/arm/include/frame.h#1 branch
.. //depot/projects/power/sys/arm/include/ieee.h#1 branch
.. //depot/projects/power/sys/arm/include/ieeefp.h#1 branch
.. //depot/projects/power/sys/arm/include/in_cksum.h#1 branch
.. //depot/projects/power/sys/arm/include/intr.h#1 branch
.. //depot/projects/power/sys/arm/include/katelib.h#1 branch
.. //depot/projects/power/sys/arm/include/machdep.h#1 branch
.. //depot/projects/power/sys/arm/include/md_var.h#1 branch
.. //depot/projects/power/sys/arm/include/metadata.h#1 branch
.. //depot/projects/power/sys/arm/include/mutex.h#1 branch
.. //depot/projects/power/sys/arm/include/param.h#2 integrate
.. //depot/projects/power/sys/arm/include/pcb.h#1 branch
.. //depot/projects/power/sys/arm/include/pcpu.h#1 branch
.. //depot/projects/power/sys/arm/include/pmap.h#1 branch
.. //depot/projects/power/sys/arm/include/proc.h#1 branch
.. //depot/projects/power/sys/arm/include/profile.h#1 branch
.. //depot/projects/power/sys/arm/include/psl.h#1 branch
.. //depot/projects/power/sys/arm/include/pte.h#1 branch
.. //depot/projects/power/sys/arm/include/ptrace.h#1 branch
.. //depot/projects/power/sys/arm/include/reg.h#1 branch
.. //depot/projects/power/sys/arm/include/reloc.h#1 branch
.. //depot/projects/power/sys/arm/include/resource.h#1 branch
.. //depot/projects/power/sys/arm/include/runq.h#1 branch
.. //depot/projects/power/sys/arm/include/setjmp.h#1 branch
.. //depot/projects/power/sys/arm/include/sf_buf.h#1 branch
.. //depot/projects/power/sys/arm/include/sigframe.h#1 branch
.. //depot/projects/power/sys/arm/include/signal.h#3 integrate
.. //depot/projects/power/sys/arm/include/smp.h#1 branch
.. //depot/projects/power/sys/arm/include/stdarg.h#1 branch
.. //depot/projects/power/sys/arm/include/swi.h#1 branch
.. //depot/projects/power/sys/arm/include/trap.h#1 branch
.. //depot/projects/power/sys/arm/include/ucontext.h#2 integrate
.. //depot/projects/power/sys/arm/include/undefined.h#1 branch
.. //depot/projects/power/sys/arm/include/utrap.h#1 branch
.. //depot/projects/power/sys/arm/include/vmparam.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/assabet_machdep.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/files.sa11x0#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_io.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_irq.S#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_ost.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_reg.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/sa11x0_var.h#1 branch
.. //depot/projects/power/sys/arm/sa11x0/std.sa11x0#1 branch
.. //depot/projects/power/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch
.. //depot/projects/power/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch
.. //depot/projects/power/sys/boot/Makefile#4 integrate
.. //depot/projects/power/sys/boot/i386/libi386/biosacpi.c#2 integrate
.. //depot/projects/power/sys/conf/Makefile.alpha#4 integrate
.. //depot/projects/power/sys/conf/Makefile.amd64#3 integrate
.. //depot/projects/power/sys/conf/Makefile.arm#1 branch
.. //depot/projects/power/sys/conf/Makefile.i386#2 integrate
.. //depot/projects/power/sys/conf/Makefile.ia64#2 integrate
.. //depot/projects/power/sys/conf/Makefile.pc98#2 integrate
.. //depot/projects/power/sys/conf/Makefile.powerpc#3 integrate
.. //depot/projects/power/sys/conf/Makefile.sparc64#2 integrate
.. //depot/projects/power/sys/conf/NOTES#17 integrate
.. //depot/projects/power/sys/conf/files#14 integrate
.. //depot/projects/power/sys/conf/files.arm#1 branch
.. //depot/projects/power/sys/conf/files.i386#11 integrate
.. //depot/projects/power/sys/conf/files.ia64#6 integrate
.. //depot/projects/power/sys/conf/files.pc98#6 integrate
.. //depot/projects/power/sys/conf/files.sparc64#5 integrate
.. //depot/projects/power/sys/conf/kern.mk#5 integrate
.. //depot/projects/power/sys/conf/ldscript.arm#1 branch
.. //depot/projects/power/sys/conf/majors#10 integrate
.. //depot/projects/power/sys/conf/options#17 integrate
.. //depot/projects/power/sys/conf/options.arm#1 branch
.. //depot/projects/power/sys/conf/options.sparc64#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acfreebsd.h#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src.diff#1 branch
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx.h#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.c#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.c#3 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.h#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.c#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.h#3 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.c#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.h#3 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_str.c#3 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#3 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#4 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate
.. //depot/projects/power/sys/dev/aac/aac_pci.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/Osd/OsdSynch.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/acpi.c#22 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_acad.c#7 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_cpu.c#8 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_ec.c#7 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pci.c#15 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pcib.c#7 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pcib_pci.c#3 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_thermal.c#9 integrate
.. //depot/projects/power/sys/dev/acpica/acpivar.h#14 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.c#4 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.h#4 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.reg#3 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.seq#4 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_pci.c#5 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx.c#4 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/power/sys/dev/an/if_an_pccard.c#4 integrate
.. //depot/projects/power/sys/dev/asr/asr.c#6 integrate
.. //depot/projects/power/sys/dev/ata/ata-chipset.c#12 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.c#12 integrate
.. //depot/projects/power/sys/dev/awi/if_awi_pccard.c#4 integrate
.. //depot/projects/power/sys/dev/cp/cpddk.c#1 branch
.. //depot/projects/power/sys/dev/cp/cpddk.h#1 branch
.. //depot/projects/power/sys/dev/cp/if_cp.c#1 branch
.. //depot/projects/power/sys/dev/cp/ng_cp.h#1 branch
.. //depot/projects/power/sys/dev/cs/if_cs_pccard.c#3 integrate
.. //depot/projects/power/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/power/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/power/sys/dev/ed/if_ed_pccard.c#5 integrate
.. //depot/projects/power/sys/dev/hme/if_hme.c#4 integrate
.. //depot/projects/power/sys/dev/ichwd/ichwd.c#1 branch
.. //depot/projects/power/sys/dev/ichwd/ichwd.h#1 branch
.. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/power/sys/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/power/sys/dev/led/led.h#2 integrate
.. //depot/projects/power/sys/dev/pccard/files.pccard#2 delete
.. //depot/projects/power/sys/dev/pccard/pccarddevs#8 integrate
.. //depot/projects/power/sys/dev/pccard/pccarddevs.h#8 integrate
.. //depot/projects/power/sys/dev/pccbb/pccbb.c#12 integrate
.. //depot/projects/power/sys/dev/sio/sio.c#10 integrate
.. //depot/projects/power/sys/dev/sn/if_sn_pccard.c#3 integrate
.. //depot/projects/power/sys/dev/snc/if_snc_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/power/sys/dev/sound/isa/sb16.c#4 integrate
.. //depot/projects/power/sys/dev/sound/isa/sbc.c#4 integrate
.. //depot/projects/power/sys/dev/sound/pcm/ac97.c#5 integrate
.. //depot/projects/power/sys/dev/twe/twe.c#4 integrate
.. //depot/projects/power/sys/dev/twe/twereg.h#4 integrate
.. //depot/projects/power/sys/dev/twe/twevar.h#4 integrate
.. //depot/projects/power/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/power/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/power/sys/dev/usb/if_axe.c#6 integrate
.. //depot/projects/power/sys/dev/usb/ohcireg.h#2 integrate
.. //depot/projects/power/sys/dev/usb/umodem.c#2 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs.h#12 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs_data.h#12 integrate
.. //depot/projects/power/sys/dev/usb/uvisor.c#5 integrate
.. //depot/projects/power/sys/dev/wi/if_wi_pccard.c#5 integrate
.. //depot/projects/power/sys/dev/wl/if_wl.c#5 integrate
.. //depot/projects/power/sys/fs/nwfs/nwfs_io.c#4 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_io.c#4 integrate
.. //depot/projects/power/sys/fs/specfs/spec_vnops.c#7 integrate
.. //depot/projects/power/sys/geom/concat/g_concat.c#3 integrate
.. //depot/projects/power/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/power/sys/geom/gate/g_gate.h#2 integrate
.. //depot/projects/power/sys/geom/geom_disk.c#5 integrate
.. //depot/projects/power/sys/i386/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_wakeup.c#5 integrate
.. //depot/projects/power/sys/i386/acpica/madt.c#5 integrate
.. //depot/projects/power/sys/i386/conf/PAE#3 integrate
.. //depot/projects/power/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/power/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/power/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/power/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/power/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/power/sys/i386/i386/mptable.c#3 integrate
.. //depot/projects/power/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/power/sys/i386/i386/nexus.c#3 integrate
.. //depot/projects/power/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/power/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/power/sys/i386/include/bus_pc98.h#3 integrate
.. //depot/projects/power/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/power/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/power/sys/i386/include/pci_cfgreg.h#4 integrate
.. //depot/projects/power/sys/i386/isa/atpic.c#5 integrate
.. //depot/projects/power/sys/i386/isa/atpic_vector.s#5 integrate
.. //depot/projects/power/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/power/sys/i386/isa/elcr.c#1 branch
.. //depot/projects/power/sys/i386/isa/icu.h#5 integrate
.. //depot/projects/power/sys/i386/isa/npx.c#5 integrate
.. //depot/projects/power/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/power/sys/i386/pci/pci_pir.c#3 integrate
.. //depot/projects/power/sys/ia64/acpica/OsdEnvironment.c#3 integrate
.. //depot/projects/power/sys/ia64/ia64/interrupt.c#4 integrate
.. //depot/projects/power/sys/ia64/ia64/trap.c#8 integrate
.. //depot/projects/power/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/power/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/power/sys/kern/kern_mac.c#5 integrate
.. //depot/projects/power/sys/kern/kern_resource.c#6 integrate
.. //depot/projects/power/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/power/sys/kern/subr_smp.c#7 integrate
.. //depot/projects/power/sys/kern/tty_compat.c#3 integrate
.. //depot/projects/power/sys/kern/uipc_mbuf2.c#5 integrate
.. //depot/projects/power/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/power/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/power/sys/kern/vfs_syscalls.c#10 integrate
.. //depot/projects/power/sys/libkern/arm/bzero.S#1 branch
.. //depot/projects/power/sys/libkern/arm/divsi3.S#1 branch
.. //depot/projects/power/sys/libkern/arm/ffs.S#1 branch
.. //depot/projects/power/sys/libkern/arm/memcmp.S#1 branch
.. //depot/projects/power/sys/libkern/arm/memcpy.S#1 branch
.. //depot/projects/power/sys/libkern/arm/memcpy_arm.S#1 branch
.. //depot/projects/power/sys/libkern/arm/memcpy_xscale.S#1 branch
.. //depot/projects/power/sys/libkern/arm/memset.S#1 branch
.. //depot/projects/power/sys/libkern/arm/muldi3.c#1 branch
.. //depot/projects/power/sys/libkern/arm/strcmp.S#1 branch
.. //depot/projects/power/sys/libkern/arm/strncmp.S#1 branch
.. //depot/projects/power/sys/libkern/quad.h#4 integrate
.. //depot/projects/power/sys/modules/Makefile#10 integrate
.. //depot/projects/power/sys/modules/cp/Makefile#1 branch
.. //depot/projects/power/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/power/sys/modules/ichwd/Makefile#1 branch
.. //depot/projects/power/sys/net/if_vlan.c#7 integrate
.. //depot/projects/power/sys/net/rtsock.c#9 integrate
.. //depot/projects/power/sys/net80211/ieee80211.c#5 integrate
.. //depot/projects/power/sys/netatalk/ddp_usrreq.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/include/ng_btsocket.h#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/include/ng_h4.h#3 integrate
.. //depot/projects/power/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/power/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/power/sys/netinet/ip_input.c#9 integrate
.. //depot/projects/power/sys/netinet/ip_output.c#9 integrate
.. //depot/projects/power/sys/netinet/ip_var.h#7 integrate
.. //depot/projects/power/sys/netinet/raw_ip.c#8 integrate
.. //depot/projects/power/sys/netinet/tcp_output.c#5 integrate
.. //depot/projects/power/sys/netinet/tcp_subr.c#13 integrate
.. //depot/projects/power/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/power/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/power/sys/netinet6/ip6_output.c#9 integrate
.. //depot/projects/power/sys/nfsclient/nfs_bio.c#8 integrate
.. //depot/projects/power/sys/pc98/conf/NOTES#9 integrate
.. //depot/projects/power/sys/pc98/pc98/sio.c#8 integrate
.. //depot/projects/power/sys/pci/agp_via.c#4 integrate
.. //depot/projects/power/sys/pci/agpreg.h#4 integrate
.. //depot/projects/power/sys/security/mac/mac_net.c#6 integrate
.. //depot/projects/power/sys/security/mac_test/mac_test.c#5 integrate
.. //depot/projects/power/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/power/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/power/sys/sparc64/ebus/ebus.c#4 integrate
.. //depot/projects/power/sys/sparc64/include/ofw_bus.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/pmap.h#6 integrate
.. //depot/projects/power/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/power/sys/sparc64/isa/ofw_isa.c#3 integrate
.. //depot/projects/power/sys/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/projects/power/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/power/sys/sparc64/pci/ofw_pci.c#2 integrate
.. //depot/projects/power/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/power/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/power/sys/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/power/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/power/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/power/sys/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/power/sys/sparc64/pci/psychovar.h#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/ofw_bus.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/ofw_machdep.c#6 integrate
.. //depot/projects/power/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/power/sys/sys/_label.h#3 integrate
.. //depot/projects/power/sys/sys/acl.h#2 integrate
.. //depot/projects/power/sys/sys/condvar.h#5 integrate
.. //depot/projects/power/sys/sys/elf_common.h#2 integrate
.. //depot/projects/power/sys/sys/imgact_aout.h#3 integrate
.. //depot/projects/power/sys/sys/mac.h#6 integrate
.. //depot/projects/power/sys/sys/mac_policy.h#5 integrate
.. //depot/projects/power/sys/sys/regression.h#2 integrate
.. //depot/projects/power/sys/sys/socket.h#6 integrate
.. //depot/projects/power/sys/sys/ttycom.h#4 integrate
.. //depot/projects/power/sys/sys/user.h#4 integrate
.. //depot/projects/power/sys/vm/swap_pager.c#8 integrate
.. //depot/projects/power/sys/vm/vm_fault.c#6 integrate
.. //depot/projects/power/sys/vm/vm_glue.c#6 integrate
.. //depot/projects/power/sys/vm/vm_map.c#8 integrate
.. //depot/projects/power/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/power/sys/vm/vm_page.c#10 integrate
.. //depot/projects/power/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/power/sys/vm/vnode_pager.c#8 integrate
Differences ...
==== //depot/projects/power/sys/alpha/alpha/fp_emulate.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@
td->td_pcb->pcb_fp_control = control;
/* Regenerate the control register */
- fpcr = fpregs->fpr_cr & FPCR_DYN_MASK;
+ fpcr = fpregs->fpr_cr & (FPCR_DYN_MASK | FPCR_STATUS_MASK);
fpcr |= ((control & IEEE_STATUS_MASK)
<< IEEE_STATUS_TO_FPCR_SHIFT);
if (!(control & IEEE_TRAP_ENABLE_INV))
==== //depot/projects/power/sys/alpha/alpha/ieee_float.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $");
#include <sys/types.h>
#ifdef TEST
@@ -312,6 +312,9 @@
break;
}
+ if (frac == 0)
+ *status |= FPCR_UNF;
+
/*
* Rounding up may take us to TWO if
* fraclo == (TWO - epsilon). Also If fraclo has been
==== //depot/projects/power/sys/alpha/include/fpu.h#2 (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/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $
*/
#ifndef _MACHINE_FPU_H_
@@ -56,6 +56,8 @@
#define FPCR_INED (1LL << 62) /* Inexact Disable */
#define FPCR_SUM (1LL << 63) /* Summary Bit */
#define FPCR_MASK (~0LL << 49)
+#define FPCR_STATUS_MASK (FPCR_INV | FPCR_DZE | FPCR_OVF | \
+ FPCR_UNF | FPCR_INE | FPCR_IOV)
/*
* Exception summary bits.
==== //depot/projects/power/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
/*
* 6.1 : Environmental support
@@ -37,7 +37,7 @@
#include "acpi.h"
-u_long amd64_acpi_root;
+static u_long amd64_acpi_root;
SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
"The physical address of the RSDP");
==== //depot/projects/power/sys/amd64/include/acpica_machdep.h#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/include/acpica_machdep.h,v 1.4 2003/11/21 03:02:00 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $
*/
/******************************************************************************
@@ -59,44 +59,14 @@
#define ACPI_FLUSH_CPU_CACHE() wbinvd()
-#define asm __asm
-/*! [Begin] no source code translation
- *
- * A brief explanation as GNU inline assembly is a bit hairy
- * %0 is the output parameter in EAX ("=a")
- * %1 and %2 are the input parameters in ECX ("c")
- * and an immediate value ("i") respectively
- * All actual register references are preceded with "%%" as in "%%edx"
- * Immediate values in the assembly are preceded by "$" as in "$0x1"
- * The final asm parameter are the operation altered non-output registers.
- */
+/* Section 5.2.9.1: global lock acquire/release functions */
+extern int acpi_acquire_global_lock(uint32_t *lock);
+extern int acpi_release_global_lock(uint32_t *lock);
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- asm("1: movl %1,%%eax;" \
- "movl %%eax,%%edx;" \
- "andl %2,%%edx;" \
- "btsl $0x1,%%edx;" \
- "adcl $0x0,%%edx;" \
- "lock; cmpxchgl %%edx,%1;" \
- "jnz 1b;" \
- "cmpb $0x3,%%dl;" \
- "sbbl %%eax,%%eax" \
- : "=a" (Acq), "+m" (GLptr) : "i" (~1L) : "edx"); \
- } while(0)
-
+ ((Acq) = acpi_acquire_global_lock(GLptr))
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- asm("1: movl %1,%%eax;" \
- "movl %%eax,%%edx;" \
- "andl %2,%%edx;" \
- "lock; cmpxchgl %%edx,%1;" \
- "jnz 1b;" \
- "andl $0x1,%%eax" \
- : "=a" (Acq), "+m" (GLptr) : "i" (~3L) : "edx"); \
- } while(0)
-
-
-/*! [End] no source code translation !*/
+ ((Acq) = acpi_release_global_lock(GLptr))
+
#endif /* _KERNEL */
#define ACPI_MACHINE_WIDTH 64
==== //depot/projects/power/sys/arm/include/_types.h#3 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.5 2004/05/04 22:16:29 cognet Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -65,6 +65,8 @@
typedef __uint32_t __clock_t; /* clock()... */
typedef unsigned int __cpumask_t;
typedef __int32_t __critical_t;
+typedef double __double_t;
+typedef double __float_t;
typedef __int32_t __intfptr_t;
typedef __int64_t __intmax_t;
typedef __int32_t __intptr_t;
==== //depot/projects/power/sys/arm/include/elf.h#3 (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/arm/include/elf.h,v 1.4 2003/09/25 01:10:23 peter Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.5 2004/05/04 22:21:36 cognet Exp $
*/
#ifndef _MACHINE_ELF_H_
@@ -40,6 +40,17 @@
#define __ELF_WORD_SIZE 32 /* Used by <sys/elf_generic.h> */
#include <sys/elf_generic.h>
+typedef struct { /* Auxiliary vector entry on initial stack */
+ int a_type; /* Entry type. */
+ union {
+ long a_val; /* Integer value. */
+ void *a_ptr; /* Address. */
+ void (*a_fcn)(void); /* Function pointer (not used). */
+ } a_un;
+} Elf32_Auxinfo;
+
+__ElfType(Auxinfo);
+
#define ELF_ARCH EM_ARM
#define ELF_MACHINE_OK(x) ((x) == EM_ARM)
@@ -48,6 +59,29 @@
* Relocation types.
*/
+/* Values for a_type. */
+#define AT_NULL 0 /* Terminates the vector. */
+#define AT_IGNORE 1 /* Ignored entry. */
+#define AT_EXECFD 2 /* File descriptor of program to load. */
+#define AT_PHDR 3 /* Program header of program already loaded. */
+#define AT_PHENT 4 /* Size of each program header entry. */
+#define AT_PHNUM 5 /* Number of program header entries. */
+#define AT_PAGESZ 6 /* Page size in bytes. */
+#define AT_BASE 7 /* Interpreter's base address. */
+#define AT_FLAGS 8 /* Flags (unused). */
+#define AT_ENTRY 9 /* Where interpreter should transfer control. */
+
+#define AT_BRK 10 /* Starting point for sbrk and brk. */
+#define AT_DEBUG 11 /* Debugging level. */
+
+#define AT_NOTELF 10 /* Program is not ELF ?? */
+#define AT_UID 11 /* Real uid. */
+#define AT_EUID 12 /* Effective uid. */
+#define AT_GID 13 /* Real gid. */
+#define AT_EGID 14 /* Effective gid. */
+
+#define AT_COUNT 15 /* Count of defined aux entry types. */
+
#define R_ARM_NONE 0 /* No relocation. */
#define R_ARM_PC24 1
#define R_ARM_ABS32 2
@@ -69,7 +103,7 @@
#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */
#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */
#define R_ARM_RELATIVE 23 /* Add load address of shared object. */
-#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. *
+#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */
#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */
#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */
#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */
==== //depot/projects/power/sys/arm/include/endian.h#2 (text+ko) ====
@@ -27,12 +27,71 @@
*
* @(#)endian.h 8.1 (Berkeley) 6/10/93
* $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.2 2003/08/03 07:50:19 obrien Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.3 2004/05/04 22:24:56 cognet Exp $
*/
#ifndef _ENDIAN_H_
#define _ENDIAN_H_
-#define BYTE_ORDER _LITTLE_ENDIAN
+#include <sys/_types.h>
+
+/*
+ * Definitions for byte order, according to byte significance from low
+ * address to high.
+ */
+#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */
+#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */
+#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */
+
+#define _BYTE_ORDER _LITTLE_ENDIAN
+
+#if __BSD_VISIBLE
+#define LITTLE_ENDIAN _LITTLE_ENDIAN
+#define BIG_ENDIAN _BIG_ENDIAN
+#define PDP_ENDIAN _PDP_ENDIAN
+#define BYTE_ORDER _BYTE_ORDER
+#endif
+
+#define _QUAD_HIGHWORD 1
+#define _QUAD_LOWWORD 0
+#define __ntohl(x) (__bswap32(x))
+#define __ntohs(x) (__bswap16(x))
+#define __htonl(x) (__bswap16(x))
+#define __htons(x) (__bswap32(x))
+
+static __inline __uint64_t
+__bswap64(__uint64_t _x)
+{
+
+ return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
+ ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
+ ((_x << 24) & ((__uint64_t)0xff << 40)) |
+ ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
+}
+
+static __inline __uint32_t
+__bswap32(__uint32_t v)
+{
+ __uint32_t t1;
+
+ t1 = v ^ ((v << 16) | (v >> 16));
+ t1 &= 0xff00ffffU;
+ v = (v >> 8) | (v << 24);
+ v ^= (t1 >> 8);
+
+ return (v);
+ }
+static __inline __uint16_t
+__bswap16(__uint32_t v)
+{
+ __asm __volatile(
+ "mov %0, %1, ror #8\n"
+ "orr %0, %0, %0, lsr #16\n"
+ "bic %0, %0, %0, lsl #16"
+ : "=r" (v)
+ : "0" (v));
+
+ return (v);
+}
#endif /* !_ENDIAN_H_ */
==== //depot/projects/power/sys/arm/include/param.h#2 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)param.h 5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/arm/include/param.h,v 1.4 2002/09/17 01:48:54 peter Exp $
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.5 2004/05/14 11:46:44 cognet Exp $
*/
/*
@@ -55,10 +55,10 @@
#endif
#ifndef _MACHINE
-#define _MACHIN "arm32"
+#define _MACHINE "arm"
#endif
#ifndef _MACHINE_ARCH
-#define _MACHINE_ARCH "arm32"
+#define _MACHINE_ARCH "arm"
#endif
#ifndef _NO_NAMESPACE_POLLUTION
@@ -67,14 +67,12 @@
#define _MACHINE_PARAM_H_
#ifndef MACHINE
-#define MACHINE "arm32"
+#define MACHINE "arm"
#endif
#ifndef MACHINE_ARCH
-#define MACHINE_ARCH "arm32"
+#define MACHINE_ARCH "arm"
#endif
-#define MID_MACHINE MID_ARM32
-
-#include <machine/cpu.h>
+#define MID_MACHINE MID_ARM6
#ifdef SMP
#define MAXCPU 2
@@ -90,12 +88,34 @@
#define PAGE_MASK (PAGE_SIZE - 1)
#define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t)))
-#define KERNBASE 0x100000 /* start of kernel virtual */
-#define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT)
+#define PDR_SHIFT 20 /* log2(NBPDR) */
+#define NBPDR (1 << PDR_SHIFT)
+#define NPDEPG (1 << (32 - PDR_SHIFT))
+
+#ifndef KSTACK_PAGES
+#define KSTACK_PAGES 4
+#endif /* !KSTACK_PAGES */
+
+#ifndef UAREA_PAGES
+#define UAREA_PAGES 2
+#endif /* !UAREA_PAGES */
+
+#ifndef USPACE
+#define USPACE (UAREA_PAGES * PAGE_SIZE) /* total size of u-area */
+#endif
+
+#ifndef FPCONTEXTSIZE
+#define FPCONTEXTSIZE (0x100)
+#endif
-#define UPAGES 2 /* pages of u-area */
-#define USPACE (UPAGES * PAGE_SIZE) /* total size of u-area */
+#ifndef KSTACK_GUARD_PAGES
+#define KSTACK_GUARD_PAGES 1
+#endif /* !KSTACK_GUARD_PAGES */
+#define USPACE_SVC_STACK_TOP (USPACE)
+#define USPACE_SVC_STACK_BOTTOM (USPACE_SVC_STACK_TOP - 0x1000)
+#define USPACE_UNDEF_STACK_TOP (USPACE_SVC_STACK_BOTTOM - 0x10)
+#define USPACE_UNDEF_STACK_BOTTOM (FPCONTEXTSIZE + 10)
/*
* Mach derived conversion macros
*/
==== //depot/projects/power/sys/arm/include/signal.h#3 (text+ko) ====
@@ -29,7 +29,7 @@
* @(#)signal.h 8.1 (Berkeley) 6/11/93
* from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
* from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD: src/sys/arm/include/signal.h,v 1.3 2004/04/05 21:29:41 imp Exp $
+ * $FreeBSD: src/sys/arm/include/signal.h,v 1.4 2004/05/04 22:38:22 cognet Exp $
*/
#ifndef _MACHINE_SIGNAL_H_
@@ -44,7 +44,6 @@
#endif
#if __BSD_VISIBLE
-typedef int osigset_t;
struct osigcontext {
};
==== //depot/projects/power/sys/arm/include/ucontext.h#2 (text+ko) ====
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 2001 David O'Brien.
- * Copyright (c) 1994-1996 Mark Brinicombe.
- * Copyright (c) 1994 Brini.
+/* $NetBSD: mcontext.h,v 1.4 2003/10/08 22:43:01 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
- * This code is derived from software written for Brini by Mark Brinicombe
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Klaus Klein and by Jason R. Thorpe of Wasabi Systems, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -16,65 +17,99 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by Brini.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
*
- * RiscBSD kernel project
- *
- * signal.h
- *
- * Architecture dependant signal types and structures
- *
- * Created : 30/09/94
- *
- * $NetBSD: signal.h,v 1.8 1998/09/14 02:48:33 thorpej Exp $
- * $FreeBSD: src/sys/arm/include/ucontext.h,v 1.1 2001/12/09 19:39:49 obrien Exp $
+ * $FreeBSD: src/sys/arm/include/ucontext.h,v 1.2 2004/05/14 11:46:44 cognet Exp $
+ */
+
+#ifndef _MACHINE_MCONTEXT_H_
+#define _MACHINE_MCONTEXT_H_
+/*
+ * General register state
*/
+#define _NGREG 17
+typedef unsigned int __greg_t;
+typedef __greg_t __gregset_t[_NGREG];
-#ifndef _MACHINE_UCONTEXT_H_
-#define _MACHINE_UCONTEXT_H_
+#define _REG_R0 0
+#define _REG_R1 1
+#define _REG_R2 2
+#define _REG_R3 3
+#define _REG_R4 4
+#define _REG_R5 5
+#define _REG_R6 6
+#define _REG_R7 7
+#define _REG_R8 8
+#define _REG_R9 9
+#define _REG_R10 10
+#define _REG_R11 11
+#define _REG_R12 12
+#define _REG_R13 13
+#define _REG_R14 14
+#define _REG_R15 15
+#define _REG_CPSR 16
+/* Convenience synonyms */
+#define _REG_FP _REG_R11
+#define _REG_SP _REG_R13
+#define _REG_LR _REG_R14
+#define _REG_PC _REG_R15
+
+/*
+ * Floating point register state
+ */
+/* Note: the storage layout of this structure must be identical to ARMFPE! */
+typedef struct {
+ unsigned int __fp_fpsr;
+ struct {
+ unsigned int __fp_exponent;
+ unsigned int __fp_mantissa_hi;
+ unsigned int __fp_mantissa_lo;
+ } __fp_fr[8];
+} __fpregset_t;
-typedef struct __mcontext {
- /*
- * The first 20 fields must match the definition of
- * sigcontext. So that we can support sigcontext
- * and ucontext_t at the same time.
- */
- unsigned int mc_onstack; /* XXX - sigcontext compat. */
- unsigned int mc_spsr;
- unsigned int mc_r0;
- unsigned int mc_r1;
- unsigned int mc_r2;
- unsigned int mc_r3;
- unsigned int mc_r4;
- unsigned int mc_r5;
- unsigned int mc_r6;
- unsigned int mc_r7;
- unsigned int mc_r8;
- unsigned int mc_r9;
- unsigned int mc_r10;
- unsigned int mc_r11;
- unsigned int mc_r12;
- unsigned int mc_usr_sp;
- unsigned int mc_usr_lr;
- unsigned int mc_svc_lr;
- unsigned int mc_pc;
+typedef struct {
+ unsigned int __vfp_fpscr;
+ unsigned int __vfp_fstmx[33];
+ unsigned int __vfp_fpsid;
+} __vfpregset_t;
- unsigned int __spare__[1]; /* XXX fix the size later */
+typedef struct {
+ __gregset_t __gregs;
+ union {
+ __fpregset_t __fpregs;
+ __vfpregset_t __vfpregs;
+ } __fpu;
} mcontext_t;
-#endif /* !_MACHINE_UCONTEXT_H_ */
+/* Machine-dependent uc_flags */
+#define _UC_ARM_VFP 0x00010000 /* FPU field is VFP */
+
+/* used by signal delivery to indicate status of signal stack */
+#define _UC_SETSTACK 0x00020000
+#define _UC_CLRSTACK 0x00040000
+
+#define _UC_MACHINE_PAD 3 /* Padding appended to ucontext_t */
+
+#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
+#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
+#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_R0])
+
+#define _UC_MACHINE_SET_PC(uc, pc) _UC_MACHINE_PC(uc) = (pc)
+
+#endif /* !_MACHINE_MCONTEXT_H_ */
==== //depot/projects/power/sys/boot/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.21 2004/02/07 08:10:06 ru Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.22 2004/05/14 13:34:53 cognet Exp $
.if !defined(NOFORTH)
# Build the add-in FORTH interpreter.
@@ -11,7 +11,9 @@
.endif
# Pick the machine-dependent subdir based on the target architecture.
+.if ${MACHINE_ARCH} != "arm"
SUBDIR+= ${MACHINE:S/amd64/i386/}
+.endif
# Build ARC / AlphaBIOS executable on the Alpha
# (this is a WIP (work in progress)).
==== //depot/projects/power/sys/boot/i386/libi386/biosacpi.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.7 2003/08/25 23:28:31 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.8 2004/05/14 01:29:21 jdp Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list