aboutsummaryrefslogtreecommitdiff
path: root/linux-user/main.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-07-13 23:20:22 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-07-13 23:20:22 +0000
commit1dce7c3c2244a6f149e7afd7b1d84963ed57b7fd (patch)
tree692d4ec2e89b191c3900a0baaa98a9e8f7c31b22 /linux-user/main.c
parenteffedbc915c51bf2f65818960671fef2bf8c54cf (diff)
new clock logic: cpu ticks and virtual clocks are no longer proportional - added timestamps on the stdio console
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2049 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user/main.c')
-rw-r--r--linux-user/main.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 2250b127a4..6c3d5db7ee 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -107,29 +107,7 @@ int cpu_get_pic_interrupt(CPUState *env)
/* timers for rdtsc */
-#if defined(__i386__)
-
-int64_t cpu_get_real_ticks(void)
-{
- int64_t val;
- asm volatile ("rdtsc" : "=A" (val));
- return val;
-}
-
-#elif defined(__x86_64__)
-
-int64_t cpu_get_real_ticks(void)
-{
- uint32_t low,high;
- int64_t val;
- asm volatile("rdtsc" : "=a" (low), "=d" (high));
- val = high;
- val <<= 32;
- val |= low;
- return val;
-}
-
-#else
+#if 0
static uint64_t emu_time;