From owner-svn-src-head@freebsd.org Sat Mar 16 06:09:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1DF8154431B; Sat, 16 Mar 2019 06:09:46 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 930CC7098F; Sat, 16 Mar 2019 06:09:46 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 865331DE4C; Sat, 16 Mar 2019 06:09:46 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2G69k9N061098; Sat, 16 Mar 2019 06:09:46 GMT (envelope-from jmallett@FreeBSD.org) Received: (from jmallett@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2G69kO3061096; Sat, 16 Mar 2019 06:09:46 GMT (envelope-from jmallett@FreeBSD.org) Message-Id: <201903160609.x2G69kO3061096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmallett set sender to jmallett@FreeBSD.org using -f From: Juli Mallett Date: Sat, 16 Mar 2019 06:09:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345221 - in head/sys/mips: include mips X-SVN-Group: head X-SVN-Commit-Author: jmallett X-SVN-Commit-Paths: in head/sys/mips: include mips X-SVN-Commit-Revision: 345221 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 930CC7098F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.93)[-0.928,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 06:09:47 -0000 Author: jmallett Date: Sat Mar 16 06:09:45 2019 New Revision: 345221 URL: https://svnweb.freebsd.org/changeset/base/345221 Log: Remove obsolete wrappers for 64-bit loads/stores which were only used by the removed (r342255) SiByte port. Reviewed by: imp Modified: head/sys/mips/include/cpufunc.h head/sys/mips/mips/support.S Modified: head/sys/mips/include/cpufunc.h ============================================================================== --- head/sys/mips/include/cpufunc.h Sat Mar 16 04:24:02 2019 (r345220) +++ head/sys/mips/include/cpufunc.h Sat Mar 16 06:09:45 2019 (r345221) @@ -371,27 +371,19 @@ get_intr_mask(void) return (mips_rd_status() & MIPS_SR_INT_MASK); } -#if defined(__GNUC__) && !defined(__mips_o32) -#define mips3_ld(a) (*(const volatile uint64_t *)(a)) -#define mips3_sd(a, v) (*(volatile uint64_t *)(a) = (v)) -#else -uint64_t mips3_ld(volatile uint64_t *va); -void mips3_sd(volatile uint64_t *, uint64_t); -#endif /* __GNUC__ */ - #endif /* _KERNEL */ #define readb(va) (*(volatile uint8_t *) (va)) #define readw(va) (*(volatile uint16_t *) (va)) #define readl(va) (*(volatile uint32_t *) (va)) -#if defined(__GNUC__) && !defined(__mips_o32) +#if !defined(__mips_o32) #define readq(a) (*(volatile uint64_t *)(a)) #endif #define writeb(va, d) (*(volatile uint8_t *) (va) = (d)) #define writew(va, d) (*(volatile uint16_t *) (va) = (d)) #define writel(va, d) (*(volatile uint32_t *) (va) = (d)) -#if defined(__GNUC__) && !defined(__mips_o32) +#if !defined(__mips_o32) #define writeq(va, d) (*(volatile uint64_t *) (va) = (d)) #endif Modified: head/sys/mips/mips/support.S ============================================================================== --- head/sys/mips/mips/support.S Sat Mar 16 04:24:02 2019 (r345220) +++ head/sys/mips/mips/support.S Sat Mar 16 06:09:45 2019 (r345221) @@ -865,78 +865,3 @@ LEAF(longjmp) jr ra li v0, 1 # longjmp return END(longjmp) - -LEAF(mips3_ld) - .set push - .set noreorder - .set mips64 -#if defined(__mips_o32) - mfc0 t0, MIPS_COP_0_STATUS # turn off interrupts - and t1, t0, ~(MIPS_SR_INT_IE) - mtc0 t1, MIPS_COP_0_STATUS - COP0_SYNC - nop - nop - nop - - ld v0, 0(a0) -#if _BYTE_ORDER == _BIG_ENDIAN - dsll v1, v0, 32 - dsra v1, v1, 32 # low word in v1 - dsra v0, v0, 32 # high word in v0 -#else - dsra v1, v0, 32 # high word in v1 - dsll v0, v0, 32 - dsra v0, v0, 32 # low word in v0 -#endif - - mtc0 t0, MIPS_COP_0_STATUS # restore intr status. - COP0_SYNC - nop -#else /* !__mips_o32 */ - ld v0, 0(a0) -#endif /* !__mips_o32 */ - - jr ra - nop - .set pop -END(mips3_ld) - -LEAF(mips3_sd) - .set push - .set mips64 - .set noreorder -#if defined(__mips_o32) - mfc0 t0, MIPS_COP_0_STATUS # turn off interrupts - and t1, t0, ~(MIPS_SR_INT_IE) - mtc0 t1, MIPS_COP_0_STATUS - COP0_SYNC - nop - nop - nop - - # NOTE: a1 is padding! - -#if _BYTE_ORDER == _BIG_ENDIAN - dsll a2, a2, 32 # high word in a2 - dsll a3, a3, 32 # low word in a3 - dsrl a3, a3, 32 -#else - dsll a2, a2, 32 # low word in a2 - dsrl a2, a2, 32 - dsll a3, a3, 32 # high word in a3 -#endif - or a1, a2, a3 - sd a1, 0(a0) - - mtc0 t0, MIPS_COP_0_STATUS # restore intr status. - COP0_SYNC - nop -#else /* !__mips_o32 */ - sd a1, 0(a0) -#endif /* !__mips_o32 */ - - jr ra - nop - .set pop -END(mips3_sd)