From eff431fde256326916315c1ebb8e5de86f9252fa Mon Sep 17 00:00:00 2001 From: tracer-ics2023 Date: Sat, 14 Sep 2024 18:07:44 +0800 Subject: [PATCH] =?UTF-8?q?>=20=20compile=20NEMU=20221220000=20=E5=BC=A0?= =?UTF-8?q?=E4=B8=89=20Linux=20zzy=205.15.146.1-microsoft-standard-WSL2=20?= =?UTF-8?q?#1=20SMP=20Thu=20Jan=2011=2004:09:03=20UTC=202024=20x86=5F64=20?= =?UTF-8?q?x86=5F64=20x86=5F64=20GNU/Linux=20=2018:07:44=20up=202=20days,?= =?UTF-8?q?=20=208:21,=20=201=20user,=20=20load=20average:=200.39,=200.44,?= =?UTF-8?q?=200.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abstract-machine/am/src/platform/nemu/ioe/timer.c | 7 ++----- nemu/src/device/io/map.c | 2 +- nemu/src/device/timer.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/abstract-machine/am/src/platform/nemu/ioe/timer.c b/abstract-machine/am/src/platform/nemu/ioe/timer.c index a566162..8a0daa7 100644 --- a/abstract-machine/am/src/platform/nemu/ioe/timer.c +++ b/abstract-machine/am/src/platform/nemu/ioe/timer.c @@ -17,11 +17,8 @@ void __am_timer_init() { } void __am_timer_uptime(AM_TIMER_UPTIME_T *uptime) { - volatile uint32_t lower_timer = inl(RTC_ADDR); - volatile uint32_t high_timer = inl(RTC_ADDR + 4); - volatile uint64_t timer = lower_timer + (((uint64_t) high_timer) << 32); - (*(volatile AM_TIMER_UPTIME_T *)uptime).us = timer - __timer_start; - PNT_BITS(uptime->us); + (*(volatile AM_TIMER_UPTIME_T *)uptime).us = GET_TIME() - __timer_start; + //PNT_BITS(uptime->us); } void __am_timer_rtc(AM_TIMER_RTC_T *rtc) { diff --git a/nemu/src/device/io/map.c b/nemu/src/device/io/map.c index 045d6ac..c3ab777 100644 --- a/nemu/src/device/io/map.c +++ b/nemu/src/device/io/map.c @@ -59,7 +59,7 @@ word_t map_read(paddr_t addr, int len, IOMap *map) { invoke_callback(map->callback, offset, len, false); // prepare data to read word_t ret = host_read(map->space + offset, len); //word_t ret = *(word_t*)(map->space + offset); -printf("map_read: %p, %d\n", map->space + offset, ret); +//printf("map_read: %p, %d\n", map->space + offset, ret); return ret; } diff --git a/nemu/src/device/timer.c b/nemu/src/device/timer.c index 3fe5b1c..7384369 100644 --- a/nemu/src/device/timer.c +++ b/nemu/src/device/timer.c @@ -26,7 +26,7 @@ static void rtc_io_handler(uint32_t offset, int len, bool is_write) { printf("rtc_io_handle %ld\n", us); rtc_port_base[0] = (uint32_t)us; rtc_port_base[1] = us >> 32; - printf("rtc_port_handle %d, %d [%p]\n", rtc_port_base[0], rtc_port_base[1], rtc_port_base); + //printf("rtc_port_handle %d, %d [%p]\n", rtc_port_base[0], rtc_port_base[1], rtc_port_base); } }