[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/30] semihosting: Implement SYS_ELAPSED and SYS_TICKFREQ
From: |
Alex Bennée |
Subject: |
[PULL 28/30] semihosting: Implement SYS_ELAPSED and SYS_TICKFREQ |
Date: |
Fri, 15 Jan 2021 13:08:26 +0000 |
From: Keith Packard <keithp@keithp.com>
These are part of Semihosting for AArch32 and AArch64 Release 2.0
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210107170717.2098982-8-keithp@keithp.com>
Message-Id: <20210108224256.2321-19-alex.bennee@linaro.org>
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 61296ea980..1678238384 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -808,6 +808,8 @@ static inline int64_t get_clock_realtime(void)
return tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000);
}
+extern int64_t clock_start;
+
/* Warning: don't insert tracepoints into these functions, they are
also used by simpletrace backend and tracepoints would cause
an infinite recursion! */
diff --git a/hw/semihosting/arm-compat-semi.c b/hw/semihosting/arm-compat-semi.c
index 5fcb8663c6..3d6604dcdd 100644
--- a/hw/semihosting/arm-compat-semi.c
+++ b/hw/semihosting/arm-compat-semi.c
@@ -38,6 +38,7 @@
#include "hw/semihosting/console.h"
#include "hw/semihosting/common-semi.h"
#include "qemu/log.h"
+#include "qemu/timer.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
@@ -73,6 +74,8 @@
#define TARGET_SYS_EXIT 0x18
#define TARGET_SYS_SYNCCACHE 0x19
#define TARGET_SYS_EXIT_EXTENDED 0x20
+#define TARGET_SYS_ELAPSED 0x30
+#define TARGET_SYS_TICKFREQ 0x31
/* ADP_Stopped_ApplicationExit is used for exit(0),
* anything else is implemented as exit(1) */
@@ -837,6 +840,7 @@ target_ulong do_common_semihosting(CPUState *cs)
uint32_t ret;
uint32_t len;
GuestFD *gf;
+ int64_t elapsed;
(void) env; /* Used implicitly by arm lock_user macro */
nr = common_semi_arg(cs, 0) & 0xffffffffU;
@@ -1246,6 +1250,18 @@ target_ulong do_common_semihosting(CPUState *cs)
}
gdb_exit(ret);
exit(ret);
+ case TARGET_SYS_ELAPSED:
+ elapsed = get_clock() - clock_start;
+ if (sizeof(target_ulong) == 8) {
+ SET_ARG(0, elapsed);
+ } else {
+ SET_ARG(0, (uint32_t) elapsed);
+ SET_ARG(1, (uint32_t) (elapsed >> 32));
+ }
+ return 0;
+ case TARGET_SYS_TICKFREQ:
+ /* qemu always uses nsec */
+ return 1000000000;
case TARGET_SYS_SYNCCACHE:
/*
* Clean the D-cache and invalidate the I-cache for the specified
diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c
index baf3317f74..cc1326f726 100644
--- a/util/qemu-timer-common.c
+++ b/util/qemu-timer-common.c
@@ -27,6 +27,8 @@
/***********************************************************/
/* real time host monotonic timer */
+int64_t clock_start;
+
#ifdef _WIN32
int64_t clock_freq;
@@ -41,6 +43,7 @@ static void __attribute__((constructor)) init_get_clock(void)
exit(1);
}
clock_freq = freq.QuadPart;
+ clock_start = get_clock();
}
#else
@@ -55,5 +58,6 @@ static void __attribute__((constructor)) init_get_clock(void)
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
use_rt_clock = 1;
}
+ clock_start = get_clock();
}
#endif
--
2.20.1
- [PULL 04/30] Add newline when generating Dockerfile, (continued)
- [PULL 04/30] Add newline when generating Dockerfile, Alex Bennée, 2021/01/15
- [PULL 05/30] Makefile: wrap ctags in quiet-command calls, Alex Bennée, 2021/01/15
- [PULL 17/30] gdbstub: add support to Xfer:auxv:read: packet, Alex Bennée, 2021/01/15
- [PULL 25/30] semihosting: Support SYS_HEAPINFO when env->boot_info is not set, Alex Bennée, 2021/01/15
- [PULL 13/30] test/guest-debug: echo QEMU command as well, Alex Bennée, 2021/01/15
- [PULL 14/30] configure: gate our use of GDB to 8.3.1 or above, Alex Bennée, 2021/01/15
- [PULL 21/30] target/arm: use official org.gnu.gdb.aarch64.sve layout for registers, Alex Bennée, 2021/01/15
- [PULL 30/30] semihosting: Implement SYS_ISERROR, Alex Bennée, 2021/01/15
- [PULL 29/30] semihosting: Implement SYS_TMPNAM, Alex Bennée, 2021/01/15
- [PULL 07/30] Makefile: wrap cscope in quiet-command calls, Alex Bennée, 2021/01/15
- [PULL 28/30] semihosting: Implement SYS_ELAPSED and SYS_TICKFREQ,
Alex Bennée <=
- [PULL 16/30] gdbstub: implement a softmmu based test, Alex Bennée, 2021/01/15
- [PULL 18/30] gdbstub: drop CPUEnv from gdb_exit(), Alex Bennée, 2021/01/15
- [PULL 19/30] gdbstub: drop gdbserver_cleanup in favour of gdb_exit, Alex Bennée, 2021/01/15
- [PULL 23/30] semihosting: Change common-semi API to be architecture-independent, Alex Bennée, 2021/01/15
- [PULL 08/30] docker: expand debian-amd64 image to include tag tools, Alex Bennée, 2021/01/15
- [PULL 27/30] riscv: Add semihosting support for user mode, Alex Bennée, 2021/01/15
- [PULL 20/30] gdbstub: ensure we clean-up when terminated, Alex Bennée, 2021/01/15
- [PULL 22/30] semihosting: Move ARM semihosting code to shared directories, Alex Bennée, 2021/01/15
- [PULL 15/30] Revert "tests/tcg/multiarch/Makefile.target: Disable run-gdbstub-sha1 test", Alex Bennée, 2021/01/15
- [PULL 10/30] Fix build with new yank feature by adding stubs, Alex Bennée, 2021/01/15