Date: Wed, 20 Nov 2002 16:39:32 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21321 for review Message-ID: <200211210039.gAL0dW4r016841@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21321 Change 21321 by peter@peter_daintree on 2002/11/20 16:38:48 integ i386_hammer branch Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_machdep.h#2 integrate .. //depot/projects/hammer/sys/x86_64/include/signal.h#6 integrate .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#5 integrate .. //depot/projects/hammer/sys/x86_64/isa/npx.c#15 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#28 integrate Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/i386/reloc.c,v 1.10 2002/06/10 21:15:50 dillon Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.11 2002/11/18 22:08:49 tmm Exp $ */ /* @@ -259,7 +259,7 @@ if (def == NULL) return -1; target = (Elf_Addr)(defobj->relocbase + def->st_value); - reloc_jmpslot(where, target, defobj); + reloc_jmpslot(where, target, defobj, obj, rel); } obj->jmpslots_done = true; return 0; ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_machdep.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/libexec/rtld-elf/i386/rtld_machdep.h,v 1.7 2002/06/24 23:19:18 jdp Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $ */ #ifndef RTLD_MACHDEP_H @@ -38,7 +38,8 @@ /* Fixup the jump slot at "where" to transfer control to "target". */ static inline Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, - const struct Struct_Obj_Entry *obj) + const struct Struct_Obj_Entry *obj, + const struct Struct_Obj_Entry *refobj, const Elf_Rel *rel) { dbg("reloc_jmpslot: *%p = %p", (void *)(where), (void *)(target)); ==== //depot/projects/hammer/sys/x86_64/include/signal.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/signal.h,v 1.18 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/signal.h,v 1.19 2002/11/16 06:35:52 deischen Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -92,7 +92,7 @@ int sc_efl; int sc_esp; int sc_ss; - int sc_len; /* sizeof(struct mcontext_t) */ + int sc_len; /* sizeof(mcontext_t) */ /* * XXX - See <machine/ucontext.h> and <machine/npx.h> for * the following fields. @@ -100,7 +100,7 @@ int sc_fpformat; int sc_ownedfp; int sc_spare1[1]; - int sc_fpregs[128]; + int sc_fpstate[128]; int sc_spare2[8]; }; ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#5 (text+ko) ==== @@ -25,7 +25,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/i386/include/ucontext.h,v 1.8 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/ucontext.h,v 1.9 2002/11/16 06:35:52 deischen Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -38,7 +38,7 @@ * and ucontext_t at the same time. */ int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; + int mc_gs; /* machine state (trapframe) */ int mc_fs; int mc_es; int mc_ds; @@ -54,7 +54,7 @@ int mc_eip; int mc_cs; int mc_eflags; - int mc_esp; /* machine state */ + int mc_esp; int mc_ss; int mc_len; /* sizeof(mcontext_t) */ @@ -71,8 +71,7 @@ int mc_spare2[8]; } mcontext_t; -#ifdef _KERNEL -#ifdef COMPAT_FREEBSD4 +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) /* For 4.x binaries */ struct mcontext4 { int mc_onstack; /* XXX - sigcontext compat. */ @@ -100,10 +99,4 @@ }; #endif -struct thread; - -void get_mcontext(struct thread *td, mcontext_t *mcp); -int set_mcontext(struct thread *td, const mcontext_t *mcp); -#endif - #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/npx.c,v 1.135 2002/11/05 04:03:42 davidxu Exp $ + * $FreeBSD: src/sys/i386/isa/npx.c,v 1.136 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_debug_npx.h" ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#28 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.549 2002/11/09 21:17:41 iwasaki Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.550 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_atalk.h" @@ -1720,7 +1720,7 @@ /* * Get machine context. */ -void +int get_mcontext(struct thread *td, mcontext_t *mcp) { struct trapframe *tp; @@ -1746,6 +1746,7 @@ mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); get_fpcontext(td, mcp); + return (0); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211210039.gAL0dW4r016841>