ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cuda.c: refactor get_tb() so that the time can be passed in 

This is in preparation for sharing the code between timers.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2015-11-11 22:49:48 +00:00 committed by David Gibson
parent b5ac04103b
commit eda14abbb8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/misc/macio/cuda.c
View File

@ -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), return muldiv64(time, freq, get_ticks_per_sec());
freq, get_ticks_per_sec());
} }
static unsigned int get_counter(CUDATimer *s) static unsigned int get_counter(CUDATimer *s)
@ -154,9 +153,10 @@ static unsigned int get_counter(CUDATimer *s)
int64_t d; int64_t d;
unsigned int counter; unsigned int counter;
uint64_t tb_diff; 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. */ /* 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); d = (tb_diff * 0xBF401675E5DULL) / (s->frequency << 24);
if (s->index == 0) { 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) static void set_counter(CUDAState *s, CUDATimer *ti, unsigned int val)
{ {
CUDA_DPRINTF("T%d.counter=%d\n", 1 + (ti->timer == NULL), 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; ti->counter_value = val;
cuda_timer_update(s, ti, ti->load_time); cuda_timer_update(s, ti, ti->load_time);
} }