Date: Sun, 23 May 2004 10:08:11 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 53301 for review Message-ID: <200405231708.i4NH8BeK021556@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=53301 Change 53301 by rwatson@rwatson_paprika on 2004/05/23 10:08:02 Top-up integrate of netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/exception.s#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/usb/uhid.c#3 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.67 2004/02/21 21:10:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.68 2004/05/23 16:55:28 le Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ /* - * HID spec: http://www.usb.org/developers/data/usbhid10.pdf + * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ #include <sys/param.h> ==== //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#5 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.99 2004/04/16 19:26:36 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.100 2004/05/23 16:50:55 bde Exp $ */ /* @@ -77,7 +77,7 @@ movl %eax, %es ; \ movl $KPSEL, %eax ; /* reload with per-CPU data segment */ \ movl %eax, %fs ; \ - FAKE_MCOUNT(13*4(%esp)) ; \ + FAKE_MCOUNT(TF_EIP(%esp)) ; \ movl lapic, %edx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%edx), %eax ; /* load ISR */ \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ @@ -263,7 +263,7 @@ movl lapic, %edx movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) pushl $0 /* XXX convert trapframe to clockframe */ call forwarded_statclock @@ -292,7 +292,7 @@ movl lapic, %edx movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) MEXITCOUNT jmp doreti ==== //depot/projects/netperf_socket/sys/i386/i386/exception.s#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.108 2004/04/16 19:26:36 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.109 2004/05/23 16:50:55 bde Exp $ */ #include "opt_npx.h" @@ -134,7 +134,7 @@ movl %eax,%es movl $KPSEL,%eax movl %eax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) calltrap: FAKE_MCOUNT(btrap) /* init "from" btrap -> calltrap */ call trap @@ -172,7 +172,7 @@ movl %eax,%es movl $KPSEL,%eax movl %eax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) call syscall MEXITCOUNT jmp doreti @@ -197,7 +197,7 @@ movl %eax,%es movl $KPSEL,%eax movl %eax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) call syscall MEXITCOUNT jmp doreti ==== //depot/projects/netperf_socket/sys/i386/i386/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.147 2004/04/07 20:46:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.148 2004/05/23 16:50:55 bde Exp $"); #include "opt_apic.h" #include "opt_compat.h" @@ -148,6 +148,7 @@ ASSYM(TF_TRAPNO, offsetof(struct trapframe, tf_trapno)); ASSYM(TF_ERR, offsetof(struct trapframe, tf_err)); +ASSYM(TF_EIP, offsetof(struct trapframe, tf_eip)); ASSYM(TF_CS, offsetof(struct trapframe, tf_cs)); ASSYM(TF_EFLAGS, offsetof(struct trapframe, tf_eflags)); ASSYM(SIGF_HANDLER, offsetof(struct sigframe, sf_ahu.sf_handler)); ==== //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.45 2004/05/11 20:14:53 jhb Exp $ + * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.46 2004/05/23 16:50:55 bde Exp $ */ /* @@ -59,7 +59,7 @@ movl $KPSEL, %eax ; /* reload with per-CPU data segment */ \ movl %eax, %fs ; \ ; \ - FAKE_MCOUNT(13*4(%esp)) ; \ + FAKE_MCOUNT(TF_EIP(%esp)) ; \ pushl $irq_num; /* pass the IRQ */ \ call atpic_handle_intr ; \ addl $4, %esp ; /* discard the parameter */ \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405231708.i4NH8BeK021556>