diff mbox series

include: simplify the definition of s64/u64/int64/uint64

Message ID 20210706141458.61637-1-wxjstz@126.com
State Rejected
Headers show
Series include: simplify the definition of s64/u64/int64/uint64 | expand

Commit Message

Xiang W July 6, 2021, 2:14 p.m. UTC 
The length of long long in RV32 and RV64 is both 64 bits, and there is no
need to use conditional compilation to define 64-bit related types

Signed-off-by: Xiang W <wxjstz@126.com>
---
 include/sbi/sbi_types.h | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/include/sbi/sbi_types.h b/include/sbi/sbi_types.h
index 38e3565..44f873e 100644
--- a/include/sbi/sbi_types.h
+++ b/include/sbi/sbi_types.h
@@ -28,21 +28,10 @@  typedef unsigned int		u32;
 typedef int			int32_t;
 typedef unsigned int		uint32_t;
 
-#if __riscv_xlen == 64
-typedef long			s64;
-typedef unsigned long		u64;
-typedef long			int64_t;
-typedef unsigned long		uint64_t;
-#define PRILX			"016lx"
-#elif __riscv_xlen == 32
 typedef long long		s64;
 typedef unsigned long long	u64;
 typedef long long		int64_t;
 typedef unsigned long long	uint64_t;
-#define PRILX			"08lx"
-#else
-#error "Unexpected __riscv_xlen"
-#endif
 
 typedef int			bool;
 typedef unsigned long		ulong;
@@ -54,6 +43,14 @@  typedef unsigned long		virtual_size_t;
 typedef unsigned long		physical_addr_t;
 typedef unsigned long		physical_size_t;
 
+#if __riscv_xlen == 64
+#define PRILX			"016lx"
+#elif __riscv_xlen == 32
+#define PRILX			"08lx"
+#else
+#error "Unexpected __riscv_xlen"
+#endif
+
 #define TRUE			1
 #define FALSE			0
 #define true			TRUE