From 17dfbc574574be09359b3769ffa3b71d36b0f978 Mon Sep 17 00:00:00 2001
From: Zihao Yu <yuzihao@ict.ac.cn>
Date: Fri, 15 Nov 2019 10:36:58 +0800
Subject: [PATCH] riscv64-noop: let timer adapt to standard CLINT register
 offset

---
 am/include/nemu.h         | 2 +-
 am/src/riscv64/noop/cte.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/am/include/nemu.h b/am/include/nemu.h
index fd11791d..1e017114 100644
--- a/am/include/nemu.h
+++ b/am/include/nemu.h
@@ -30,7 +30,7 @@
 # define FB_ADDR      0x40000000
 #elif defined(__ARCH_RISCV64_NOOP)
 # define KBD_ADDR     0x40900000
-# define RTC_ADDR     0x40700000
+# define RTC_ADDR     0x4070bff8
 # define SCREEN_ADDR  0x40800000
 # define SYNC_ADDR    0x40800004
 # define FB_ADDR      0x40000000
diff --git a/am/src/riscv64/noop/cte.c b/am/src/riscv64/noop/cte.c
index ee1cda6d..61d13f9e 100644
--- a/am/src/riscv64/noop/cte.c
+++ b/am/src/riscv64/noop/cte.c
@@ -3,8 +3,8 @@
 #include <klib.h>
 
 #define CLINT_MMIO 0x40700000
-#define CLINT_MTIME    (CLINT_MMIO + 0)
-#define CLINT_MTIMECMP (CLINT_MMIO + 8)
+#define CLINT_MTIME    (CLINT_MMIO + 0xbff8)
+#define CLINT_MTIMECMP (CLINT_MMIO + 0x4000)
 #define TIME_INC 10
 static inline void inc_mtimecmp(uint64_t this) {
   outd(CLINT_MTIMECMP, this + TIME_INC);