Commit 234630bb8d

@@ -1,121 +0,0 @@
-/*	$NetBSD: byte_swap.h,v 1.16 2017/01/17 11:08:50 rin Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum, Neil A. Carson, and Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _ARM_BYTE_SWAP_H_
-#define	_ARM_BYTE_SWAP_H_
-
-#ifdef _LOCORE
-
-#if defined(_ARM_ARCH_6) || defined(_ARM_ARCH_7)
-
-#define	BSWAP16(_src, _dst, _tmp)		\
-	rev16	_dst, _src
-#define	BSWAP32(_src, _dst, _tmp)		\
-	rev	_dst, _src
-
-#else
-
-#define	BSWAP16(_src, _dst, _tmp)		\
-	mov	_tmp, _src, ror #8		;\
-	orr	_tmp, _tmp, _tmp, lsr #16	;\
-	bic	_dst, _tmp, _tmp, lsl #16
-
-#define	BSWAP32(_src, _dst, _tmp)		\
-	eor	_tmp, _src, _src, ror #16	;\
-	bic	_tmp, _tmp, #0x00FF0000		;\
-	mov	_dst, _src, ror #8		;\
-	eor	_dst, _dst, _tmp, lsr #8
-
-#endif
-
-
-#else
-
-#ifdef __GNUC__
-#include <sys/types.h>
-__BEGIN_DECLS
-
-#define	__BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
-static __inline uint32_t
-__byte_swap_u32_variable(uint32_t v)
-{
-	uint32_t t1;
-
-#ifdef _ARM_ARCH_6
-	if (!__builtin_constant_p(v)) {
-		__asm("rev\t%0, %1" : "=r" (v) : "0" (v));
-		return v;
-	}
-#endif
-
-	t1 = v ^ ((v << 16) | (v >> 16));
-	t1 &= 0xff00ffffU;
-	v = (v >> 8) | (v << 24);
-	v ^= (t1 >> 8);
-
-	return v;
-}
-
-#define	__BYTE_SWAP_U16_VARIABLE __byte_swap_u16_variable
-static __inline uint16_t
-__byte_swap_u16_variable(uint16_t v)
-{
-
-#ifdef _ARM_ARCH_6
-	if (!__builtin_constant_p(v)) {
-		uint32_t v32 = v;
-		__asm("rev16\t%0, %1" : "=r" (v32) : "0" (v32));
-		return (uint16_t)v32;
-	}
-#elif !defined(__thumb__) && 0	/* gcc produces decent code for this */
-	if (!__builtin_constant_p(v)) {
-		uint32_t v0 = v;
-		__asm volatile(
-			"mov	%0, %1, ror #8\n"
-			"orr	%0, %0, %0, lsr #16\n"
-			"bic	%0, %0, %0, lsl #16"
-		: "=&r" (v0)
-		: "0" (v0));
-		return (uint16_t)v0;
-	}
-#endif
-	v &= 0xffff;
-	v = (uint16_t)((v >> 8) | (v << 8));
-
-	return v;
-}
-
-__END_DECLS
-#endif
-
-#endif	/* _LOCORE */
-
-#endif /* _ARM_BYTE_SWAP_H_ */
\ No newline at end of file

@@ -1,85 +0,0 @@
-/*	$NetBSD: sysarch.h,v 1.15 2021/10/06 05:33:15 skrll Exp $	*/
-
-/*
- * Copyright (c) 1996-1997 Mark Brinicombe.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Mark Brinicombe.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _ARM_SYSARCH_H_
-#define _ARM_SYSARCH_H_
-
-#include <sys/cdefs.h>
-
-/*
- * Pickup definition of size_t and uintptr_t
- */
-#include <machine/ansi.h>
-#include <sys/stdint.h>
-#ifndef _KERNEL
-#include <stdbool.h>
-#endif
-
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_ size_t;
-#undef	_BSD_SIZE_T_
-#endif
-
-/*
- * Architecture specific syscalls (arm)
- */
-
-#define ARM_SYNC_ICACHE		0
-#define ARM_DRAIN_WRITEBUF	1
-#define ARM_VFP_FPSCR		2
-#define ARM_FPU_USED		3
-
-struct arm_sync_icache_args {
-	uintptr_t	addr;		/* Virtual start address */
-	size_t		len;		/* Region size */
-};
-
-struct arm_vfp_fpscr_args {
-	uint32_t	fpscr_clear;	/* bits to clear */
-	uint32_t	fpscr_set;	/* bits to set */
-};
-
-struct arm_unaligned_faults_args {
-	bool		enabled;	/* unaligned faults are enabled */
-};
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-int	arm_sync_icache(uintptr_t, size_t);
-int	arm_drain_writebuf(void);
-int	sysarch(int, void *);
-__END_DECLS
-#endif
-
-#endif /* !_ARM_SYSARCH_H_ */
\ No newline at end of file

@@ -1,3 +1,8 @@
-/*	$NetBSD: bswap.h,v 1.1 2002/12/09 12:15:58 scw Exp $	*/
+/*      $NetBSD: bswap.h,v 1.2 1999/08/21 05:39:55 simonb Exp $      */
 
-#include <powerpc/bswap.h>
\ No newline at end of file
+#ifndef _MACHINE_BSWAP_H_
+#define	_MACHINE_BSWAP_H_
+
+#include <sys/bswap.h>
+
+#endif /* !_MACHINE_BSWAP_H_ */
\ No newline at end of file

@@ -1,11 +1,11 @@
-/* $NetBSD: byte_swap.h,v 1.5 2020/04/04 21:13:20 christos Exp $ */
+/*	$NetBSD: byte_swap.h,v 1.16 2017/01/17 11:08:50 rin Exp $	*/
 
 /*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
+ * by Charles M. Hannum, Neil A. Carson, and Jason R. Thorpe.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,57 +29,57 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _RISCV_BYTE_SWAP_H_
-#define	_RISCV_BYTE_SWAP_H_
+#ifndef _ARM_BYTE_SWAP_H_
+#define	_ARM_BYTE_SWAP_H_
 
 #ifdef _LOCORE
 
-#define	BSWAP16(_src, _dst, _tmp)	\
-	andi	_dst, _src, 0xff	;\
-	slli	_dst, _dst, 8		;\
-	srli	_tmp, _src, 8		;\
-	and	_tmp, _tmp, 0xff	;\
-	ori	_dst, _dst, _tmp
-
-#define BSWAP32(_src, _dst, _tmp)	\
-	li	v1, 0xff00		;\
-	slli	_dst, _src, 24		;\
-	srli	_tmp, _src, 24		;\
-	ori	_dst, _dst, _tmp	;\
-	and	_tmp, _src, v1		;\
-	slli	_tmp, _src, 8		;\
-	ori	_dst, _dst, _tmp	;\
-	srli	_tmp, _src, 8		;\
-	and	_tmp, _tmp, v1		;\
-	ori	_dst, _dst, _tmp
+#if defined(_ARM_ARCH_6) || defined(_ARM_ARCH_7)
+
+#define	BSWAP16(_src, _dst, _tmp)		\
+	rev16	_dst, _src
+#define	BSWAP32(_src, _dst, _tmp)		\
+	rev	_dst, _src
 
 #else
 
-#include <sys/types.h>
-__BEGIN_DECLS
+#define	BSWAP16(_src, _dst, _tmp)		\
+	mov	_tmp, _src, ror #8		;\
+	orr	_tmp, _tmp, _tmp, lsr #16	;\
+	bic	_dst, _tmp, _tmp, lsl #16
 
-#define	__BYTE_SWAP_U64_VARIABLE __byte_swap_u64_variable
-static __inline uint64_t
-__byte_swap_u64_variable(uint64_t v)
-{
-	const uint64_t m1 = 0x0000ffff0000ffffull;
-	const uint64_t m0 = 0x00ff00ff00ff00ffull;
+#define	BSWAP32(_src, _dst, _tmp)		\
+	eor	_tmp, _src, _src, ror #16	;\
+	bic	_tmp, _tmp, #0x00FF0000		;\
+	mov	_dst, _src, ror #8		;\
+	eor	_dst, _dst, _tmp, lsr #8
 
-	v = (v >> 32) | (v << 32);
-	v = ((v >> 16) & m1) | ((v & m1) << 16);
-	v = ((v >> 8) & m0) | ((v & m0) << 8);
+#endif
 
-	return v;
-}
+
+#else
+
+#ifdef __GNUC__
+#include <sys/types.h>
+__BEGIN_DECLS
 
 #define	__BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
 static __inline uint32_t
 __byte_swap_u32_variable(uint32_t v)
 {
-	const uint32_t m = 0xff00ff;
+	uint32_t t1;
+
+#ifdef _ARM_ARCH_6
+	if (!__builtin_constant_p(v)) {
+		__asm("rev\t%0, %1" : "=r" (v) : "0" (v));
+		return v;
+	}
+#endif
 
-	v = (v >> 16) | (v << 16);
-	v = ((v >> 8) & m) | ((v & m) << 8);
+	t1 = v ^ ((v << 16) | (v >> 16));
+	t1 &= 0xff00ffffU;
+	v = (v >> 8) | (v << 24);
+	v ^= (t1 >> 8);
 
 	return v;
 }
@@ -88,12 +88,34 @@ __byte_swap_u32_variable(uint32_t v)
 static __inline uint16_t
 __byte_swap_u16_variable(uint16_t v)
 {
-	/*LINTED*/
-	return (uint16_t)((v >> 8) | (v << 8));
+
+#ifdef _ARM_ARCH_6
+	if (!__builtin_constant_p(v)) {
+		uint32_t v32 = v;
+		__asm("rev16\t%0, %1" : "=r" (v32) : "0" (v32));
+		return (uint16_t)v32;
+	}
+#elif !defined(__thumb__) && 0	/* gcc produces decent code for this */
+	if (!__builtin_constant_p(v)) {
+		uint32_t v0 = v;
+		__asm volatile(
+			"mov	%0, %1, ror #8\n"
+			"orr	%0, %0, %0, lsr #16\n"
+			"bic	%0, %0, %0, lsl #16"
+		: "=&r" (v0)
+		: "0" (v0));
+		return (uint16_t)v0;
+	}
+#endif
+	v &= 0xffff;
+	v = (uint16_t)((v >> 8) | (v << 8));
+
+	return v;
 }
 
 __END_DECLS
+#endif
 
 #endif	/* _LOCORE */
 
-#endif /* _RISCV_BYTE_SWAP_H_ */
\ No newline at end of file
+#endif /* _ARM_BYTE_SWAP_H_ */
\ No newline at end of file

@@ -1,3 +1,3 @@
-/*	$NetBSD: endian_machdep.h,v 1.1 2002/12/09 12:16:02 scw Exp $	*/
+/*	$NetBSD: endian_machdep.h,v 1.1 2000/03/17 00:09:25 mycroft Exp $ */
 
-#include <powerpc/endian_machdep.h>
\ No newline at end of file
+#define _BYTE_ORDER _BIG_ENDIAN
\ No newline at end of file

@@ -1,3 +1,1 @@
-/*	$NetBSD: rwlock.h,v 1.2 2007/02/09 21:55:03 ad Exp $	*/
-
-#include <powerpc/rwlock.h>
\ No newline at end of file
+/*	$NetBSD: rwlock.h,v 1.6 2019/11/29 20:04:53 riastradh Exp $	*/
\ No newline at end of file

@@ -1,3 +1,85 @@
-/* $NetBSD: sysarch.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+/*	$NetBSD: sysarch.h,v 1.15 2021/10/06 05:33:15 skrll Exp $	*/
 
-/* nothing */
\ No newline at end of file
+/*
+ * Copyright (c) 1996-1997 Mark Brinicombe.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Mark Brinicombe.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _ARM_SYSARCH_H_
+#define _ARM_SYSARCH_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * Pickup definition of size_t and uintptr_t
+ */
+#include <machine/ansi.h>
+#include <sys/stdint.h>
+#ifndef _KERNEL
+#include <stdbool.h>
+#endif
+
+#ifdef	_BSD_SIZE_T_
+typedef	_BSD_SIZE_T_ size_t;
+#undef	_BSD_SIZE_T_
+#endif
+
+/*
+ * Architecture specific syscalls (arm)
+ */
+
+#define ARM_SYNC_ICACHE		0
+#define ARM_DRAIN_WRITEBUF	1
+#define ARM_VFP_FPSCR		2
+#define ARM_FPU_USED		3
+
+struct arm_sync_icache_args {
+	uintptr_t	addr;		/* Virtual start address */
+	size_t		len;		/* Region size */
+};
+
+struct arm_vfp_fpscr_args {
+	uint32_t	fpscr_clear;	/* bits to clear */
+	uint32_t	fpscr_set;	/* bits to set */
+};
+
+struct arm_unaligned_faults_args {
+	bool		enabled;	/* unaligned faults are enabled */
+};
+
+#ifndef _KERNEL
+__BEGIN_DECLS
+int	arm_sync_icache(uintptr_t, size_t);
+int	arm_drain_writebuf(void);
+int	sysarch(int, void *);
+__END_DECLS
+#endif
+
+#endif /* !_ARM_SYSARCH_H_ */
\ No newline at end of file

@@ -1,337 +0,0 @@
-/* $NetBSD: sysreg.h,v 1.28 2022/12/03 11:09:59 skrll Exp $ */
-
-/*
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_SYSREG_H_
-#define	_RISCV_SYSREG_H_
-
-#ifndef _KERNEL
-#include <sys/param.h>
-#endif
-
-#include <riscv/reg.h>
-
-#define	FCSR_FMASK	0	// no exception bits
-#define	FCSR_FRM	__BITS(7, 5)
-#define	 FCSR_FRM_RNE	0b000	// Round Nearest, ties to Even
-#define	 FCSR_FRM_RTZ	0b001	// Round Towards Zero
-#define	 FCSR_FRM_RDN	0b010	// Round DowN (-infinity)
-#define	 FCSR_FRM_RUP	0b011	// Round UP (+infinity)
-#define	 FCSR_FRM_RMM	0b100	// Round to nearest, ties to Max Magnitude
-#define	 FCSR_FRM_DYN	0b111	// Dynamic rounding
-#define	FCSR_FFLAGS	__BITS(4, 0)	// Sticky bits
-#define	FCSR_NV		__BIT(4)	// iNValid operation
-#define	FCSR_DZ		__BIT(3)	// Divide by Zero
-#define	FCSR_OF		__BIT(2)	// OverFlow
-#define	FCSR_UF		__BIT(1)	// UnderFlow
-#define	FCSR_NX		__BIT(0)	// iNeXact
-
-static inline uint32_t
-riscvreg_fcsr_read(void)
-{
-	uint32_t __fcsr;
-	__asm("frcsr %0" : "=r"(__fcsr));
-	return __fcsr;
-}
-
-
-static inline uint32_t
-riscvreg_fcsr_write(uint32_t __new)
-{
-	uint32_t __old;
-	__asm("fscsr %0, %1" : "=r"(__old) : "r"(__new));
-	return __old;
-}
-
-static inline uint32_t
-riscvreg_fcsr_read_fflags(void)
-{
-	uint32_t __old;
-	__asm("frflags %0" : "=r"(__old));
-	return __SHIFTOUT(__old, FCSR_FFLAGS);
-}
-
-static inline uint32_t
-riscvreg_fcsr_write_fflags(uint32_t __new)
-{
-	uint32_t __old;
-	__new = __SHIFTIN(__new, FCSR_FFLAGS);
-	__asm("fsflags %0, %1" : "=r"(__old) : "r"(__new));
-	return __SHIFTOUT(__old, FCSR_FFLAGS);
-}
-
-static inline uint32_t
-riscvreg_fcsr_read_frm(void)
-{
-	uint32_t __old;
-	__asm("frrm\t%0" : "=r"(__old));
-	return __SHIFTOUT(__old, FCSR_FRM);
-}
-
-static inline uint32_t
-riscvreg_fcsr_write_frm(uint32_t __new)
-{
-	uint32_t __old;
-	__new = __SHIFTIN(__new, FCSR_FRM);
-	__asm __volatile("fsrm\t%0, %1" : "=r"(__old) : "r"(__new));
-	return __SHIFTOUT(__old, FCSR_FRM);
-}
-
-
-#define	RISCVREG_READ_INLINE(regname)					\
-static inline uintptr_t							\
-csr_##regname##_read(void)						\
-{									\
-	uintptr_t __rv;							\
-	asm volatile("csrr %0, " #regname : "=r"(__rv) :: "memory");	\
-	return __rv;							\
-}
-
-#define	RISCVREG_WRITE_INLINE(regname)					\
-static inline void							\
-csr_##regname##_write(uintptr_t __val)					\
-{									\
-	asm volatile("csrw " #regname ", %0" :: "r"(__val) : "memory");	\
-}
-
-#define	RISCVREG_SET_INLINE(regname)					\
-static inline void							\
-csr_##regname##_set(uintptr_t __mask)					\
-{									\
-	if (__builtin_constant_p(__mask) && __mask < 0x20) {		\
-		asm volatile("csrsi " #regname ", %0" :: "i"(__mask) :	\
-		    "memory");						\
-	} else {							\
-		asm volatile("csrs " #regname ", %0" :: "r"(__mask) :	\
-		    "memory");						\
-	}								\
-}
-
-#define	RISCVREG_CLEAR_INLINE(regname)					\
-static inline void							\
-csr_##regname##_clear(uintptr_t __mask)					\
-{									\
-	if (__builtin_constant_p(__mask) && __mask < 0x20) {		\
-		asm volatile("csrci " #regname ", %0" :: "i"(__mask) :	\
-		    "memory");						\
-	} else {							\
-		asm volatile("csrc " #regname ", %0" :: "r"(__mask) :	\
-		    "memory");						\
-	}								\
-}
-
-#define	RISCVREG_READ_WRITE_INLINE(regname)				\
-RISCVREG_READ_INLINE(regname)						\
-RISCVREG_WRITE_INLINE(regname)
-#define	RISCVREG_SET_CLEAR_INLINE(regname)				\
-RISCVREG_SET_INLINE(regname)						\
-RISCVREG_CLEAR_INLINE(regname)
-#define	RISCVREG_READ_SET_CLEAR_INLINE(regname)				\
-RISCVREG_READ_INLINE(regname)						\
-RISCVREG_SET_CLEAR_INLINE(regname)
-#define	RISCVREG_READ_WRITE_SET_CLEAR_INLINE(regname)			\
-RISCVREG_READ_WRITE_INLINE(regname)					\
-RISCVREG_SET_CLEAR_INLINE(regname)
-
-/* Supervisor Status Register */
-RISCVREG_READ_SET_CLEAR_INLINE(sstatus)		// supervisor status register
-#ifdef _LP64
-#define	SR_WPRI		__BITS(62, 34) | __BITS(31, 20) | \
-			__BIT(17) | __BITS(12, 11) | __BIT(7) | __BITS(4, 2) | \
-			__BIT(0)
-#define	SR_SD		__BIT(63)	// any of FS or VS or XS dirty
-			/* Bits 62-34 are WPRI */
-#define	SR_UXL		__BITS(33, 32)	// U-mode XLEN
-#define	 SR_UXL_32	1		//   XLEN ==  32
-#define	 SR_UXL_64	2		//   XLEN ==  64
-#define	 SR_UXL_128	3		//   XLEN == 128
-			/* Bits 31-20 are WPRI*/
-#else
-#define	SR_WPRI		__BITS(30, 20) | \
-			__BIT(17) | __BITS(12, 11) | __BIT(7) | __BITS(4, 2) | \
-			__BIT(0)
-#define	SR_SD		__BIT(31)	// any of FS or VS or XS dirty
-			/* Bits 30-20 are WPRI*/
-#endif /* _LP64 */
-
-/* Both RV32 and RV64 have the bottom 20 bits shared */
-#define	SR_MXR		__BIT(19)	// Make eXecutable Readable
-#define	SR_SUM		__BIT(18)	// permit Supervisor User Memory access
-			/* Bit 17 is WPRI */
-#define	SR_XS		__BITS(16, 15)	// Vector extension state
-#define	 SR_XS_OFF		0	//   All off
-#define	 SR_XS_SOME_ON		1	//   None dirty or clean, some on
-#define	 SR_XS_SOME_CLEAN	2	//   None dirty, some clean
-#define	 SR_XS_SOME_DIRTY	3	//   Some dirty
-#define	SR_FS		__BITS(14, 13)	// Floating-point unit state
-#define	 SR_FS_OFF	0		//   Off
-#define	 SR_FS_INITIAL	1		//   Initial
-#define	 SR_FS_CLEAN	2		//   Clean
-#define	 SR_FS_DIRTY	3		//   Dirty
-			/* Bits 12-11 are WPRI */
-#define	SR_VS		__BITS(10, 9)	// User-mode extention state
-#define	 SR_VS_OFF	SR_FS_OFF	//   Off
-#define	 SR_VS_INITIAL	SR_FS_INITIAL	//   Initial
-#define	 SR_VS_CLEAN	SR_FS_CLEAN	//   Clean
-#define	 SR_VS_DIRTY	SR_FS_DIRTY	//   Dirty
-#define	SR_SPP		__BIT(8)	// Priv level before supervisor mode
-			/* Bit 7 is WPRI */
-#define	SR_UBE		__BIT(6)	// User-mode endianness
-#define	SR_SPIE		__BIT(5)	// S-Mode interrupts enabled before trap
-			/* Bits 4-2 are WPRI */
-#define	SR_SIE		__BIT(1)	// Supervisor mode interrupt enable
-			/* Bit 0 is WPRI */
-
-/* Supervisor interrupt registers */
-/* ... interrupt pending register (sip) */
-RISCVREG_READ_SET_CLEAR_INLINE(sip)		// supervisor interrupt pending
-			/* Bit (XLEN-1) - 10 is WIRI */
-#define	SIP_SEIP	__BIT(9)	// S-mode interrupt pending
-			/* Bit 8-6 is WIRI */
-#define	SIP_STIP	__BIT(5)	// S-mode timer interrupt pending
-			/* Bit 4-2 is WIRI */
-#define	SIP_SSIP	__BIT(1)	// S-mode software interrupt pending
-			/* Bit 0 is WIRI */
-
-/* ... interrupt-enable register (sie) */
-RISCVREG_READ_SET_CLEAR_INLINE(sie)		// supervisor interrupt enable
-			/* Bit (XLEN-1) - 10 is WIRI */
-#define	SIE_SEIE	__BIT(9)	// S-mode interrupt enable
-			/* Bit 8-6 is WIRI */
-#define	SIE_STIE	__BIT(5)	// S-mode timer interrupt enable
-			/* Bit 4-2 is WIRI */
-#define	SIE_SSIE	__BIT(1)	// S-mode software interrupt enable
-			/* Bit 0 is WIRI */
-
-/* Mask for all interrupts */
-#define	SIE_IM		(SIE_SEI |SIE_STIE | SIE_SSIE)
-
-#ifdef _LP64
-#define	SR_USER64	(SR_SPIE | SR_UXL_64)	// 64-bit U-mode sstatus
-#define	SR_USER32	(SR_SPIE | SR_UXL_32)	// 32-bit U-mode sstatus
-#else
-#define	SR_USER		(SR_SPIE)		// U-mode sstatus
-#endif
-
-// Cause register
-#define	CAUSE_INTERRUPT_P(cause)	((cause) & __BIT(XLEN - 1))
-#define	CAUSE_CODE(cause)		((cause) & __BITS(XLEN - 2, 0))
-
-// Cause register - exceptions
-#define	CAUSE_FETCH_MISALIGNED		0
-#define	CAUSE_FETCH_ACCESS		1
-#define	CAUSE_ILLEGAL_INSTRUCTION	2
-#define	CAUSE_BREAKPOINT		3
-#define	CAUSE_LOAD_MISALIGNED		4
-#define	CAUSE_LOAD_ACCESS		5
-#define	CAUSE_STORE_MISALIGNED		6
-#define	CAUSE_STORE_ACCESS		7
-#define	CAUSE_USER_ECALL		8
-#define	CAUSE_SYSCALL			CAUSE_USER_ECALL /* convenience alias */
-#define	CAUSE_SUPERVISOR_ECALL		9
-/* 10 is reserved */
-#define	CAUSE_MACHINE_ECALL		11
-#define	CAUSE_FETCH_PAGE_FAULT		12
-#define	CAUSE_LOAD_PAGE_FAULT		13
-/* 14 is Reserved */
-#define	CAUSE_STORE_PAGE_FAULT		15
-/* >= 16 is reserved/custom */
-
-// Cause register - interrupts
-#define	IRQ_SUPERVISOR_SOFTWARE	1
-#define	IRQ_MACHINE_SOFTWARE	3
-#define	IRQ_SUPERVISOR_TIMER	5
-#define	IRQ_MACHINE_TIMER	7
-#define	IRQ_SUPERVISOR_EXTERNAL	9
-#define	IRQ_MACHINE_EXTERNAL	11
-
-RISCVREG_READ_INLINE(time)
-#ifdef _LP64
-RISCVREG_READ_INLINE(cycle)
-#else /* !_LP64 */
-static inline uint64_t
-csr_cycle_read(void)
-{
-	uint32_t __hi0, __hi1, __lo0;
-	do {
-		__asm __volatile(
-			"csrr\t%[__hi0], cycleh"
-		"\n\t"	"csrr\t%[__lo0], cycle"
-		"\n\t"	"csrr\t%[__hi1], cycleh"
-		   :	[__hi0] "=r"(__hi0),
-			[__lo0] "=r"(__lo0),
-			[__hi1] "=r"(__hi1));
-	} while (__hi0 != __hi1);
-	return
-	    __SHIFTIN(__hi0, __BITS(63, 32)) |
-	    __SHIFTIN(__lo0, __BITS(31,  0));
-}
-#endif /* !_LP64 */
-
-#ifdef _LP64
-#define	SATP_MODE		__BITS(63, 60)	// Translation mode
-#define	 SATP_MODE_BARE		0		//   No translation or protection
-				/* modes 1-7 reserved for standard use */
-#define	 SATP_MODE_SV39		8		//   Page-based 39-bit virt addr
-#define	 SATP_MODE_SV48		9		//   Page-based 48-bit virt addr
-#define	 SATP_MODE_SV57		10		//   Page-based 57-bit virt addr
-#define	 SATP_MODE_SV64		11		//   Page-based 64-bit virt addr
-				/* modes 12-13 reserved for standard use */
-				/* modes 14-15 designated for custom use */
-#define	SATP_ASID		__BITS(59, 44)	//   Address Space Identifier
-#define	SATP_PPN		__BITS(43, 0)	//   Physical Page Number
-#else
-#define	SATP_MODE		__BIT(31)	// Translation mode
-#define	 SATP_MODE_BARE		0		//   No translation or protection
-#define	 SATP_MODE_SV32		1		//   Page-based 32-bit virt addr
-#define	SATP_ASID		__BITS(30, 22)	//   Address Space Identifier
-#define	SATP_PPN		__BITS(21, 0)	//   Physical Page Number
-#endif
-
-RISCVREG_READ_WRITE_INLINE(satp)
-
-/* Fake "ASID" CSR (a field of SATP register) functions */
-static inline uint32_t
-csr_asid_read(void)
-{
-	uintptr_t satp = csr_satp_read();
-	return __SHIFTOUT(satp, SATP_ASID);
-}
-
-static inline void
-csr_asid_write(uint32_t asid)
-{
-	uintptr_t satp = csr_satp_read();
-	satp &= ~SATP_ASID;
-	satp |= __SHIFTIN(asid, SATP_ASID);
-	csr_satp_write(satp);
-}
-
-#endif /* _RISCV_SYSREG_H_ */
\ No newline at end of file

@@ -1,3 +0,0 @@
-/*	$NetBSD: ansi.h,v 1.1 2014/09/19 17:36:26 matt Exp $	*/
-
-#include <sys/common_ansi.h>
\ No newline at end of file

@@ -1,40 +0,0 @@
-/* $NetBSD: aout_machdep.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_AOUT_MACHDEP_H_
-#define	_RISCV_AOUT_MACHDEP_H_
-
-#define cpu_exec_aout_makecmds(p, epp)	ENOEXEC
-
-/* Size of a page in an object file. */
-#define	AOUT_LDPGSZ	4096
-
-#endif /* !_RISCV_AOUT_MACHDEP_H_ */
\ No newline at end of file

@@ -1,266 +0,0 @@
-/*	$NetBSD: asm.h,v 1.6 2021/05/01 07:05:07 skrll Exp $	*/
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_ASM_H
-#define	_RISCV_ASM_H
-
-#define	_C_LABEL(x)	x
-
-#define	__CONCAT(x,y)	x ## y
-#define	__STRING(x)	#x
-
-#define	___CONCAT(x,y)	__CONCAT(x,y)
-
-/*
- * Define -pg profile entry code.
- * Must always be noreorder, must never use a macro instruction
- * Final addiu to t9 must always equal the size of this _KERN_MCOUNT
- */
-#define	_KERN_MCOUNT						\
-	.set	push;						\
-	subi	sp, sp, CALLFRAME_SIZE;				\
-	REG_S	a0, CALLFRAME_S0(sp);				\
-	REG_S	ra, CALLFRAME_RA(sp);				\
-	move	a0, ra;						\
-	call	_mcount 					\
-	REG_L	ra, CALLFRAME_RA(sp);				\
-	REG_L	a0, CALLFRAME_S0(sp);				\
-	addi	sp, sp, CALLFRAME_SIZ;				\
-	.set	pop;
-
-#ifdef GPROF
-#define	_PROF_PROLOGUE _KERN_MCOUNT
-#else
-#define	_PROF_PROLOGUE
-#endif
-
-#ifdef __PIC__
-#define	PLT(x)	x##@plt
-#else
-#define PLT(x)	x
-#endif
-
-/*
- * WEAK_ALIAS: create a weak alias.
- */
-#define	WEAK_ALIAS(alias,sym)						\
-	.weak alias;							\
-	alias = sym
-/*
- * STRONG_ALIAS: create a strong alias.
- */
-#define	STRONG_ALIAS(alias,sym)						\
-	.globl alias;							\
-	alias = sym
-
-/*
- * WARN_REFERENCES: create a warning if the specified symbol is referenced.
- */
-#define	WARN_REFERENCES(sym,msg)					\
-	.pushsection __CONCAT(.gnu.warning.,sym);			\
-	.ascii msg;							\
-	.popsection
-
-#define	_ENTRY(x)			\
-	.globl	_C_LABEL(x);		\
-	.type	_C_LABEL(x), @function;	\
-	_C_LABEL(x):
-
-#define	ENTRY_NP(x)	.text; .align 2; _ENTRY(x)
-#define	ENTRY(x)	ENTRY_NP(x); _PROF_PROLOGUE
-#define	END(x)		.size _C_LABEL(x), . - _C_LABEL(x)
-
-/*
- * Macros to panic and printf from assembly language.
- */
-#define	PANIC(msg)			\
-	la	a0, 9f;			\
-	call	_C_LABEL(panic);	\
-	MSG(msg)
-
-#define	PRINTF(msg)			\
-	la	a0, 9f;			\
-	call	_C_LABEL(printf);	\
-	MSG(msg)
-
-#define	MSG(msg)			\
-        .pushsection .rodata.str1.8,"aMS",@progbits,1; \
-9:	.asciiz	msg;			\
-	.popsection
-
-#define	ASMSTR(str)			\
-	.asciiz str;			\
-	.align	3
-
-#define __RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
-			.asciz x;					\
-			.popsection
-#define RCSID(name)	__RCSID(name)
-
-#if defined(_LP64)
-#define	SZREG	8
-#else
-#define	SZREG	4
-#endif
-
-#define	ALSK	15		/* stack alignment */
-#define	ALMASK	-15		/* stack alignment */
-#define	SZFPREG	8
-#define	FP_L	fld
-#define	FP_S	fsd
-
-/*
- *  standard callframe {
- *  	register_t cf_sp;		frame pointer
- *  	register_t cf_ra;		return address
- *  };
- */
-#define	CALLFRAME_SIZ	(SZREG * 4)
-#define	CALLFRAME_S1	(CALLFRAME_SIZ - 4 * SZREG)
-#define	CALLFRAME_S0	(CALLFRAME_SIZ - 3 * SZREG)
-#define	CALLFRAME_SP	(CALLFRAME_SIZ - 2 * SZREG)
-#define	CALLFRAME_RA	(CALLFRAME_SIZ - 1 * SZREG)
-
-/*
- * These macros hide the use of rv32 and rv64 instructions from the
- * assembler to prevent the assembler from generating 64-bit style
- * ABI calls.
- */
-#define	PTR_ADD		add
-#define	PTR_ADDI	addi
-#define	PTR_SUB		sub
-#define	PTR_SUBI	subi
-#define	PTR_LA		la
-#define	PTR_SLLI	slli
-#define	PTR_SLL		sll
-#define	PTR_SRLI	srli
-#define	PTR_SRL		srl
-#define	PTR_SRAI	srai
-#define	PTR_SRA		sra
-#if _LP64
-#define	PTR_L		ld
-#define	PTR_S		sd
-#define	PTR_LR		lr.d
-#define	PTR_SC		sc.d
-#define	PTR_WORD	.dword
-#define	PTR_SCALESHIFT	3
-#else
-#define	PTR_L		lw
-#define	PTR_S		sw
-#define	PTR_LR		lr.w
-#define	PTR_SC		sc.w
-#define	PTR_WORD	.word
-#define	PTR_SCALESHIFT	2
-#endif
-
-#define	INT_L		lw
-#define	INT_LA		la
-#define	INT_S		sw
-#define	INT_LR		lr.w
-#define	INT_SC		sc.w
-#define	INT_WORD	.word
-#define	INT_SCALESHIFT	2
-#ifdef _LP64
-#define	INT_ADD		addw
-#define	INT_ADDI	addwi
-#define	INT_SUB		subw
-#define	INT_SUBI	subwi
-#define	INT_SLL		sllwi
-#define	INT_SLLV	sllw
-#define	INT_SRL		srlwi
-#define	INT_SRLV	srlw
-#define	INT_SRA		srawi
-#define	INT_SRAV	sraw
-#else
-#define	INT_ADD		add
-#define	INT_ADDI	addi
-#define	INT_SUB		sub
-#define	INT_SUBI	subi
-#define	INT_SLLI	slli
-#define	INT_SLL		sll
-#define	INT_SRLI	srli
-#define	INT_SRL		srl
-#define	INT_SRAI	srai
-#define	INT_SRA		sra
-#endif
-
-#define	LONG_LA		la
-#define	LONG_ADD	add
-#define	LONG_ADDI	addi
-#define	LONG_SUB	sub
-#define	LONG_SUBI	subi
-#define	LONG_SLLI	slli
-#define	LONG_SLL	sll
-#define	LONG_SRLI	srli
-#define	LONG_SRL	srl
-#define	LONG_SRAI	srai
-#define	LONG_SRA	sra
-#ifdef _LP64
-#define	LONG_L		ld
-#define	LONG_S		sd
-#define	LONG_LR		lr.d
-#define	LONG_SC		sc.d
-#define	LONG_WORD	.quad
-#define	LONG_SCALESHIFT	3
-#else
-#define	LONG_L		lw
-#define	LONG_S		sw
-#define	LONG_LR		lr.w
-#define	LONG_SC		sc.w
-#define	LONG_WORD	.word
-#define	LONG_SCALESHIFT	2
-#endif
-
-#define	REG_LI		li
-#define	REG_ADD		add
-#define	REG_SLLI	slli
-#define	REG_SLL		sll
-#define	REG_SRLI	srli
-#define	REG_SRL		srl
-#define	REG_SRAI	srai
-#define	REG_SRA		sra
-#if _LP64
-#define	REG_L		ld
-#define	REG_S		sd
-#define	REG_LR		lr.d
-#define	REG_SC		sc.d
-#define	REG_SCALESHIFT	3
-#else
-#define	REG_L		lw
-#define	REG_S		sw
-#define	REG_LR		lr.w
-#define	REG_SC		sc.w
-#define	REG_SCALESHIFT	2
-#endif
-
-#define	CPUVAR(off) _C_LABEL(cpu_info_store)+__CONCAT(CPU_INFO_,off)
-
-#endif /* _RISCV_ASM_H */
\ No newline at end of file

@@ -1,11 +0,0 @@
-/*      $NetBSD: bswap.h,v 1.1 2014/09/19 17:36:26 matt Exp $      */
-
-#ifndef _RISCV_BSWAP_H_
-#define _RISCV_BSWAP_H_
-
-#include <riscv/byte_swap.h>
-
-#define __BSWAP_RENAME
-#include <sys/bswap.h>
-
-#endif /* _RISCV_BSWAP_H_ */
\ No newline at end of file

@@ -1,99 +0,0 @@
-/* $NetBSD: byte_swap.h,v 1.5 2020/04/04 21:13:20 christos Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_BYTE_SWAP_H_
-#define	_RISCV_BYTE_SWAP_H_
-
-#ifdef _LOCORE
-
-#define	BSWAP16(_src, _dst, _tmp)	\
-	andi	_dst, _src, 0xff	;\
-	slli	_dst, _dst, 8		;\
-	srli	_tmp, _src, 8		;\
-	and	_tmp, _tmp, 0xff	;\
-	ori	_dst, _dst, _tmp
-
-#define BSWAP32(_src, _dst, _tmp)	\
-	li	v1, 0xff00		;\
-	slli	_dst, _src, 24		;\
-	srli	_tmp, _src, 24		;\
-	ori	_dst, _dst, _tmp	;\
-	and	_tmp, _src, v1		;\
-	slli	_tmp, _src, 8		;\
-	ori	_dst, _dst, _tmp	;\
-	srli	_tmp, _src, 8		;\
-	and	_tmp, _tmp, v1		;\
-	ori	_dst, _dst, _tmp
-
-#else
-
-#include <sys/types.h>
-__BEGIN_DECLS
-
-#define	__BYTE_SWAP_U64_VARIABLE __byte_swap_u64_variable
-static __inline uint64_t
-__byte_swap_u64_variable(uint64_t v)
-{
-	const uint64_t m1 = 0x0000ffff0000ffffull;
-	const uint64_t m0 = 0x00ff00ff00ff00ffull;
-
-	v = (v >> 32) | (v << 32);
-	v = ((v >> 16) & m1) | ((v & m1) << 16);
-	v = ((v >> 8) & m0) | ((v & m0) << 8);
-
-	return v;
-}
-
-#define	__BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
-static __inline uint32_t
-__byte_swap_u32_variable(uint32_t v)
-{
-	const uint32_t m = 0xff00ff;
-
-	v = (v >> 16) | (v << 16);
-	v = ((v >> 8) & m) | ((v & m) << 8);
-
-	return v;
-}
-
-#define	__BYTE_SWAP_U16_VARIABLE __byte_swap_u16_variable
-static __inline uint16_t
-__byte_swap_u16_variable(uint16_t v)
-{
-	/*LINTED*/
-	return (uint16_t)((v >> 8) | (v << 8));
-}
-
-__END_DECLS
-
-#endif	/* _LOCORE */
-
-#endif /* _RISCV_BYTE_SWAP_H_ */
\ No newline at end of file

@@ -1,8 +0,0 @@
-/* $NetBSD: cdefs.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
-
-#ifndef _RISCV_CDEFS_H_
-#define _RISCV_CDEFS_H_
-
-#define	__ALIGNBYTES	(__BIGGEST_ALIGNMENT__ - 1U)
-
-#endif /* _RISCV_CDEFS_H_ */
\ No newline at end of file

@@ -1,153 +0,0 @@
-/* $NetBSD: cpu.h,v 1.9 2022/11/17 09:50:23 simonb Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_CPU_H_
-#define _RISCV_CPU_H_
-
-#if defined(_KERNEL) || defined(_KMEMUSER)
-
-struct clockframe {
-	vaddr_t cf_epc;
-	register_t cf_status;
-	int cf_intr_depth;
-};
-
-#define CLKF_USERMODE(cf)	(((cf)->cf_status & SR_SPP) == 0)
-#define CLKF_PC(cf)		((cf)->cf_epc)
-#define CLKF_INTR(cf)		((cf)->cf_intr_depth > 0)
-
-#include <sys/cpu_data.h>
-#include <sys/device_if.h>
-#include <sys/evcnt.h>
-#include <sys/intr.h>
-
-struct cpu_info {
-	struct cpu_data ci_data;
-	device_t ci_dev;
-	cpuid_t ci_cpuid;
-	struct lwp *ci_curlwp;
-	struct lwp *ci_onproc;		/* current user LWP / kthread */
-	struct lwp *ci_softlwps[SOFTINT_COUNT];
-	struct trapframe *ci_ddb_regs;
-
-	uint64_t ci_lastintr;
-
-	int ci_mtx_oldspl;
-	int ci_mtx_count;
-
-	int ci_want_resched;
-	int ci_cpl;
-	u_int ci_softints;
-	volatile u_int ci_intr_depth;
-
-	tlb_asid_t ci_pmap_asid_cur;
-
-	union pmap_segtab *ci_pmap_user_segtab;
-#ifdef _LP64
-	union pmap_segtab *ci_pmap_user_seg0tab;
-#endif
-
-	struct evcnt ci_ev_fpu_saves;
-	struct evcnt ci_ev_fpu_loads;
-	struct evcnt ci_ev_fpu_reenables;
-#if defined(GPROF) && defined(MULTIPROCESSOR)
-	struct gmonparam *ci_gmon;	/* MI per-cpu GPROF */
-#endif
-};
-
-#endif /* _KERNEL || _KMEMUSER */
-
-#ifdef _KERNEL
-
-extern struct cpu_info cpu_info_store;
-
-// This is also in <sys/lwp.h>
-struct lwp;
-static inline struct cpu_info *lwp_getcpu(struct lwp *);
-
-register struct lwp *riscv_curlwp __asm("tp");
-#define	curlwp		riscv_curlwp
-#define	curcpu()	lwp_getcpu(curlwp)
-
-static inline cpuid_t
-cpu_number(void)
-{
-#ifdef MULTIPROCESSOR
-	return curcpu()->ci_cpuid;
-#else
-	return 0;
-#endif
-}
-
-void	cpu_proc_fork(struct proc *, struct proc *);
-void	cpu_signotify(struct lwp *);
-void	cpu_need_proftick(struct lwp *l);
-void	cpu_boot_secondary_processors(void);
-
-#define CPU_INFO_ITERATOR	cpuid_t
-#ifdef MULTIPROCESSOR
-#define CPU_INFO_FOREACH(cii, ci) \
-	(cii) = 0; ((ci) = cpu_infos[cii]) != NULL; (cii)++
-#else
-#define CPU_INFO_FOREACH(cii, ci) \
-	(cii) = 0, (ci) = curcpu(); (cii) == 0; (cii)++
-#endif
-
-#define CPU_INFO_CURPMAP(ci)	(curlwp->l_proc->p_vmspace->vm_map.pmap)
-
-static inline void
-cpu_dosoftints(void)
-{
-	extern void dosoftints(void);
-        struct cpu_info * const ci = curcpu();
-        if (ci->ci_intr_depth == 0
-	    && (ci->ci_data.cpu_softints >> ci->ci_cpl) > 0)
-                dosoftints();
-}
-
-static inline bool
-cpu_intr_p(void)
-{
-	return curcpu()->ci_intr_depth > 0;
-}
-
-#define LWP_PC(l)	cpu_lwp_pc(l)
-
-vaddr_t	cpu_lwp_pc(struct lwp *);
-
-static inline void
-cpu_idle(void)
-{
-}
-
-#endif /* _KERNEL */
-
-#endif /* _RISCV_CPU_H_ */
\ No newline at end of file

@@ -1,68 +0,0 @@
-/* $NetBSD: disklabel.h,v 1.2 2022/05/24 19:37:39 andvar Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_DISKLABEL_H_
-#define _RISCV_DISKLABEL_H_
-
-#define LABELUSESMBR		1	/* use MBR partitionning */
-#define LABELSECTOR		1	/* sector containing label */
-#define LABELOFFSET		0	/* offset of label in sector */
-#define MAXPARTITIONS		16	/* number of partitions */
-#define RAW_PART		2	/* raw partition: XX?c */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include <nbinclude/sys/dkbad.h>
-#include <nbinclude/sys/bootblock.h>
-#else
-#include <sys/dkbad.h>
-#include <sys/bootblock.h>
-#endif /* HAVE_NBTOOL_CONFIG_H */
-
-struct cpu_disklabel {
-	struct mbr_partition mbrparts[MBR_PART_COUNT];
-#define __HAVE_DISKLABEL_DKBAD
-	struct dkbad bad;
-};
-
-#ifdef _KERNEL
-struct buf;
-struct disklabel;
-
-/* for readdisklabel.  rv != 0 -> matches, msg == NULL -> success */
-int	mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
-	    struct cpu_disklabel *, const char **, int *, int *);
-
-/* for writedisklabel.  rv == 0 -> doesn't match, rv > 0 -> success */
-int	mbr_label_locate(dev_t, void (*)(struct buf *),
-	    struct disklabel *, struct cpu_disklabel *, int *, int *);
-#endif /* _KERNEL */
-
-#endif /* _RISCV_DISKLABEL_H_ */
\ No newline at end of file

@@ -1,144 +0,0 @@
-/* $NetBSD: elf_machdep.h,v 1.9 2022/12/03 08:54:38 skrll Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_ELF_MACHDEP_H_
-#define _RISCV_ELF_MACHDEP_H_
-
-#define	ELF32_MACHDEP_ID		EM_RISCV
-#define	ELF64_MACHDEP_ID		EM_RISCV
-
-#define ELF32_MACHDEP_ENDIANNESS	ELFDATA2LSB
-#define ELF64_MACHDEP_ENDIANNESS	ELFDATA2LSB
-
-#define ELF32_MACHDEP_ID_CASES		\
-		case EM_RISCV:		\
-			break;
-
-#define	ELF64_MACHDEP_ID_CASES		\
-		case EM_RISCV:		\
-			break;
-
-#ifdef _LP64
-#define	KERN_ELFSIZE		64
-#define ARCH_ELFSIZE		64	/* MD native binary size */
-#else
-#define	KERN_ELFSIZE		32
-#define ARCH_ELFSIZE		32	/* MD native binary size */
-#endif
-
-/* Processor specific flags for the ELF header e_flags field.  */
-
-/* Processor specific relocation types */
-
-#define R_RISCV_NONE		0
-#define R_RISCV_32		1	// A
-#define R_RISCV_64		2
-#define R_RISCV_RELATIVE	3
-#define R_RISCV_COPY		4
-#define R_RISCV_JMP_SLOT	5
-#define R_RISCV_TLS_DTPMOD32	6
-#define R_RISCV_TLS_DTPMOD64	7
-#define R_RISCV_TLS_DTPREL32	8
-#define R_RISCV_TLS_DTPREL64	9
-#define R_RISCV_TLS_TPREL32	10
-#define R_RISCV_TLS_TPREL64	11
-
-/* The rest are not used by the dynamic linker */
-#define R_RISCV_BRANCH		16	// (A - P) & 0xffff
-#define R_RISCV_JAL		17	// A & 0xff
-#define R_RISCV_CALL		18	// (A - P) & 0xff
-#define R_RISCV_CALL_PLT	19
-#define R_RISCV_GOT_HI20	20
-#define R_RISCV_TLS_GOT_HI20	21
-#define R_RISCV_TLS_GD_HI20	22
-#define R_RISCV_PCREL_HI20	23
-#define R_RISCV_PCREL_LO12_I	24
-#define R_RISCV_PCREL_LO12_S	25
-#define R_RISCV_HI20		26	// A & 0xffff
-#define R_RISCV_LO12_I		27	// (A >> 16) & 0xffff
-#define R_RISCV_LO12_S		28	// (S + A - P) >> 2
-#define R_RISCV_TPREL_HI20	29
-#define R_RISCV_TPREL_LO12_I	30
-#define R_RISCV_TPREL_LO12_S	31
-#define R_RISCV_TPREL_ADD	32
-#define R_RISCV_ADD8		33
-#define R_RISCV_ADD16		34
-#define R_RISCV_ADD32		35
-#define R_RISCV_ADD64		36
-#define R_RISCV_SUB8		37
-#define R_RISCV_SUB16		38
-#define R_RISCV_SUB32		39
-#define R_RISCV_SUB64		40
-#define R_RISCV_GNU_VTINHERIT	41	// A & 0xffff
-#define R_RISCV_GNU_VTENTRY	42
-#define R_RISCV_ALIGN		43
-#define R_RISCV_RVC_BRANCH	44
-#define R_RISCV_RVC_JUMP	45
-#define R_RISCV_RVC_LUI		46
-#define R_RISCV_GPREL_I		47
-#define R_RISCV_GPREL_S		48
-#define R_RISCV_TPREL_I		49
-#define R_RISCV_TPREL_S		50
-#define R_RISCV_RELAX		51
-#define R_RISCV_SUB6		52
-#define R_RISCV_SET6		53
-#define R_RISCV_SET8		54
-#define R_RISCV_SET16		55
-#define R_RISCV_SET32		56
-#define R_RISCV_32_PCREL	57
-
-/* These are aliases we can use R_TYPESZ */
-#define R_RISCV_ADDR32		R_RISCV_32
-#define R_RISCV_ADDR64		R_RISCV_64
-
-#define R_TYPE(name)		R_RISCV_ ## name
-#if ELFSIZE == 32
-#define R_TYPESZ(name)		R_RISCV_ ## name ## 32
-#else
-#define R_TYPESZ(name)		R_RISCV_ ## name ## 64
-#endif
-
-#ifdef _KERNEL
-#ifdef ELFSIZE
-#define ELF_MD_PROBE_FUNC       ELFNAME2(cpu_netbsd,probe)
-#endif
-
-struct exec_package;
-
-int cpu_netbsd_elf32_probe(struct lwp *, struct exec_package *, void *, char *,
-        vaddr_t *);
-
-int cpu_netbsd_elf64_probe(struct lwp *, struct exec_package *, void *, char *,
-        vaddr_t *);
-
-#endif /* _KERNEL */
-
-#endif /* _RISCV_ELF_MACHDEP_H_ */
\ No newline at end of file

@@ -1,3 +0,0 @@
-/* $NetBSD: endian.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
-
-#include <sys/endian.h>
\ No newline at end of file

@@ -1,3 +0,0 @@
-/* $NetBSD: endian_machdep.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
-
-#define _BYTE_ORDER _LITTLE_ENDIAN
\ No newline at end of file

@@ -1,35 +0,0 @@
-/*	$NetBSD: fenv.h,v 1.3 2020/03/14 16:12:16 skrll Exp $	*/
-
-/*
- * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
- * Public domain.
- */
-
-#ifndef _RISCV_FENV_H_
-#define _RISCV_FENV_H_
-
-typedef int fenv_t;		/* FPSCR */
-typedef int fexcept_t;
-
-#define	FE_INEXACT	0x00	/* Result inexact */
-#define	FE_UNDERFLOW	0x02	/* Result underflowed */
-#define	FE_OVERFLOW	0x04	/* Result overflowed */
-#define	FE_DIVBYZERO	0x08	/* divide-by-zero */
-#define	FE_INVALID	0x10	/* Result invalid */
-
-#define	FE_ALL_EXCEPT	0x1f
-
-#define	FE_TONEAREST	0	/* round to nearest representable number */
-#define	FE_TOWARDZERO	1	/* round to zero (truncate) */
-#define	FE_DOWNWARD	2	/* round toward negative infinity */
-#define	FE_UPWARD	3	/* round toward positive infinity */
-
-__BEGIN_DECLS
-
-/* Default floating-point environment */
-extern const fenv_t	__fe_dfl_env;
-#define FE_DFL_ENV	(&__fe_dfl_env)
-
-__END_DECLS
-
-#endif /* _RISCV_FENV_H_ */
\ No newline at end of file

@@ -1,58 +0,0 @@
-/* $NetBSD: float.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_FLOAT_H_
-#define _RISCV_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-#define LDBL_MANT_DIG	__LDBL_MANT_DIG__
-#define LDBL_DIG	__LDBL_DIG__
-#define LDBL_MIN_EXP	__LDBL_MIN_EXP__
-#define LDBL_MIN_10_EXP	__LDBL_MIN_10_EXP__
-#define LDBL_MAX_EXP	__LDBL_MAX_EXP__
-#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
-#define LDBL_EPSILON	__LDBL_EPSILON__
-#define LDBL_MIN	__LDBL_MIN__
-#define LDBL_MAX	__LDBL_MAX__
-
-#include <sys/float_ieee754.h>
-
-#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) \
-	 && !defined(_XOPEN_SOURCE)) \
-	|| (__STDC_VERSION__ - 0) >= 199901L \
-	|| (_POSIX_C_SOURCE - 0) >= 200112L \
-	|| ((_XOPEN_SOURCE  - 0) >= 600) \
-	|| defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
-#define DECIMAL_DIG	__DECIMAL_DIG__
-#endif
-
-#endif /* !_RISCV_FLOAT_H_ */
\ No newline at end of file

@@ -1,4 +0,0 @@
-/* $NetBSD: ieee.h,v 1.2 2019/04/13 15:57:31 maya Exp $ */
-
-#include <riscv/math.h>		/* for #define __HAVE_LONG_DOUBLE 128 */
-#include <sys/ieee754.h>
\ No newline at end of file

@@ -1,44 +0,0 @@
-/*	$NetBSD: ieeefp.h,v 1.2 2020/03/14 16:12:16 skrll Exp $	*/
-
-/*
- * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
- * Public domain.
- */
-
-#ifndef _RISCV_IEEEFP_H_
-#define _RISCV_IEEEFP_H_
-
-#include <sys/featuretest.h>
-
-#if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE)
-
-#include <riscv/fenv.h>
-
-#if !defined(_ISOC99_SOURCE)
-
-/* Exception type (used by fpsetmask() et al.) */
-
-typedef int fp_except;
-
-/* Bit defines for fp_except */
-
-#define	FP_X_INV	FE_INVALID	/* invalid operation exception */
-#define	FP_X_DZ		FE_DIVBYZERO	/* divide-by-zero exception */
-#define	FP_X_OFL	FE_OVERFLOW	/* overflow exception */
-#define	FP_X_UFL	FE_UNDERFLOW	/* underflow exception */
-#define	FP_X_IMP	FE_INEXACT	/* imprecise (prec. loss; "inexact") */
-
-/* Rounding modes */
-
-typedef enum {
-    FP_RN=FE_TONEAREST,		/* round to nearest representable number */
-    FP_RP=FE_UPWARD,		/* round toward positive infinity */
-    FP_RM=FE_DOWNWARD,		/* round toward negative infinity */
-    FP_RZ=FE_TOWARDZERO		/* round to zero (truncate) */
-} fp_rnd;
-
-#endif /* !_ISOC99_SOURCE */
-
-#endif /* _NETBSD_SOURCE || _ISOC99_SOURCE */
-
-#endif /* _RISCV_IEEEFP_H_ */
\ No newline at end of file

@@ -1,20 +0,0 @@
-/* $NetBSD: int_const.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
-
-#ifndef __INTMAX_C_SUFFIX__
-
-#define __INT8_C_SUFFIX__
-#define __INT16_C_SUFFIX__
-#define __INT32_C_SUFFIX__
-#define __INT64_C_SUFFIX__	LL
-
-#define __UINT8_C_SUFFIX__
-#define __UINT16_C_SUFFIX__
-#define __UINT32_C_SUFFIX__
-#define __UINT64_C_SUFFIX__	ULL
-
-#define __INTMAX_C_SUFFIX__	LL
-#define __UINTMAX_C_SUFFIX__	ULL
-
-#endif
-
-#include <sys/common_int_const.h>
\ No newline at end of file

@@ -1,381 +0,0 @@
-/*	$NetBSD: int_fmtio.h,v 1.4 2019/04/17 11:01:19 mrg Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _RISCV_INT_FMTIO_H_
-#define _RISCV_INT_FMTIO_H_
-
-#ifdef __INTPTR_FMTd__
-#include <sys/common_int_fmtio.h>
-#else
-/*
- * 7.8.1 Macros for format specifiers
- */
-
-/* fprintf macros for signed integers */
-#define	PRId8		"hhd"	/* int8_t		*/
-#define	PRId16		"hd"	/* int16_t		*/
-#define	PRId32		"d"	/* int32_t		*/
-#ifdef _LP64
-#define	PRId64		"ld"	/* int64_t		*/
-#else
-#define	PRId64		"lld"	/* int64_t		*/
-#endif
-#define	PRIdLEAST8	"hhd"	/* int_least8_t		*/
-#define	PRIdLEAST16	"hd"	/* int_least16_t	*/
-#define	PRIdLEAST32	"d"	/* int_least32_t	*/
-#ifdef _LP64
-#define	PRIdLEAST64	"ld"	/* int_least64_t	*/
-#define	PRIdFAST8	"d"	/* int_fast8_t		*/
-#define	PRIdFAST16	"d"	/* int_fast16_t		*/
-#else
-#define	PRIdLEAST64	"lld"	/* int_least64_t	*/
-#define	PRIdFAST8	"hhd"	/* int_fast8_t		*/
-#define	PRIdFAST16	"hd"	/* int_fast16_t		*/
-#endif
-#define	PRIdFAST32	"d"	/* int_fast32_t		*/
-#ifdef _LP64
-#define	PRIdFAST64	"ld"	/* int_fast64_t		*/
-#define	PRIdMAX		"ld"	/* intmax_t		*/
-#else
-#define	PRIdFAST64	"lld"	/* int_fast64_t		*/
-#define	PRIdMAX		"lld"	/* intmax_t		*/
-#endif
-#define	PRIdPTR		"ld"	/* intptr_t		*/
-
-#define	PRIi8		"hhi"	/* int8_t		*/
-#define	PRIi16		"hi"	/* int16_t		*/
-#define	PRIi32		"i"	/* int32_t		*/
-#ifdef _LP64
-#define	PRIi64		"li"	/* int64_t		*/
-#else
-#define	PRIi64		"lli"	/* int64_t		*/
-#endif
-#define	PRIiLEAST8	"hhi"	/* int_least8_t		*/
-#define	PRIiLEAST16	"hi"	/* int_least16_t	*/
-#define	PRIiLEAST32	"i"	/* int_least32_t	*/
-#ifdef _LP64
-#define	PRIiLEAST64	"li"	/* int_least64_t	*/
-#define	PRIiFAST8	"i"	/* int_fast8_t		*/
-#define	PRIiFAST16	"i"	/* int_fast16_t		*/
-#else
-#define	PRIiLEAST64	"lli"	/* int_least64_t	*/
-#define	PRIiFAST8	"hhi"	/* int_fast8_t		*/
-#define	PRIiFAST16	"hi"	/* int_fast16_t		*/
-#endif
-#define	PRIiFAST32	"i"	/* int_fast32_t		*/
-#ifdef _LP64
-#define	PRIiFAST64	"li"	/* int_fast64_t		*/
-#define	PRIiMAX		"li"	/* intmax_t		*/
-#else
-#define	PRIiFAST64	"lli"	/* int_fast64_t		*/
-#define	PRIiMAX		"lli"	/* intmax_t		*/
-#endif
-#define	PRIiPTR		"li"	/* intptr_t		*/
-
-/* fprintf macros for unsigned integers */
-
-#define	PRIo8		"hho"	/* uint8_t		*/
-#define	PRIo16		"ho"	/* uint16_t		*/
-#define	PRIo32		"o"	/* uint32_t		*/
-#ifdef _LP64
-#define	PRIo64		"lo"	/* uint64_t		*/
-#else
-#define	PRIo64		"llo"	/* uint64_t		*/
-#endif
-#define	PRIoLEAST8	"o"	/* uint_least8_t	*/
-#define	PRIoLEAST16	"hho"	/* uint_least16_t	*/
-#define	PRIoLEAST32	"ho"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	PRIoLEAST64	"lo"	/* uint_least64_t	*/
-#define	PRIoFAST8	"o"	/* uint_fast8_t		*/
-#define	PRIoFAST16	"o"	/* uint_fast16_t	*/
-#else
-#define	PRIoLEAST64	"llo"	/* uint_least64_t	*/
-#define	PRIoFAST8	"hho"	/* uint_fast8_t		*/
-#define	PRIoFAST16	"ho"	/* uint_fast16_t	*/
-#endif
-#define	PRIoFAST32	"o"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	PRIoFAST64	"lo"	/* uint_fast64_t	*/
-#define	PRIoMAX		"lo"	/* uintmax_t		*/
-#else
-#define	PRIoFAST64	"llo"	/* uint_fast64_t	*/
-#define	PRIoMAX		"llo"	/* uintmax_t		*/
-#endif
-#define	PRIoPTR		"lo"	/* uintptr_t		*/
-
-#define	PRIu8		"hhu"	/* uint8_t		*/
-#define	PRIu16		"hu"	/* uint16_t		*/
-#define	PRIu32		"u"	/* uint32_t		*/
-#ifdef _LP64
-#define	PRIu64		"lu"	/* uint64_t		*/
-#else
-#define	PRIu64		"llu"	/* uint64_t		*/
-#endif
-#define	PRIuLEAST8	"hhu"	/* uint_least8_t	*/
-#define	PRIuLEAST16	"hu"	/* uint_least16_t	*/
-#define	PRIuLEAST32	"u"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	PRIuLEAST64	"lu"	/* uint_least64_t	*/
-#define	PRIuFAST8	"u"	/* uint_fast8_t		*/
-#define	PRIuFAST16	"u"	/* uint_fast16_t	*/
-#else
-#define	PRIuLEAST64	"llu"	/* uint_least64_t	*/
-#define	PRIuFAST8	"hhu"	/* uint_fast8_t		*/
-#define	PRIuFAST16	"hu"	/* uint_fast16_t	*/
-#endif
-#define	PRIuFAST32	"u"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	PRIuFAST64	"lu"	/* uint_fast64_t	*/
-#define	PRIuMAX		"lu"	/* uintmax_t		*/
-#else
-#define	PRIuFAST64	"llu"	/* uint_fast64_t	*/
-#define	PRIuMAX		"llu"	/* uintmax_t		*/
-#endif
-#define	PRIuPTR		"lu"	/* uintptr_t		*/
-
-#define	PRIx8		"hhx"	/* uint8_t		*/
-#define	PRIx16		"hx"	/* uint16_t		*/
-#define	PRIx32		"x"	/* uint32_t		*/
-#ifdef _LP64
-#define	PRIx64		"lx"	/* uint64_t		*/
-#else
-#define	PRIx64		"llx"	/* uint64_t		*/
-#endif
-#define	PRIxLEAST8	"x"	/* uint_least8_t	*/
-#define	PRIxLEAST16	"x"	/* uint_least16_t	*/
-#define	PRIxLEAST32	"x"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	PRIxLEAST64	"lx"	/* uint_least64_t	*/
-#define	PRIxFAST8	"x"	/* uint_fast8_t		*/
-#define	PRIxFAST16	"x"	/* uint_fast16_t	*/
-#else
-#define	PRIxLEAST64	"llx"	/* uint_least64_t	*/
-#define	PRIxFAST8	"hhx"	/* uint_fast8_t		*/
-#define	PRIxFAST16	"hx"	/* uint_fast16_t	*/
-#endif
-#define	PRIxFAST32	"x"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	PRIxFAST64	"lx"	/* uint_fast64_t	*/
-#define	PRIxMAX		"lx"	/* uintmax_t		*/
-#else
-#define	PRIxFAST64	"llx"	/* uint_fast64_t	*/
-#define	PRIxMAX		"llx"	/* uintmax_t		*/
-#endif
-#define	PRIxPTR		"lx"	/* uintptr_t		*/
-
-#define	PRIX8		"hhX"	/* uint8_t		*/
-#define	PRIX16		"hX"	/* uint16_t		*/
-#define	PRIX32		"X"	/* uint32_t		*/
-#ifdef _LP64
-#define	PRIX64		"lX"	/* uint64_t		*/
-#else
-#define	PRIX64		"llX"	/* uint64_t		*/
-#endif
-#define	PRIXLEAST8	"X"	/* uint_least8_t	*/
-#define	PRIXLEAST16	"X"	/* uint_least16_t	*/
-#define	PRIXLEAST32	"X"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	PRIXLEAST64	"lX"	/* uint_least64_t	*/
-#define	PRIXFAST8	"X"	/* uint_fast8_t		*/
-#define	PRIXFAST16	"X"	/* uint_fast16_t	*/
-#else
-#define	PRIXLEAST64	"llX"	/* uint_least64_t	*/
-#define	PRIXFAST8	"hhX"	/* uint_fast8_t		*/
-#define	PRIXFAST16	"hX"	/* uint_fast16_t	*/
-#endif
-#define	PRIXFAST32	"X"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	PRIXFAST64	"lX"	/* uint_fast64_t	*/
-#define	PRIXMAX		"lX"	/* uintmax_t		*/
-#else
-#define	PRIXFAST64	"llX"	/* uint_fast64_t	*/
-#define	PRIXMAX		"llX"	/* uintmax_t		*/
-#endif
-#define	PRIXPTR		"lX"	/* uintptr_t		*/
-
-/* fscanf macros for signed integers */
-
-#define	SCNd8		"hhd"	/* int8_t		*/
-#define	SCNd16		"hd"	/* int16_t		*/
-#define	SCNd32		"d"	/* int32_t		*/
-#ifdef _LP64
-#define	SCNd64		"ld"	/* int64_t		*/
-#else
-#define	SCNd64		"lld"	/* int64_t		*/
-#endif
-#define	SCNdLEAST8	"hhd"	/* int_least8_t		*/
-#define	SCNdLEAST16	"hd"	/* int_least16_t	*/
-#define	SCNdLEAST32	"d"	/* int_least32_t	*/
-#ifdef _LP64
-#define	SCNdLEAST64	"ld"	/* int_least64_t	*/
-#define	SCNdFAST8	"d"	/* int_fast8_t		*/
-#define	SCNdFAST16	"d"	/* int_fast16_t		*/
-#else
-#define	SCNdLEAST64	"lld"	/* int_least64_t	*/
-#define	SCNdFAST8	"hhd"	/* int_fast8_t		*/
-#define	SCNdFAST16	"hd"	/* int_fast16_t		*/
-#endif
-#define	SCNdFAST32	"d"	/* int_fast32_t		*/
-#ifdef _LP64
-#define	SCNdFAST64	"ld"	/* int_fast64_t		*/
-#define	SCNdMAX		"ld"	/* intmax_t		*/
-#else
-#define	SCNdFAST64	"lld"	/* int_fast64_t		*/
-#define	SCNdMAX		"lld"	/* intmax_t		*/
-#endif
-#define	SCNdPTR		"ld"	/* intptr_t		*/
-
-#define	SCNi8		"hhi"	/* int8_t		*/
-#define	SCNi16		"hi"	/* int16_t		*/
-#define	SCNi32		"i"	/* int32_t		*/
-#ifdef _LP64
-#define	SCNi64		"li"	/* int64_t		*/
-#else
-#define	SCNi64		"lli"	/* int64_t		*/
-#endif
-#define	SCNiLEAST8	"hhi"	/* int_least8_t		*/
-#define	SCNiLEAST16	"hi"	/* int_least16_t	*/
-#define	SCNiLEAST32	"i"	/* int_least32_t	*/
-#ifdef _LP64
-#define	SCNiLEAST64	"li"	/* int_least64_t	*/
-#define	SCNiFAST8	"i"	/* int_fast8_t		*/
-#define	SCNiFAST16	"i"	/* int_fast16_t		*/
-#else
-#define	SCNiLEAST64	"lli"	/* int_least64_t	*/
-#define	SCNiFAST8	"hhi"	/* int_fast8_t		*/
-#define	SCNiFAST16	"hi"	/* int_fast16_t		*/
-#endif
-#define	SCNiFAST32	"i"	/* int_fast32_t		*/
-#ifdef _LP64
-#define	SCNiFAST64	"li"	/* int_fast64_t		*/
-#define	SCNiMAX		"li"	/* intmax_t		*/
-#else
-#define	SCNiFAST64	"lli"	/* int_fast64_t		*/
-#define	SCNiMAX		"lli"	/* intmax_t		*/
-#endif
-#define	SCNiPTR		"li"	/* intptr_t		*/
-
-/* fscanf macros for unsigned integers */
-
-#define	SCNo8		"hho"	/* uint8_t		*/
-#define	SCNo16		"ho"	/* uint16_t		*/
-#define	SCNo32		"o"	/* uint32_t		*/
-#ifdef _LP64
-#define	SCNo64		"lo"	/* uint64_t		*/
-#else
-#define	SCNo64		"llo"	/* uint64_t		*/
-#endif
-#define	SCNoLEAST8	"hho"	/* uint_least8_t	*/
-#define	SCNoLEAST16	"ho"	/* uint_least16_t	*/
-#define	SCNoLEAST32	"o"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	SCNoLEAST64	"lo"	/* uint_least64_t	*/
-#define	SCNoFAST8	"o"	/* uint_fast8_t		*/
-#define	SCNoFAST16	"o"	/* uint_fast16_t	*/
-#else
-#define	SCNoLEAST64	"llo"	/* uint_least64_t	*/
-#define	SCNoFAST8	"hho"	/* uint_fast8_t		*/
-#define	SCNoFAST16	"ho"	/* uint_fast16_t	*/
-#endif
-#define	SCNoFAST32	"o"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	SCNoFAST64	"lo"	/* uint_fast64_t	*/
-#define	SCNoMAX		"lo"	/* uintmax_t		*/
-#else
-#define	SCNoFAST64	"llo"	/* uint_fast64_t	*/
-#define	SCNoMAX		"llo"	/* uintmax_t		*/
-#endif
-#define	SCNoPTR		"lo"	/* uintptr_t		*/
-
-#define	SCNu8		"hhu"	/* uint8_t		*/
-#define	SCNu16		"hu"	/* uint16_t		*/
-#define	SCNu32		"u"	/* uint32_t		*/
-#ifdef _LP64
-#define	SCNu64		"lu"	/* uint64_t		*/
-#else
-#define	SCNu64		"llu"	/* uint64_t		*/
-#endif
-#define	SCNuLEAST8	"hhu"	/* uint_least8_t	*/
-#define	SCNuLEAST16	"hu"	/* uint_least16_t	*/
-#define	SCNuLEAST32	"u"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	SCNuLEAST64	"lu"	/* uint_least64_t	*/
-#define	SCNuFAST8	"u"	/* uint_fast8_t		*/
-#define	SCNuFAST16	"u"	/* uint_fast16_t	*/
-#else
-#define	SCNuLEAST64	"llu"	/* uint_least64_t	*/
-#define	SCNuFAST8	"hhu"	/* uint_fast8_t		*/
-#define	SCNuFAST16	"hu"	/* uint_fast16_t	*/
-#endif
-#define	SCNuFAST32	"u"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	SCNuFAST64	"lu"	/* uint_fast64_t	*/
-#define	SCNuMAX		"lu"	/* uintmax_t		*/
-#else
-#define	SCNuFAST64	"llu"	/* uint_fast64_t	*/
-#define	SCNuMAX		"llu"	/* uintmax_t		*/
-#endif
-#define	SCNuPTR		"lu"	/* uintptr_t		*/
-
-#define	SCNx8		"hhx"	/* uint8_t		*/
-#define	SCNx16		"hx"	/* uint16_t		*/
-#define	SCNx32		"x"	/* uint32_t		*/
-#ifdef _LP64
-#define	SCNx64		"lx"	/* uint64_t		*/
-#else
-#define	SCNx64		"llx"	/* uint64_t		*/
-#endif
-#define	SCNxLEAST8	"hhx"	/* uint_least8_t	*/
-#define	SCNxLEAST16	"hx"	/* uint_least16_t	*/
-#define	SCNxLEAST32	"x"	/* uint_least32_t	*/
-#ifdef _LP64
-#define	SCNxLEAST64	"lx"	/* uint_least64_t	*/
-#define	SCNxFAST8	"x"	/* uint_fast8_t		*/
-#define	SCNxFAST16	"x"	/* uint_fast16_t	*/
-#else
-#define	SCNxLEAST64	"llx"	/* uint_least64_t	*/
-#define	SCNxFAST8	"hhx"	/* uint_fast8_t		*/
-#define	SCNxFAST16	"hx"	/* uint_fast16_t	*/
-#endif
-#define	SCNxFAST32	"x"	/* uint_fast32_t	*/
-#ifdef _LP64
-#define	SCNxFAST64	"lx"	/* uint_fast64_t	*/
-#define	SCNxMAX		"lx"	/* uintmax_t		*/
-#else
-#define	SCNxFAST64	"llx"	/* uint_fast64_t	*/
-#define	SCNxMAX		"llx"	/* uintmax_t		*/
-#endif
-#define	SCNxPTR		"lx"	/* uintptr_t		*/
-
-#endif /* !__INTPTR_FMTd__ */
-
-#endif /* !_RISCV_INT_FMTIO_H_ */
\ No newline at end of file