PERFORCE change 52804 for review
John Baldwin
jhb at FreeBSD.org
Fri May 14 10:47:28 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=52804
Change 52804 by jhb at jhb_slimer on 2004/05/14 10:46:55
IFC @52803.
Affected files ...
.. //depot/projects/smpng/sys/arm/arm/autoconf.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/bcopy_page.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/bcopyinout.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/bcopyinout_xscale.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/blockio.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/bootconfig.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/bus_space_asm_generic.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/copystr.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm10.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm3.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm67.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm8.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm9.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv4.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa1.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/critical.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/db_disasm.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/db_interface.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/db_trace.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/disassem.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/exception.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/fiq.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/fiq_subr.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/fusu.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/genassym.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/identcpu.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/in_cksum.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/in_cksum_arm.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/intr.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/irq_dispatch.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/locore.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/nexus.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/nexus_io.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/nexus_io_asm.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/pmap.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/setcpsr.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/setstack.s#1 branch
.. //depot/projects/smpng/sys/arm/arm/support.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/swtch.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/trap.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/undefined.c#1 branch
.. //depot/projects/smpng/sys/arm/arm/vectors.S#1 branch
.. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/conf/SIMICS#1 branch
.. //depot/projects/smpng/sys/arm/include/_inttypes.h#1 branch
.. //depot/projects/smpng/sys/arm/include/armreg.h#1 branch
.. //depot/projects/smpng/sys/arm/include/asm.h#1 branch
.. //depot/projects/smpng/sys/arm/include/asmacros.h#1 branch
.. //depot/projects/smpng/sys/arm/include/atomic.h#1 branch
.. //depot/projects/smpng/sys/arm/include/blockio.h#1 branch
.. //depot/projects/smpng/sys/arm/include/bootconfig.h#1 branch
.. //depot/projects/smpng/sys/arm/include/bus.h#1 branch
.. //depot/projects/smpng/sys/arm/include/clock.h#1 branch
.. //depot/projects/smpng/sys/arm/include/cpu.h#1 branch
.. //depot/projects/smpng/sys/arm/include/cpuconf.h#1 branch
.. //depot/projects/smpng/sys/arm/include/cpufunc.h#1 branch
.. //depot/projects/smpng/sys/arm/include/critical.h#1 branch
.. //depot/projects/smpng/sys/arm/include/db_machdep.h#1 branch
.. //depot/projects/smpng/sys/arm/include/disassem.h#1 branch
.. //depot/projects/smpng/sys/arm/include/fiq.h#1 branch
.. //depot/projects/smpng/sys/arm/include/float.h#1 branch
.. //depot/projects/smpng/sys/arm/include/floatingpoint.h#1 branch
.. //depot/projects/smpng/sys/arm/include/fp.h#1 branch
.. //depot/projects/smpng/sys/arm/include/frame.h#1 branch
.. //depot/projects/smpng/sys/arm/include/ieee.h#1 branch
.. //depot/projects/smpng/sys/arm/include/ieeefp.h#1 branch
.. //depot/projects/smpng/sys/arm/include/in_cksum.h#1 branch
.. //depot/projects/smpng/sys/arm/include/intr.h#1 branch
.. //depot/projects/smpng/sys/arm/include/katelib.h#1 branch
.. //depot/projects/smpng/sys/arm/include/machdep.h#1 branch
.. //depot/projects/smpng/sys/arm/include/md_var.h#1 branch
.. //depot/projects/smpng/sys/arm/include/metadata.h#1 branch
.. //depot/projects/smpng/sys/arm/include/mutex.h#1 branch
.. //depot/projects/smpng/sys/arm/include/param.h#4 integrate
.. //depot/projects/smpng/sys/arm/include/pcb.h#1 branch
.. //depot/projects/smpng/sys/arm/include/pcpu.h#1 branch
.. //depot/projects/smpng/sys/arm/include/pmap.h#1 branch
.. //depot/projects/smpng/sys/arm/include/proc.h#1 branch
.. //depot/projects/smpng/sys/arm/include/profile.h#1 branch
.. //depot/projects/smpng/sys/arm/include/psl.h#1 branch
.. //depot/projects/smpng/sys/arm/include/pte.h#1 branch
.. //depot/projects/smpng/sys/arm/include/ptrace.h#1 branch
.. //depot/projects/smpng/sys/arm/include/reg.h#1 branch
.. //depot/projects/smpng/sys/arm/include/reloc.h#1 branch
.. //depot/projects/smpng/sys/arm/include/resource.h#1 branch
.. //depot/projects/smpng/sys/arm/include/runq.h#1 branch
.. //depot/projects/smpng/sys/arm/include/setjmp.h#1 branch
.. //depot/projects/smpng/sys/arm/include/sf_buf.h#1 branch
.. //depot/projects/smpng/sys/arm/include/sigframe.h#1 branch
.. //depot/projects/smpng/sys/arm/include/smp.h#1 branch
.. //depot/projects/smpng/sys/arm/include/stdarg.h#1 branch
.. //depot/projects/smpng/sys/arm/include/swi.h#1 branch
.. //depot/projects/smpng/sys/arm/include/trap.h#1 branch
.. //depot/projects/smpng/sys/arm/include/ucontext.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/undefined.h#1 branch
.. //depot/projects/smpng/sys/arm/include/utrap.h#1 branch
.. //depot/projects/smpng/sys/arm/include/vmparam.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/files.sa11x0#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irq.S#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_reg.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_var.h#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/std.sa11x0#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch
.. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch
.. //depot/projects/smpng/sys/boot/Makefile#14 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#7 integrate
.. //depot/projects/smpng/sys/conf/Makefile.alpha#20 integrate
.. //depot/projects/smpng/sys/conf/Makefile.amd64#6 integrate
.. //depot/projects/smpng/sys/conf/Makefile.arm#1 branch
.. //depot/projects/smpng/sys/conf/Makefile.i386#18 integrate
.. //depot/projects/smpng/sys/conf/Makefile.ia64#25 integrate
.. //depot/projects/smpng/sys/conf/Makefile.pc98#17 integrate
.. //depot/projects/smpng/sys/conf/Makefile.powerpc#22 integrate
.. //depot/projects/smpng/sys/conf/Makefile.sparc64#21 integrate
.. //depot/projects/smpng/sys/conf/files.arm#1 branch
.. //depot/projects/smpng/sys/conf/files.i386#60 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#58 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#38 integrate
.. //depot/projects/smpng/sys/conf/kern.mk#12 integrate
.. //depot/projects/smpng/sys/conf/ldscript.arm#1 branch
.. //depot/projects/smpng/sys/conf/options#76 integrate
.. //depot/projects/smpng/sys/conf/options.arm#1 branch
.. //depot/projects/smpng/sys/conf/options.sparc64#10 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src.diff#1 branch
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx.h#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.c#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.h#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.c#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.h#3 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.c#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.h#3 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#4 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#3 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#5 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 integrate
.. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#30 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#27 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#19 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#16 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#13 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#13 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#17 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#19 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#13 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#36 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#45 integrate
.. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#12 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#8 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#21 integrate
.. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#1 branch
.. //depot/projects/smpng/sys/dev/ichwd/ichwd.h#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#5 integrate
.. //depot/projects/smpng/sys/dev/led/led.h#2 integrate
.. //depot/projects/smpng/sys/dev/pccard/files.pccard#2 delete
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#38 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#38 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#10 integrate
.. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#4 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#14 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#23 integrate
.. //depot/projects/smpng/sys/dev/twe/twe.c#11 integrate
.. //depot/projects/smpng/sys/dev/twe/twereg.h#7 integrate
.. //depot/projects/smpng/sys/dev/twe/twevar.h#8 integrate
.. //depot/projects/smpng/sys/dev/usb/umodem.c#17 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#28 integrate
.. //depot/projects/smpng/sys/dev/wl/if_wl.c#20 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#35 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#9 integrate
.. //depot/projects/smpng/sys/i386/conf/PAE#8 integrate
.. //depot/projects/smpng/sys/i386/i386/io_apic.c#6 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#74 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable.c#9 integrate
.. //depot/projects/smpng/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#10 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#34 integrate
.. //depot/projects/smpng/sys/i386/isa/icu.h#11 integrate
.. //depot/projects/smpng/sys/i386/isa/npx.c#41 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#77 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#46 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#14 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#52 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#62 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#73 integrate
.. //depot/projects/smpng/sys/libkern/arm/bzero.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/divsi3.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/ffs.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/memcmp.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/memcpy.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/memcpy_arm.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/memcpy_xscale.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/memset.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/muldi3.c#1 branch
.. //depot/projects/smpng/sys/libkern/arm/strcmp.S#1 branch
.. //depot/projects/smpng/sys/libkern/arm/strncmp.S#1 branch
.. //depot/projects/smpng/sys/modules/Makefile#76 integrate
.. //depot/projects/smpng/sys/modules/ichwd/Makefile#1 branch
.. //depot/projects/smpng/sys/net/rtsock.c#34 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_bt3c.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket.h#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_h4.h#4 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#57 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#32 integrate
.. //depot/projects/smpng/sys/pci/agp_via.c#9 integrate
.. //depot/projects/smpng/sys/pci/agpreg.h#9 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#39 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#5 integrate
.. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#6 integrate
.. //depot/projects/smpng/sys/sparc64/include/pmap.h#26 integrate
.. //depot/projects/smpng/sys/sparc64/isa/isa.c#11 integrate
.. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#7 integrate
.. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/pci/apb.c#7 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#13 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#7 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci_if.m#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#29 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#11 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/counter.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#8 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#8 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#47 integrate
.. //depot/projects/smpng/sys/sys/_label.h#6 integrate
.. //depot/projects/smpng/sys/sys/acl.h#9 integrate
.. //depot/projects/smpng/sys/sys/mac.h#26 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#23 integrate
.. //depot/projects/smpng/sys/sys/regression.h#3 integrate
.. //depot/projects/smpng/sys/sys/socket.h#20 integrate
.. //depot/projects/smpng/sys/sys/ttycom.h#4 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#45 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#51 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#45 integrate
Differences ...
==== //depot/projects/smpng/sys/arm/include/param.h#4 (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/smpng/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/smpng/sys/boot/Makefile#14 (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/smpng/sys/boot/i386/libi386/biosacpi.c#7 (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 $");
#include <stand.h>
#include <machine/stdarg.h>
@@ -66,8 +66,8 @@
revision = 1;
sprintf(buf, "%d", revision);
setenv("hint.acpi.0.revision", buf, 1);
- sprintf(buf, "%6s", rsdp->OemId);
- buf[6] = '\0';
+ strncpy(buf, rsdp->OemId, sizeof(rsdp->OemId));
+ buf[sizeof(rsdp->OemId)] = '\0';
setenv("hint.acpi.0.oem", buf, 1);
sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress);
setenv("hint.acpi.0.rsdt", buf, 1);
==== //depot/projects/smpng/sys/conf/Makefile.alpha#20 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.129 2004/02/13 12:28:52 ru Exp $
+# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.130 2004/05/09 22:29:37 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/smpng/sys/conf/Makefile.amd64#6 (text+ko) ====
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.10 2003/09/30 03:49:09 peter Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.11 2004/05/09 22:29:37 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
STD8X16FONT?= iso
==== //depot/projects/smpng/sys/conf/Makefile.i386#18 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.259 2003/04/15 21:29:11 phk Exp $
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.260 2004/05/09 22:29:37 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
STD8X16FONT?= iso
==== //depot/projects/smpng/sys/conf/Makefile.ia64#25 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.ia64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.56 2003/05/16 21:26:40 marcel Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.57 2004/05/09 22:29:37 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
STD8X16FONT?= iso
==== //depot/projects/smpng/sys/conf/Makefile.pc98#17 (text+ko) ====
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.160 2003/04/15 21:29:11 phk Exp $
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.161 2004/05/09 22:29:37 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/smpng/sys/conf/Makefile.powerpc#22 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.powerpc -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.268 2003/12/09 15:48:20 gallatin Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.269 2004/05/09 22:29:38 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
# Temporary stuff while we're still embryonic
NO_MODULES?= yes
==== //depot/projects/smpng/sys/conf/Makefile.sparc64#21 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.27 2003/04/15 21:29:11 phk Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.28 2004/05/09 22:29:38 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500012
+%VERSREQ= 500013
STD8X16FONT?= iso
==== //depot/projects/smpng/sys/conf/files.i386#60 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.489 2004/05/05 11:17:26 bde Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.490 2004/05/11 18:21:38 des Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -137,6 +137,7 @@
dev/fb/splash.c optional splash
dev/fb/vga.c optional vga
dev/fe/if_fe_isa.c optional fe isa
+dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
dev/if_ndis/if_ndis_pccard.c optional ndis card
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
==== //depot/projects/smpng/sys/conf/files.pc98#58 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.296 2004/05/06 13:49:53 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.297 2004/05/13 11:17:07 nyan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -129,8 +129,6 @@
geom/geom_bsd_enc.c standard
geom/geom_pc98.c standard
geom/geom_pc98_enc.c standard
-libkern/ffsl.c standard
-libkern/flsl.c standard
i386/bios/apm.c optional apm
i386/i386/apic_vector.s optional apic
i386/i386/atomic.c standard \
@@ -211,8 +209,8 @@
i386/linux/linux_ptrace.c optional compat_linux
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
+i386/pci/pci_bus.c optional pci
i386/pci/pci_cfgreg.c optional pci
-i386/pci/pci_bus.c optional pci
i386/pci/pci_pir.c optional pci
i386/svr4/svr4_locore.s optional compat_svr4 \
dependency "svr4_assym.h" \
@@ -310,6 +308,8 @@
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
libkern/divdi3.c standard
+libkern/ffsl.c standard
+libkern/flsl.c standard
libkern/moddi3.c standard
libkern/qdivrem.c standard
libkern/ucmpdi2.c standard
@@ -343,10 +343,10 @@
pc98/pc98/wd.c count wdc
pc98/pc98/wd_cd.c count wcd wdc
pccard/mecia.c optional mecia card
-pci/agp_intel.c optional agp
-pci/agp_via.c optional agp
-pci/agp_sis.c optional agp
pci/agp_ali.c optional agp
pci/agp_amd.c optional agp
pci/agp_i810.c optional agp
+pci/agp_intel.c optional agp
pci/agp_nvidia.c optional agp
+pci/agp_sis.c optional agp
+pci/agp_via.c optional agp
==== //depot/projects/smpng/sys/conf/files.sparc64#38 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.52 2004/04/30 15:00:40 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.53 2004/05/08 13:53:46 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -54,9 +54,9 @@
sparc64/isa/ofw_isa.c optional isa
sparc64/pci/apb.c optional pci
sparc64/pci/ofw_pci.c optional pci
-sparc64/pci/ofw_pcib.c optional pci ofw_newpci
-sparc64/pci/ofw_pcib_subr.c optional pci ofw_newpci
-sparc64/pci/ofw_pcibus.c optional pci ofw_newpci
+sparc64/pci/ofw_pcib.c optional pci
+sparc64/pci/ofw_pcib_subr.c optional pci
+sparc64/pci/ofw_pcibus.c optional pci
sparc64/pci/ofw_pci_if.m optional pci
sparc64/pci/psycho.c optional pci
sparc64/sbus/sbus.c optional sbus
==== //depot/projects/smpng/sys/conf/kern.mk#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.41 2004/03/12 21:36:12 trhodes Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.42 2004/05/14 13:35:46 cognet Exp $
#
# Warning flags for compiling the kernel and components of the kernel.
@@ -42,6 +42,9 @@
INLINE_LIMIT?= 15000
.endif
+.if ${MACHINE_ARCH} == "arm"
+INLINE_LIMIT?= 8000
+.endif
#
# For IA-64, we use r13 for the kernel globals pointer and we only use
# a very small subset of float registers for integer divides.
==== //depot/projects/smpng/sys/conf/options#76 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.449 2004/05/03 22:35:27 ambrisko Exp $
+# $FreeBSD: src/sys/conf/options,v 1.450 2004/05/13 03:15:04 imp Exp $
#
# On the handling of kernel options
#
@@ -533,6 +533,7 @@
# options for USB support
USB_DEBUG opt_usb.h
+USBVERBOSE opt_usb.h
UKBD_DFLT_KEYMAP opt_ukbd.h
UPLCOM_INTR_INTERVAL opt_uplcom.h
UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h
==== //depot/projects/smpng/sys/conf/options.sparc64#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.9 2004/04/30 15:21:25 tmm Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $
SUN4U opt_global.h
@@ -9,7 +9,6 @@
PSYCHO_DEBUG opt_psycho.h
DEBUGGER_ON_POWERFAIL opt_psycho.h
OFW_PCI_DEBUG opt_ofw_pci.h
-OFW_NEWPCI opt_ofw_pci.h
# Debug IOMMU inserts/removes using diagnostic accesses. Very loud.
IOMMU_DIAG opt_iommu.h
PMAP_STATS opt_pmap.h
==== //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx.h#4 (text+ko) ====
@@ -22,6 +22,9 @@
OTHER DEALINGS IN THE SOFTWARE.
*/
+#ifndef __UWX_INCLUDED
+#define __UWX_INCLUDED 1
+
#ifndef _KERNEL
#include <stdlib.h>
#include <inttypes.h>
@@ -30,22 +33,30 @@
#include <sys/systm.h>
#endif
+#if defined(__cplusplus)
+#define __EXTERN_C extern "C"
+#else
+#define __EXTERN_C extern
+#endif
+
+#define UWX_VERSION 1 /* Version id for callback interfaces */
+
/* Unwind environment structure (opaque) */
struct uwx_env;
/* Allocate and free callbacks */
typedef void *(*alloc_cb)(size_t size);
typedef void (*free_cb)(void *ptr);
-extern int uwx_register_alloc_cb(alloc_cb alloc, free_cb free);
+__EXTERN_C int uwx_register_alloc_cb(alloc_cb alloc, free_cb free);
/* Allocate and initialize an unwind environment */
-extern struct uwx_env *uwx_init(void);
+__EXTERN_C struct uwx_env *uwx_init(void);
/* Free an unwind environment */
-extern int uwx_free(struct uwx_env *env);
+__EXTERN_C int uwx_free(struct uwx_env *env);
/* Put unwind express into cross-process mode */
-extern int uwx_set_remote(struct uwx_env *env, int is_big_endian_target);
+__EXTERN_C int uwx_set_remote(struct uwx_env *env, int is_big_endian_target);
/* Copy-in callback */
typedef int (*copyin_cb)(
@@ -63,14 +74,14 @@
uint64_t **vecp); /* parameter vector (in/out) */
/* Register copy-in and lookup IP callbacks */
-extern int uwx_register_callbacks(
+__EXTERN_C int uwx_register_callbacks(
struct uwx_env *env, /* unwind environment */
intptr_t tok, /* callback token */
copyin_cb copyin, /* copy-in callback */
lookupip_cb lookupip); /* lookup IP callback */
/* Initialize a context with the basic info needed to start an unwind */
-extern int uwx_init_context(
+__EXTERN_C int uwx_init_context(
struct uwx_env *env, /* unwind environment */
uint64_t ip, /* IP (instruction pointer) */
uint64_t sp, /* SP (stack pointer) */
@@ -78,51 +89,51 @@
uint64_t cfm); /* CFM (current frame marker) */
/* Set the value of a specific register in the current context (non fp) */
-extern int uwx_set_reg(
+__EXTERN_C int uwx_set_reg(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t val); /* register value */
/* Set the value of a floating-point register in the current context */
-extern int uwx_set_fr(
+__EXTERN_C int uwx_set_fr(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t *val); /* register value (ptr to 16 bytes) */
/* (memory spill format) */
/* Initialize the unwind history */
-extern int uwx_init_history(struct uwx_env *env);
+__EXTERN_C int uwx_init_history(struct uwx_env *env);
/* Step one frame */
-extern int uwx_step(struct uwx_env *env);
+__EXTERN_C int uwx_step(struct uwx_env *env);
/* Get symbol information, if available, for current frame */
-extern int uwx_get_sym_info(
+__EXTERN_C int uwx_get_sym_info(
struct uwx_env *env, /* unwind environment */
char **modp, /* load module name (out) */
char **symp, /* function name (out) */
uint64_t *offsetp); /* offset from start of function (out) */
/* Get the value of a register from the current context */
-extern int uwx_get_reg(
+__EXTERN_C int uwx_get_reg(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t *valp); /* register value (out) */
/* Get the NaT bit of a GR from the current context */
-extern int uwx_get_nat(
+__EXTERN_C int uwx_get_nat(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
int *natp); /* NaT value (out: 0 or 1) */
/* Get the spill location for a register in the current context */
-extern int uwx_get_spill_loc(
+__EXTERN_C int uwx_get_spill_loc(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t *dispp); /* disposition code (see below) (out) */
/* Get the ABI context code (if uwx_step returned UWX_ABI_FRAME) */
-extern int uwx_get_abi_context_code(struct uwx_env *env);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list