From owner-svn-src-projects@FreeBSD.ORG Thu Nov 19 03:37:07 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65D521065670; Thu, 19 Nov 2009 03:37:07 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CACD8FC26; Thu, 19 Nov 2009 03:37:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJ3b7WC092551; Thu, 19 Nov 2009 03:37:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAJ3b7js092549; Thu, 19 Nov 2009 03:37:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200911190337.nAJ3b7js092549@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 19 Nov 2009 03:37:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199504 - projects/ppc64/sys/compat/freebsd32 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 03:37:07 -0000 Author: nwhitehorn Date: Thu Nov 19 03:37:06 2009 New Revision: 199504 URL: http://svn.freebsd.org/changeset/base/199504 Log: Remove a few #ifdefs by defining RETVAL_HI/LO to describe the correct retval entry for the high/low 32-bits of a 64-bit return. Suggested by: kib Modified: projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c Modified: projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c Thu Nov 19 01:29:10 2009 (r199503) +++ projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c Thu Nov 19 03:37:06 2009 (r199504) @@ -121,8 +121,12 @@ static int freebsd32_kevent_copyin(void #if BYTE_ORDER == BIG_ENDIAN #define PAIR32TO64(type, name) ((name ## 2) | ((type)(name ## 1) << 32)) +#define RETVAL_HI 0 +#define RETVAL_LO 1 #else #define PAIR32TO64(type, name) ((name ## 1) | ((type)(name ## 2) << 32)) +#define RETVAL_HI 1 +#define RETVAL_LO 0 #endif int @@ -2018,13 +2022,8 @@ freebsd32_lseek(struct thread *td, struc error = lseek(td, &ap); /* Expand the quad return into two parts for eax and edx */ pos = *(off_t *)(td->td_retval); - #if BYTE_ORDER == BIG_ENDIAN - td->td_retval[0] = pos >> 32; - td->td_retval[1] = pos & 0xffffffff; - #else - td->td_retval[0] = pos & 0xffffffff; /* %eax */ - td->td_retval[1] = pos >> 32; /* %edx */ - #endif + td->td_retval[RETVAL_LO] = pos & 0xffffffff; /* %eax */ + td->td_retval[RETVAL_HI] = pos >> 32; /* %edx */ return error; } @@ -2105,13 +2104,8 @@ freebsd6_freebsd32_lseek(struct thread * error = lseek(td, &ap); /* Expand the quad return into two parts for eax and edx */ pos = *(off_t *)(td->td_retval); - #if BYTE_ORDER == BIG_ENDIAN - td->td_retval[0] = pos >> 32; - td->td_retval[1] = pos & 0xffffffff; - #else - td->td_retval[0] = pos & 0xffffffff; /* %eax */ - td->td_retval[1] = pos >> 32; /* %edx */ - #endif + td->td_retval[RETVAL_LO] = pos & 0xffffffff; /* %eax */ + td->td_retval[RETVAL_HI] = pos >> 32; /* %edx */ return error; }