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)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
