From 54dd2cfe1d952e71d376d1c1c31b87bbe7df1c2b Mon Sep 17 00:00:00 2001
From: Santosh Srivatsan <santosh.srivatsan@gmail.com>
Date: Tue, 1 Feb 2022 14:02:46 -0500
Subject: [PATCH] Added xlen parameterization to types.h instead of xlen.h

---
 sim/simx/types.h | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/sim/simx/types.h b/sim/simx/types.h
index d011effe..fb0e9e64 100644
--- a/sim/simx/types.h
+++ b/sim/simx/types.h
@@ -9,14 +9,27 @@
 #include <simobject.h>
 #include <xlen.h>
 
+#if XLEN == 32
+#define uintx_t uint32_t
+#define intx_t int32_t
+#define uintd_t uint64_t
+#define intd_t int64_t
+#elif XLEN == 64
+#define uintx_t uint64_t
+#define intx_t int64_t
+#define uintd_t __uint128_t
+#define intd_t __int128_t
+#else
+#error unsupported XLEN
+#endif
+
 namespace vortex {
 
-typedef uint8_t  Byte;
-typedef uint32_t Word;
-typedef int32_t  WordI;
-typedef uintx_t  XWord;
-typedef intx_t XWordI;
-typedef uintf_t FWord;
+typedef uint8_t Byte;
+typedef uintx_t Word;
+typedef intx_t  WordI;
+typedef uintd_t DWord;
+typedef intd_t  DWordI;
 
 typedef uintx_t Addr;
 typedef uint32_t Size;