From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:18:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A373437B404; Tue, 29 Apr 2003 12:18:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59A5237B401 for ; Tue, 29 Apr 2003 12:18:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3E5E43FB1 for ; Tue, 29 Apr 2003 12:18:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3TJIl0U082746 for ; Tue, 29 Apr 2003 12:18:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJIlBr082740 for perforce@freebsd.org; Tue, 29 Apr 2003 12:18:47 -0700 (PDT) Date: Tue, 29 Apr 2003 12:18:47 -0700 (PDT) Message-Id: <200304291918.h3TJIlBr082740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2003 19:18:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=30043 Change 30043 by peter@peter_daintree on 2003/04/29 12:18:44 reintegrate with x86_64/... dir to sync up Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/_ctx_start.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/rfork_thread.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/signalcontext.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/abs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/div.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/labs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/ldiv.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/bcmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/bcopy.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/bzero.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/ffs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/index.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memcmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memcpy.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memmove.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memset.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/rindex.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strcat.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strcmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strcpy.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strlen.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strncmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strrchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/swab.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wcschr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wcscmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wcslen.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wmemchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/Ovfork.S#3 delete .. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#3 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#1 branch Differences ... ==== //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ -MDASM= Ovfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ - setlogin.S sigreturn.S #syscall.S +MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ + setlogin.S sigreturn.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/hammer/lib/libc/amd64/sys/exect.S#2 (text+ko) ==== @@ -46,9 +46,9 @@ ENTRY(exect) movq $SYS_execve,%rax pushfq - popq %rdx - orq $ PSL_T,%rdx - pushq %rdx + popq %r8 + orq $PSL_T,%r8 + pushq %r8 popfq KERNCALL jmp PIC_PLT(HIDENAME(cerror)) /* exect(file, argv, env); */ ==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#3 (text+ko) ==== @@ -42,20 +42,8 @@ #include "SYS.h" - .weak _pipe - .set _pipe,__sys_pipe - .weak pipe - .set pipe,__sys_pipe -ENTRY(__sys_pipe) - pushq %rdi - mov $SYS_pipe,%rax - KERNCALL - jb 1f - popq %rcx - movl %eax,(%rcx) - movl %edx,4(%rcx) +SYSCALL(pipe) + movl %eax,(%rdi) /* %rdi is preserved by syscall */ + movl %edx,4(%rdi) movq $0,%rax ret -1: - popq %rdi - jmp PIC_PLT(HIDENAME(cerror))