From 525b3585340d37926516321838eb380fff3705f0 Mon Sep 17 00:00:00 2001 From: tracer-ics2023 Date: Sat, 14 Sep 2024 12:43:15 +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:43:15=20up=202=20days,?= =?UTF-8?q?=20=202:57,=20=201=20user,=20=20load=20average:=200.94,=200.59,?= =?UTF-8?q?=200.45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abstract-machine/klib/include/klib-macros.h | 2 +- nemu/src/device/timer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abstract-machine/klib/include/klib-macros.h b/abstract-machine/klib/include/klib-macros.h index d943b06..1f7c370 100644 --- a/abstract-machine/klib/include/klib-macros.h +++ b/abstract-machine/klib/include/klib-macros.h @@ -17,7 +17,7 @@ #define io_read(reg) \ ({ reg##_T __io_param; \ - ioe_read(reg, (void*)&__io_param); \ + ioe_read(reg, &__io_param); \ __io_param; }) #define io_write(reg, ...) \ diff --git a/nemu/src/device/timer.c b/nemu/src/device/timer.c index 2aff819..98ced99 100644 --- a/nemu/src/device/timer.c +++ b/nemu/src/device/timer.c @@ -23,8 +23,8 @@ static void rtc_io_handler(uint32_t offset, int len, bool is_write) { assert(offset == 0 || offset == 4); if (!is_write && offset == 4) { uint64_t us = get_time(); - rtc_port_base[0] = (uint32_t)us; - rtc_port_base[1] = us >> 32; + ((volatile uint32_t*)rtc_port_base)[0] = (uint32_t)us; + ((volatile uint32_t*)rtc_port_base)[1] = us >> 32; } }