PERFORCE change 147852 for review
Julian Elischer
julian at FreeBSD.org
Wed Aug 20 00:03:56 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=147852
Change 147852 by julian at julian_trafmon1 on 2008/08/20 00:03:33
IFC at 147851
Affected files ...
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pio.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/at91/at91_piovar.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmc.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/arm/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files#11 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files.i386#5 integrate
.. //depot/projects/vimage-commit/src/sys/conf/options#6 integrate
.. //depot/projects/vimage-commit/src/sys/conf/options.i386#3 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_subr.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_cma.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/ddb/db_output.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_asus.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/syscons/daemon/daemon_saver.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/ehcireg.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/ehcivar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/hid.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/if_rum.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/ufoma.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usb.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/conf/XEN#1 branch
.. //depot/projects/vimage-commit/src/sys/i386/i386/bpf_jit_machdep.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/bpf_jit_machdep.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/support.s#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/swtch.s#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/asmacros.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/cpufunc.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/pmap.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/segments.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/trap.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenfunc.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenpmap.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenvar.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/isa/npx.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/pci/pci_pir.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/xen/exception.s#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/xen/pmap.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/ia64/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/init_main.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/mips/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/bpf_jitter.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/bpf_jitter.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/net/bridgestp.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_ef.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_faith.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_gif.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_loop.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_mib.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_stf.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_vlan.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net/raw_cb.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/net/route.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net/rtsock.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/atm/ng_atm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_gif.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_var.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip6.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_offload.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_proto.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_var.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/route6.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/key_debug.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/bootp_subr.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/rpc/rpcclnt.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/include/pcpu.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/sys/param.h#7 integrate
.. //depot/projects/vimage-commit/src/sys/sys/pcpu.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/sys/types.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vm_page.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/xen/evtchn/evtchn_dev.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/xen/features.c#1 branch
.. //depot/projects/vimage-commit/src/sys/xen/gnttab.c#2 integrate
Differences ...
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ====
@@ -30,18 +30,22 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $");
+#ifdef _KERNEL
#include "opt_bpf.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/malloc.h>
+#include <net/if.h>
+#else
+#include <stdlib.h>
+#endif
+
+#include <sys/types.h>
-#include <net/if.h>
#include <net/bpf.h>
#include <net/bpf_jitter.h>
@@ -53,7 +57,7 @@
* emit routine to update the jump table
*/
static void
-emit_length(bpf_bin_stream *stream, u_int value, u_int len)
+emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len)
{
(stream->refs)[stream->bpf_pc] += len;
@@ -108,8 +112,12 @@
return (NULL);
/* Allocate the reference table for the jumps */
+#ifdef _KERNEL
stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int),
M_BPFJIT, M_NOWAIT);
+#else
+ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int));
+#endif
if (stream.refs == NULL)
return (NULL);
@@ -141,7 +149,11 @@
switch (ins->code) {
default:
+#ifdef _KERNEL
return (NULL);
+#else
+ abort();
+#endif
case BPF_RET|BPF_K:
MOVid(ins->k, EAX);
@@ -155,11 +167,13 @@
break;
case BPF_LD|BPF_W|BPF_ABS:
- MOVid(ins->k, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int32_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(6);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JAb(12);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int32_t), ECX);
+ JAEb(6);
ZEROrd(EAX);
MOVrq3(R8, RBX);
RET();
@@ -169,11 +183,13 @@
case BPF_LD|BPF_H|BPF_ABS:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int16_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JAb(12);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int16_t), ECX);
+ JAEb(4);
MOVrq3(R8, RBX);
RET();
MOVobw(RBX, RSI, AX);
@@ -182,12 +198,12 @@
case BPF_LD|BPF_B|BPF_ABS:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JBb(4);
MOVrq3(R8, RBX);
RET();
- MOVobb(RBX, RCX, AL);
+ MOVobb(RBX, RSI, AL);
break;
case BPF_LD|BPF_W|BPF_LEN:
@@ -199,12 +215,18 @@
break;
case BPF_LD|BPF_W|BPF_IND:
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int32_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(6);
+ CMPrd(EDI, EDX);
+ JAb(27);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JBb(14);
+ ADDrd(EDX, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int32_t), ECX);
+ JAEb(6);
ZEROrd(EAX);
MOVrq3(R8, RBX);
RET();
@@ -214,12 +236,18 @@
case BPF_LD|BPF_H|BPF_IND:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int16_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ CMPrd(EDI, EDX);
+ JAb(27);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JBb(14);
+ ADDrd(EDX, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int16_t), ECX);
+ JAEb(4);
MOVrq3(R8, RBX);
RET();
MOVobw(RBX, RSI, AX);
@@ -228,24 +256,28 @@
case BPF_LD|BPF_B|BPF_IND:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ CMPrd(EDI, EDX);
+ JAEb(13);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JAb(4);
MOVrq3(R8, RBX);
RET();
- MOVobb(RBX, RCX, AL);
+ ADDrd(EDX, ESI);
+ MOVobb(RBX, RSI, AL);
break;
case BPF_LDX|BPF_MSH|BPF_B:
- MOVid(ins->k, ECX);
- CMPrd(EDI, ECX);
- JBEb(6);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JBb(6);
ZEROrd(EAX);
MOVrq3(R8, RBX);
RET();
ZEROrd(EDX);
- MOVobb(RBX, RCX, DL);
+ MOVobb(RBX, RSI, DL);
ANDib(0x0f, DL);
SHLib(2, EDX);
break;
@@ -450,11 +482,19 @@
if (pass == 2)
break;
+#ifdef _KERNEL
stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT);
if (stream.ibuf == NULL) {
free(stream.refs, M_BPFJIT);
return (NULL);
}
+#else
+ stream.ibuf = (char *)malloc(stream.cur_ip);
+ if (stream.ibuf == NULL) {
+ free(stream.refs);
+ return (NULL);
+ }
+#endif
/*
* modify the reference table to contain the offsets and
@@ -475,7 +515,11 @@
* the reference table is needed only during compilation,
* now we can free it
*/
+#ifdef _KERNEL
free(stream.refs, M_BPFJIT);
+#else
+ free(stream.refs);
+#endif
return ((bpf_filter_func)stream.ibuf);
}
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ====
@@ -28,7 +28,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/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $
*/
#ifndef _BPF_JIT_MACHDEP_H_
@@ -381,15 +381,27 @@
} \
} while (0)
+/* jb off8 */
+#define JBb(off8) do { \
+ emitm(&stream, 0x72, 1); \
+ emitm(&stream, off8, 1); \
+} while (0)
+
+/* jae off8 */
+#define JAEb(off8) do { \
+ emitm(&stream, 0x73, 1); \
+ emitm(&stream, off8, 1); \
+} while (0)
+
/* jne off8 */
#define JNEb(off8) do { \
emitm(&stream, 0x75, 1); \
emitm(&stream, off8, 1); \
} while (0)
-/* jbe off8 */
-#define JBEb(off8) do { \
- emitm(&stream, 0x76, 1); \
+/* ja off8 */
+#define JAb(off8) do { \
+ emitm(&stream, 0x77, 1); \
emitm(&stream, off8, 1); \
} while (0)
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/exception.S#2 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.132 2008/05/24 06:32:26 jb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $
*/
#include "opt_atpic.h"
@@ -636,13 +636,10 @@
.globl doreti_iret_fault
doreti_iret_fault:
subq $TF_RIP,%rsp /* space including tf_err, tf_trapno */
- testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
- jz 1f /* already running with kernel GS.base */
- swapgs
-1: testl $PSL_I,TF_RFLAGS(%rsp)
- jz 2f
+ testl $PSL_I,TF_RFLAGS(%rsp)
+ jz 1f
sti
-2: movq %rdi,TF_RDI(%rsp)
+1: movq %rdi,TF_RDI(%rsp)
movq %rsi,TF_RSI(%rsp)
movq %rdx,TF_RDX(%rsp)
movq %rcx,TF_RCX(%rsp)
==== //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#9 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.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/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -33,8 +33,6 @@
#error "sys/cdefs.h is a prerequisite for this file"
#endif
-#ifdef _KERNEL
-
/*
* The SMP parts are setup in pmap.c and locore.s for the BSP, and
* mp_machdep.c sets up the data for the AP's to "see" when they awake.
@@ -52,6 +50,8 @@
u_int pc_apic_id; \
u_int pc_acpi_id /* ACPI CPU id */
+#ifdef _KERNEL
+
#ifdef lint
extern struct pcpu *pcpup;
==== //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#2 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,7 +304,7 @@
{
"at91_udp", 0,
AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE,
- AT91RM92_IRQ_UDP
+ AT91RM92_IRQ_UDP, AT91RM92_IRQ_PIOB
},
{
"at91_mci", 0,
==== //depot/projects/vimage-commit/src/sys/arm/at91/at91_pio.c#2 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.6 2008/08/19 22:17:14 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -349,6 +349,49 @@
PIO[PIO_CODR / 4] = data_mask;
}
+uint8_t
+at91_pio_gpio_get(uint32_t pio, uint32_t data_mask)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+
+ data_mask &= PIO[PIO_PDSR / 4];
+
+ return (data_mask ? 1 : 0);
+}
+
+void
+at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+
+ if (use_deglitch)
+ PIO[PIO_IFER / 4] = data_mask;
+ else
+ PIO[PIO_IFDR / 4] = data_mask;
+ return;
+}
+
+void
+at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask,
+ int enable_interrupt)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+
+ if (enable_interrupt)
+ PIO[PIO_IER / 4] = data_mask;
+ else
+ PIO[PIO_IDR / 4] = data_mask;
+ return;
+}
+
+uint32_t
+at91_pio_gpio_clear_interrupt(uint32_t pio)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+ /* reading this register will clear the interrupts */
+ return (PIO[PIO_ISR / 4]);
+}
+
static device_method_t at91_pio_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, at91_pio_probe),
==== //depot/projects/vimage-commit/src/sys/arm/at91/at91_piovar.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.3 2008/08/19 22:17:14 imp Exp $ */
#ifndef ARM_AT91_AT91_PIOVAR_H
#define ARM_AT91_AT91_PIOVAR_H
@@ -35,5 +35,9 @@
int use_pullup);
void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask);
void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask);
+uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask);
+void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch);
+void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt);
+uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio);
#endif /* ARM_AT91_AT91_PIOVAR_H */
==== //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmc.c#3 (text) ====
@@ -25,7 +25,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.6 2008/07/22 14:04:06 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.7 2008/08/19 22:16:10 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@
static struct at91_pmc_clock ohci_clk = {
.name = "ohci_clk",
.parent = &mck,
- .pmc_mask = 1 << AT91RM92_IRQ_UDP,
+ .pmc_mask = 1 << AT91RM92_IRQ_UHP,
.set_mode = &at91_pmc_set_periph_mode
};
==== //depot/projects/vimage-commit/src/sys/arm/include/pcpu.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*
* from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $
+ * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.7 2008/08/19 19:53:52 jhb Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -38,6 +38,8 @@
struct vmspace;
+#endif /* _KERNEL */
+
/*
* Inside the kernel, the globally reserved register g7 is used to
* point at the globaldata structure.
@@ -45,6 +47,8 @@
#define PCPU_MD_FIELDS \
struct pcup *pc_prvspace;
+#ifdef _KERNEL
+
struct pcb;
struct pcpu;
==== //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.52 2008/08/07 17:25:05 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $");
#include <sys/param.h>
@@ -65,7 +65,7 @@
#endif /* !_KERNEL */
/*
- * This is the default number of seconds we wait for devices to settle
+ * This is the default number of milliseconds we wait for devices to settle
* after a SCSI bus reset.
*/
#ifndef SCSI_DELAY
==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.5 2008/06/11 18:55:19 ed Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $
*/
/*
@@ -13616,7 +13616,9 @@
cyclic_remove(state->dts_deadman);
#else
callout_stop(&state->dts_cleaner);
+ callout_drain(&state->dts_cleaner);
callout_stop(&state->dts_deadman);
+ callout_drain(&state->dts_deadman);
#endif
dtrace_dstate_fini(&vstate->dtvs_dynvars);
==== //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#7 (text+ko) ====
@@ -42,7 +42,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/queue.h>
==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $");
#include "opt_compat.h"
==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#9 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.223 2008/07/23 17:19:02 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.224 2008/08/17 23:27:27 bz Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.74 2007/08/06 14:25:59 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.75 2008/08/17 23:27:27 bz Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -50,9 +50,7 @@
#include <sys/uio.h>
#include <sys/syslog.h>
#include <sys/un.h>
-#ifndef KLD_MODULE
#include <sys/vimage.h>
-#endif
#include <netinet/in.h>
==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#7 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.25 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/vimage-commit/src/sys/conf/files#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1725,6 +1725,7 @@
libkern/strcat.c standard
libkern/strcmp.c standard
libkern/strcpy.c standard
+libkern/strcspn.c standard
libkern/strdup.c standard
libkern/strlcat.c standard
libkern/strlcpy.c standard
@@ -2339,3 +2340,18 @@
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_behavior.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+
+xen/gnttab.c optional xen
+xen/features.c optional xen
+xen/evtchn/evtchn.c optional xen
+xen/evtchn/evtchn_dev.c optional xen
+xen/xenbus/xenbus_client.c optional xen
+xen/xenbus/xenbus_comms.c optional xen
+xen/xenbus/xenbus_dev.c optional xen
+xen/xenbus/xenbus_probe.c optional xen
+xen/xenbus/xenbus_probe_backend.c optional xen
+xen/xenbus/xenbus_xs.c optional xen
+dev/xen/console/console.c optional xen
+dev/xen/console/xencons_ring.c optional xen
+dev/xen/blkfront/blkfront.c optional xen
+dev/xen/netfront/netfront.c optional xen
==== //depot/projects/vimage-commit/src/sys/conf/files.i386#5 (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.602 2008/08/09 14:52:31 philip Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.604 2008/08/17 23:44:09 kmacy Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -254,8 +254,8 @@
i386/i386/atomic.c standard \
compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
i386/i386/autoconf.c standard
-i386/i386/bios.c standard
-i386/i386/bioscall.s standard
+i386/i386/bios.c optional native
+i386/i386/bioscall.s optional native
i386/i386/bpf_jit_machdep.c optional bpf_jitter
i386/i386/busdma_machdep.c standard
i386/i386/db_disasm.c optional ddb
@@ -264,7 +264,8 @@
i386/i386/dump_machdep.c standard
i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris
i386/i386/elf_machdep.c standard
-i386/i386/exception.s standard
+i386/i386/exception.s optional native
+i386/xen/exception.s optional xen
i386/i386/gdb_machdep.c optional gdb
i386/i386/geode.c optional cpu_geode
i386/i386/i686_mem.c optional mem
@@ -275,11 +276,13 @@
i386/i386/io.c optional io
i386/i386/io_apic.c optional apic
i386/i386/k6_mem.c optional mem
-i386/i386/legacy.c standard
+i386/i386/legacy.c optional native
i386/i386/local_apic.c optional apic
-i386/i386/locore.s standard no-obj
+i386/i386/locore.s optional native no-obj
+i386/xen/locore.s optional xen no-obj
i386/i386/longrun.c optional cpu_enable_longrun
i386/i386/machdep.c standard
+i386/xen/xen_machdep.c optional xen
i386/i386/mem.c optional mem
i386/i386/minidump_machdep.c standard
i386/i386/mp_clock.c optional smp
@@ -291,7 +294,8 @@
i386/i386/msi.c optional apic pci
i386/i386/nexus.c standard
i386/i386/perfmon.c optional perfmon
-i386/i386/pmap.c standard
+i386/i386/pmap.c optional native
+i386/xen/pmap.c optional xen
i386/i386/ptrace_machdep.c standard
i386/i386/stack_machdep.c optional ddb | stack
i386/i386/support.s standard
@@ -321,9 +325,10 @@
i386/ibcs2/ibcs2_xenix.c optional ibcs2
i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2
i386/ibcs2/imgact_coff.c optional ibcs2
-i386/isa/atpic.c standard
+i386/isa/atpic.c optional atpic
#i386/isa/atpic_vector.s standard
-i386/isa/clock.c standard
+i386/isa/clock.c optional native
+i386/xen/clock.c optional xen
i386/isa/elcr.c standard
i386/isa/elink.c optional ep | ie
i386/isa/isa.c optional isa
@@ -346,13 +351,13 @@
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_pir.c optional pci
+i386/pci/pci_pir.c optional pci
i386/svr4/svr4_locore.s optional compat_svr4 \
dependency "svr4_assym.h" \
warning "COMPAT_SVR4 is broken and should be avoided"
i386/svr4/svr4_machdep.c optional compat_svr4
#
-isa/atrtc.c standard
+isa/atrtc.c optional atpic
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list