From 7f20a263185067738584ef1b66dcbf796997e7db Mon Sep 17 00:00:00 2001 From: tracer-ics2023 Date: Sat, 14 Sep 2024 12:23:29 +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=2012:23:28=20up=202=20days,?= =?UTF-8?q?=20=202:37,=20=201=20user,=20=20load=20average:=200.20,=200.34,?= =?UTF-8?q?=200.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abstract-machine/am/src/platform/nemu/ioe/timer.c | 2 +- abstract-machine/klib/include/klib-macros.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abstract-machine/am/src/platform/nemu/ioe/timer.c b/abstract-machine/am/src/platform/nemu/ioe/timer.c index 251c31f..a22c539 100644 --- a/abstract-machine/am/src/platform/nemu/ioe/timer.c +++ b/abstract-machine/am/src/platform/nemu/ioe/timer.c @@ -18,7 +18,7 @@ void __am_timer_init() { void __am_timer_uptime(AM_TIMER_UPTIME_T *uptime) { (*(volatile AM_TIMER_UPTIME_T *)uptime).us = GET_TIME() - __timer_start; - PNT_BITS(uptime->us); + PNT_BITS(uptime->us); } void __am_timer_rtc(AM_TIMER_RTC_T *rtc) { diff --git a/abstract-machine/klib/include/klib-macros.h b/abstract-machine/klib/include/klib-macros.h index 1f7c370..7789f86 100644 --- a/abstract-machine/klib/include/klib-macros.h +++ b/abstract-machine/klib/include/klib-macros.h @@ -16,8 +16,8 @@ ({ for (const char *p = s; *p; p++) putch(*p); }) #define io_read(reg) \ - ({ reg##_T __io_param; \ - ioe_read(reg, &__io_param); \ + ({ volatile reg##_T __io_param; \ + ioe_read(reg, (void*)&__io_param); \ __io_param; }) #define io_write(reg, ...) \