From owner-p4-projects@FreeBSD.ORG Tue Aug 29 13:38:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F6CD16A4E6; Tue, 29 Aug 2006 13:38:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 E333F16A4E5 for ; Tue, 29 Aug 2006 13:38:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 885FC43D58 for ; Tue, 29 Aug 2006 13:38:08 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7TDc87U003003 for ; Tue, 29 Aug 2006 13:38:08 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7TDc8pZ003000 for perforce@freebsd.org; Tue, 29 Aug 2006 13:38:08 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 29 Aug 2006 13:38:08 GMT Message-Id: <200608291338.k7TDc8pZ003000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 105263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Aug 2006 13:38:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=105263 Change 105263 by gonzo@gonzo_hq on 2006/08/29 13:37:25 o Clean out Makefile.inc o Check endianess using build-in __MIPSEB__ macros instead of BYTE_ORDER. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/net/Makefile.inc#2 edit .. //depot/projects/mips2/src/lib/libc/mips/net/htonl.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/net/htons.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/net/ntohl.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/net/ntohs.S#2 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/net/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,4 @@ # $NetBSD: Makefile.inc,v 1.3 2003/08/01 17:03:51 lukem Exp $ +# $FreeBSD$ -# objects built from assembler sources (need lint stubs) -# hton* and nto* functions provided by ../gen/byte_swap_*.S -SRCS+= - -SRCS.mips.net= Lint_htonl.c Lint_htons.c Lint_ntohl.c Lint_ntohs.c -LSRCS+= ${SRCS.mips.net} -DPSRCS+= ${SRCS.mips.net} -CLEANFILES+= ${SRCS.mips.net} +SRCS+= htonl.S ntohl.S htons.S ntohs.S ==== //depot/projects/mips2/src/lib/libc/mips/net/htonl.S#2 (text+ko) ==== @@ -37,12 +37,13 @@ */ #include -#include __FBSDID("$FreeBSD: src/lib/libc/arm/net/htonl.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); LEAF(htonl) # a0 = 0x11223344, return 0x44332211 -#if BYTE_ORDER == LITTLE_ENDIAN +#ifdef __MIPSEB__ + move v0, a0 +#else srl v1, a0, 24 # v1 = 0x00000011 sll v0, a0, 24 # v0 = 0x44000000 or v0, v0, v1 @@ -52,8 +53,6 @@ srl v1, a0, 8 and v1, v1, 0xff00 # v1 = 0x00002200 or v0, v0, v1 -#else - move v0, a0 #endif j ra END(htonl) ==== //depot/projects/mips2/src/lib/libc/mips/net/htons.S#2 (text+ko) ==== @@ -37,19 +37,18 @@ */ #include -#include __FBSDID("$FreeBSD: src/lib/libc/arm/net/htons.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); LEAF(htons) -#if BYTE_ORDER == LITTLE_ENDIAN +#ifdef __MIPSEB__ + move v0, a0 +#else srl v0, a0, 8 and v0, v0, 0xff sll v1, a0, 8 and v1, v1, 0xff00 or v0, v0, v1 -#else - move v0, a0 #endif j ra END(htons) ==== //depot/projects/mips2/src/lib/libc/mips/net/ntohl.S#2 (text+ko) ==== @@ -37,12 +37,13 @@ */ #include -#include __FBSDID("$FreeBSD: src/lib/libc/arm/net/ntohl.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); LEAF(ntohl) # a0 = 0x11223344, return 0x44332211 -#if BYTE_ORDER == LITTLE_ENDIAN +#ifdef __MIPSEB__ + move v0, a0 +#else srl v1, a0, 24 # v1 = 0x00000011 sll v0, a0, 24 # v0 = 0x44000000 or v0, v0, v1 @@ -52,8 +53,6 @@ srl v1, a0, 8 and v1, v1, 0xff00 # v1 = 0x00002200 or v0, v0, v1 -#else - move v0, a0 #endif j ra END(ntohl) ==== //depot/projects/mips2/src/lib/libc/mips/net/ntohs.S#2 (text+ko) ==== @@ -37,19 +37,18 @@ */ #include -#include __FBSDID("$FreeBSD: src/lib/libc/arm/net/ntohs.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); LEAF(ntohs) -#if BYTE_ORDER == LITTLE_ENDIAN +#ifdef __MIPSEB__ + move v0, a0 +#else srl v0, a0, 8 and v0, v0, 0xff sll v1, a0, 8 and v1, v1, 0xff00 or v0, v0, v1 -#else - move v0, a0 #endif j ra END(ntohs)