[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/43] target/hppa: Implement the interval timer
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 19/43] target/hppa: Implement the interval timer |
Date: |
Sun, 21 Jan 2018 19:41:53 -0800 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/hppa/cpu.h | 2 ++
target/hppa/helper.h | 3 +++
target/hppa/cpu.c | 8 ++++++++
target/hppa/int_helper.c | 6 ++++++
target/hppa/op_helper.c | 36 ++++++++++++++++++++++++++++++++++++
target/hppa/translate.c | 16 ++++++++++++----
6 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index fc3e62c0af..31a3702684 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -234,6 +234,7 @@ struct HPPACPU {
/*< public >*/
CPUHPPAState env;
+ QEMUTimer *alarm_timer;
};
static inline HPPACPU *hppa_env_get_cpu(CPUHPPAState *env)
@@ -341,6 +342,7 @@ int hppa_cpu_handle_mmu_fault(CPUState *cpu, vaddr address,
int rw, int midx);
int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
MMUAccessType type, hwaddr *pphys, int *pprot);
extern const MemoryRegionOps hppa_io_eir_ops;
+void hppa_cpu_alarm_timer(void *);
#endif
#endif /* HPPA_CPU_H */
diff --git a/target/hppa/helper.h b/target/hppa/helper.h
index 535f086ab4..744b11cb66 100644
--- a/target/hppa/helper.h
+++ b/target/hppa/helper.h
@@ -77,9 +77,12 @@ DEF_HELPER_FLAGS_4(fmpynfadd_s, TCG_CALL_NO_RWG, i32, env,
i32, i32, i32)
DEF_HELPER_FLAGS_4(fmpyfadd_d, TCG_CALL_NO_RWG, i64, env, i64, i64, i64)
DEF_HELPER_FLAGS_4(fmpynfadd_d, TCG_CALL_NO_RWG, i64, env, i64, i64, i64)
+DEF_HELPER_FLAGS_0(read_interval_timer, TCG_CALL_NO_RWG, tr)
+
#ifndef CONFIG_USER_ONLY
DEF_HELPER_1(rfi, void, env)
DEF_HELPER_1(rfi_r, void, env)
+DEF_HELPER_FLAGS_2(write_interval_timer, TCG_CALL_NO_RWG, void, env, tr)
DEF_HELPER_FLAGS_2(write_eirr, TCG_CALL_NO_RWG, void, env, tr)
DEF_HELPER_FLAGS_2(write_eiem, TCG_CALL_NO_RWG, void, env, tr)
DEF_HELPER_FLAGS_2(swap_system_mask, TCG_CALL_NO_RWG, tr, env, tr)
diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index 7837d10381..86f5cb0bfe 100644
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -97,6 +97,14 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error
**errp)
qemu_init_vcpu(cs);
acc->parent_realize(dev, errp);
+
+#ifndef CONFIG_USER_ONLY
+ {
+ HPPACPU *cpu = HPPA_CPU(cs);
+ cpu->alarm_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+ hppa_cpu_alarm_timer, cpu);
+ }
+#endif
}
/* Sort hppabetically by type name. */
diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c
index 74ab34f306..ee72769544 100644
--- a/target/hppa/int_helper.c
+++ b/target/hppa/int_helper.c
@@ -67,6 +67,12 @@ const MemoryRegionOps hppa_io_eir_ops = {
.impl.max_access_size = 4,
};
+void hppa_cpu_alarm_timer(void *opaque)
+{
+ /* Raise interrupt 0. */
+ io_eir_write(opaque, 0, 0, 4);
+}
+
void HELPER(write_eirr)(CPUHPPAState *env, target_ureg val)
{
env->cr[CR_EIRR] &= ~val;
diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c
index 1963b2439b..6d19cab6c9 100644
--- a/target/hppa/op_helper.c
+++ b/target/hppa/op_helper.c
@@ -22,6 +22,8 @@
#include "exec/exec-all.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
+#include "qemu/timer.h"
+
void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp)
{
@@ -602,7 +604,41 @@ float64 HELPER(fmpynfadd_d)(CPUHPPAState *env, float64 a,
float64 b, float64 c)
return ret;
}
+target_ureg HELPER(read_interval_timer)(void)
+{
+#ifdef CONFIG_USER_ONLY
+ /* In user-mode, QEMU_CLOCK_VIRTUAL doesn't exist.
+ Just pass through the host cpu clock ticks. */
+ return cpu_get_host_ticks();
+#else
+ /* In system mode we have access to a decent high-resolution clock.
+ In order to make OS-level time accounting work with the cr16,
+ present it with a well-timed clock fixed at 250MHz. */
+ return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 2;
+#endif
+}
+
#ifndef CONFIG_USER_ONLY
+void HELPER(write_interval_timer)(CPUHPPAState *env, target_ureg val)
+{
+ HPPACPU *cpu = hppa_env_get_cpu(env);
+ uint64_t current = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ uint64_t timeout;
+
+ /* Even in 64-bit mode, the comparator is always 32-bit. But the
+ value we expose to the guest is 1/4 of the speed of the clock,
+ so moosh in 34 bits. */
+ timeout = deposit64(current, 0, 34, (uint64_t)val << 2);
+
+ /* If the mooshing puts the clock in the past, advance to next round. */
+ if (timeout < current + 1000) {
+ timeout += 1ULL << 34;
+ }
+
+ cpu->env.cr[CR_IT] = timeout;
+ timer_mod(cpu->alarm_timer, timeout);
+}
+
target_ureg HELPER(swap_system_mask)(CPUHPPAState *env, target_ureg nsm)
{
target_ulong psw = env->psw;
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index cac21dbe2f..cad661e39f 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -2027,6 +2027,7 @@ static DisasJumpType trans_mfctl(DisasContext *ctx,
uint32_t insn,
unsigned rt = extract32(insn, 0, 5);
unsigned ctl = extract32(insn, 21, 5);
TCGv_reg tmp;
+ DisasJumpType ret;
switch (ctl) {
case CR_SAR:
@@ -2045,9 +2046,17 @@ static DisasJumpType trans_mfctl(DisasContext *ctx,
uint32_t insn,
/* FIXME: Respect PSW_S bit. */
nullify_over(ctx);
tmp = dest_gpr(ctx, rt);
- tcg_gen_movi_reg(tmp, 0); /* FIXME */
+ if (ctx->base.tb->cflags & CF_USE_ICOUNT) {
+ gen_io_start();
+ gen_helper_read_interval_timer(tmp);
+ gen_io_end();
+ ret = DISAS_IAQ_N_STALE;
+ } else {
+ gen_helper_read_interval_timer(tmp);
+ ret = DISAS_NEXT;
+ }
save_gpr(ctx, rt, tmp);
- break;
+ return nullify_end(ctx, ret);
case 26:
case 27:
break;
@@ -2121,9 +2130,8 @@ static DisasJumpType trans_mtctl(DisasContext *ctx,
uint32_t insn,
nullify_over(ctx);
switch (ctl) {
case CR_IT:
- /* ??? modify interval timer offset */
+ gen_helper_write_interval_timer(cpu_env, reg);
break;
-
case CR_EIRR:
gen_helper_write_eirr(cpu_env, reg);
break;
--
2.14.3
- [Qemu-devel] [PULL 12/43] target/hppa: Fill in hppa_cpu_do_interrupt/hppa_cpu_exec_interrupt, (continued)
- [Qemu-devel] [PULL 12/43] target/hppa: Fill in hppa_cpu_do_interrupt/hppa_cpu_exec_interrupt, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 05/43] target/hppa: Split address size from register size, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 15/43] target/hppa: Avoid privilege level decrease during branches, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 17/43] target/hppa: Implement tlb_fill, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 14/43] target/hppa: Use space registers in data operations, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 16/43] target/hppa: Implement IASQ, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 20/43] target/hppa: Log unimplemented instructions, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 21/43] target/hppa: Implement I*TLBA and I*TLBP insns, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 18/43] target/hppa: Implement external interrupts, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 22/43] target/hppa: Implement P*TLB and P*TLBE insns, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 19/43] target/hppa: Implement the interval timer,
Richard Henderson <=
- [Qemu-devel] [PULL 23/43] target/hppa: Implement LDWA, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 26/43] target/hppa: Implement SYNCDMA insn, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 27/43] target/hppa: Implement halt and reset instructions, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 25/43] target/hppa: Implement LCI, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 24/43] target/hppa: Implement LPA, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 30/43] target/hppa: Add migration for the cpu, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 28/43] target/hppa: Optimize for flat addressing space, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 31/43] target/hppa: Implement B,GATE insn, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 33/43] qom: Add MMU_DEBUG_LOAD, Richard Henderson, 2018/01/21
- [Qemu-devel] [PULL 32/43] target/hppa: Only use EXCP_DTLB_MISS, Richard Henderson, 2018/01/21