diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-06-28 19:31:32 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-23 02:41:32 +0200 |
| commit | bdf7ae5bbdb3f050d97862b2ba0261fa902ebc53 (patch) | |
| tree | dec1f74f86690f2f5e7e9682e82ae08e40c0ac49 /target-sparc | |
| parent | b42eab27beaefd5c9bf9353383d6403e0628c014 (diff) | |
| download | qemu-bdf7ae5bbdb3f050d97862b2ba0261fa902ebc53.tar.gz | |
cpu: Introduce CPUClass::synchronize_from_tb() for cpu_pc_from_tb()
Where no extra implementation is needed, fall back to CPUClass::set_pc().
Acked-by: Michael Walle <michael@walle.cc> (for lm32)
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-sparc')
| -rw-r--r-- | target-sparc/cpu.c | 9 | ||||
| -rw-r--r-- | target-sparc/cpu.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 88582c6a9b..a2deba5a06 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -731,6 +731,14 @@ static void sparc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.npc = value + 4; } +static void sparc_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) +{ + SPARCCPU *cpu = SPARC_CPU(cs); + + cpu->env.pc = tb->pc; + cpu->env.npc = tb->cs_base; +} + static void sparc_cpu_realizefn(DeviceState *dev, Error **errp) { SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(dev); @@ -776,6 +784,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->dump_state = sparc_cpu_dump_state; cpu_class_set_do_unassigned_access(cc, sparc_cpu_unassigned_access); cc->set_pc = sparc_cpu_set_pc; + cc->synchronize_from_tb = sparc_cpu_synchronize_from_tb; } static const TypeInfo sparc_cpu_type_info = { diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 41b014a0b3..0f35a2216f 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -759,10 +759,4 @@ static inline bool cpu_has_work(CPUState *cpu) #include "exec/exec-all.h" -static inline void cpu_pc_from_tb(CPUSPARCState *env, TranslationBlock *tb) -{ - env->pc = tb->pc; - env->npc = tb->cs_base; -} - #endif |