[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 10/13] cuda.c: refactor get_tb() so that the time c
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-ppc] [PATCH v2 10/13] cuda.c: refactor get_tb() so that the time can be passed in |
Date: |
Wed, 11 Nov 2015 22:49:48 +0000 |
This is in preparation for sharing the code between timers.
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: David Gibson <address@hidden>
---
hw/misc/macio/cuda.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index c0a3a68..e61a3c5 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -143,10 +143,9 @@ static void cuda_update_irq(CUDAState *s)
}
}
-static uint64_t get_tb(uint64_t freq)
+static uint64_t get_tb(uint64_t time, uint64_t freq)
{
- return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
- freq, get_ticks_per_sec());
+ return muldiv64(time, freq, get_ticks_per_sec());
}
static unsigned int get_counter(CUDATimer *s)
@@ -154,9 +153,10 @@ static unsigned int get_counter(CUDATimer *s)
int64_t d;
unsigned int counter;
uint64_t tb_diff;
+ uint64_t current_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
/* Reverse of the tb calculation algorithm that Mac OS X uses on bootup. */
- tb_diff = get_tb(s->frequency) - s->load_time;
+ tb_diff = get_tb(current_time, s->frequency) - s->load_time;
d = (tb_diff * 0xBF401675E5DULL) / (s->frequency << 24);
if (s->index == 0) {
@@ -176,7 +176,8 @@ static unsigned int get_counter(CUDATimer *s)
static void set_counter(CUDAState *s, CUDATimer *ti, unsigned int val)
{
CUDA_DPRINTF("T%d.counter=%d\n", 1 + (ti->timer == NULL), val);
- ti->load_time = get_tb(s->frequency);
+ ti->load_time = get_tb(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
+ s->frequency);
ti->counter_value = val;
cuda_timer_update(s, ti, ti->load_time);
}
--
1.7.10.4
- [Qemu-ppc] [PATCH v2 01/13] PPC: Allow Rc bit to be set on mtspr, (continued)
- [Qemu-ppc] [PATCH v2 01/13] PPC: Allow Rc bit to be set on mtspr, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 02/13] PPC: Fix lswx bounds checks, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 04/13] cuda.c: fix CUDA ADB error packet format, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 03/13] PPC: mac99: Always add USB controller, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 05/13] cuda.c: fix CUDA_PACKET response packet format, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 06/13] cuda.c: implement simple CUDA_GET_6805_ADDR command, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 07/13] cuda.c: implement dummy IIC access commands, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 08/13] cuda.c: fix CUDA SR interrupt clearing, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 09/13] cuda.c: add defines for CUDA registers, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 13/13] cuda.c: add delay to setting of SR_INT bit, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 10/13] cuda.c: refactor get_tb() so that the time can be passed in,
Mark Cave-Ayland <=
- [Qemu-ppc] [PATCH v2 11/13] cuda.c: rename get_counter() state variable from s to ti for consistency, Mark Cave-Ayland, 2015/11/11
- [Qemu-ppc] [PATCH v2 12/13] cuda.c: fix T2 timer and enable its interrupt, Mark Cave-Ayland, 2015/11/11
- Re: [Qemu-ppc] [PATCH v2 00/13] Mac OS 9 compatibility improvements (upstream rework), David Gibson, 2015/11/11