zzy/NJU_PA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

> compile NEMU

Browse Source 
221220000 张三
Linux zzy 5.15.146.1-microsoft-standard-WSL2 #1 SMP Thu Jan 11 04:09:03 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
 20:29:35 up 2 days, 10:43,  1 user,  load average: 1.25, 0.64, 0.47
This commit is contained in:
tracer-ics2023
2024-09-14 20:29:36 +08:00
committed by zzy
parent c5c726ad12
commit 54697370c7
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
abstract-machine/am/src/platform/nemu/include/nemu.h
View File

@ -47,4 +47,11 @@ typedef uintptr_t PTE;
#define PGSIZE 4096 #define PGSIZE 4096
#define PNT_BITS(num, sz, head) do { \
putch(head); \
for (uint8_t size = sz; size; size --) \
putch('0' + ((num >> (size - 1)) & 1)); \
putch('\n'); \
} while (0)
#endif #endif

1
abstract-machine/am/src/platform/nemu/ioe/input.c
View File

@ -6,4 +6,5 @@
void __am_input_keybrd(AM_INPUT_KEYBRD_T *kbd) { void __am_input_keybrd(AM_INPUT_KEYBRD_T *kbd) {
kbd->keycode = inl(KBD_ADDR); kbd->keycode = inl(KBD_ADDR);
kbd->keydown = 0; // kbd->keycode & KEYDOWN_MASK; kbd->keydown = 0; // kbd->keycode & KEYDOWN_MASK;
PNT_BITS(kbd->keycode, 32, 'K');
} }

9
abstract-machine/am/src/platform/nemu/ioe/timer.c
View File

@ -3,13 +3,6 @@
#define GET_TIME() ((uint64_t) (uint32_t)inl(RTC_ADDR) | ((uint64_t) (uint32_t)inl(RTC_ADDR + 4) << 32)) #define GET_TIME() ((uint64_t) (uint32_t)inl(RTC_ADDR) | ((uint64_t) (uint32_t)inl(RTC_ADDR + 4) << 32))
#define PNT_BITS(num) do { \
putch('T'); \
for (uint8_t size = 64; size; size --) \
putch('0' + ((num >> (size - 1)) & 1)); \
putch('\n'); \
} while (0)
uint64_t __timer_start; uint64_t __timer_start;
void __am_timer_init() { void __am_timer_init() {
@ -18,7 +11,7 @@ void __am_timer_init() {
void __am_timer_uptime(AM_TIMER_UPTIME_T *uptime) { void __am_timer_uptime(AM_TIMER_UPTIME_T *uptime) {
(*(volatile AM_TIMER_UPTIME_T *)uptime).us = GET_TIME() - __timer_start; (*(volatile AM_TIMER_UPTIME_T *)uptime).us = GET_TIME() - __timer_start;
//PNT_BITS(uptime->us); //PNT_BITS(uptime->us, 64, 'T');
} }
void __am_timer_rtc(AM_TIMER_RTC_T *rtc) { void __am_timer_rtc(AM_TIMER_RTC_T *rtc) {