Skip to content

Commit

Permalink
move cpu_pc_from_tb to target-*/exec.h
Browse files Browse the repository at this point in the history 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
  • Loading branch information
@bonzini @blueswirl
bonzini authored and blueswirl committed Jul 3, 2010
1 parent 83dae09 commit 10eb0cc
Show file tree
Hide file tree
Showing 22 changed files with 65 additions and 59 deletions.
5 changes: 0 additions & 5 deletions target-alpha/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,6 @@ void pal_init (CPUState *env);
void call_pal (CPUState *env);
#endif

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
5 changes: 5 additions & 0 deletions target-alpha/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,9 @@ static inline int cpu_halted(CPUState *env)
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
}

#endif /* !defined (__ALPHA_EXEC_H__) */
5 changes: 0 additions & 5 deletions target-arm/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,6 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
#include "cpu-all.h"
#include "exec-all.h"

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->regs[15] = tb->pc;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
6 changes: 6 additions & 0 deletions target-arm/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,9 @@ static inline int cpu_halted(CPUState *env) {
#endif

void raise_exception(int);

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->regs[15] = tb->pc;
}

5 changes: 0 additions & 5 deletions target-cris/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,6 @@ static inline void cpu_set_tls(CPUCRISState *env, target_ulong newtls)
#include "cpu-all.h"
#include "exec-all.h"

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
6 changes: 6 additions & 0 deletions target-cris/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,9 @@ static inline int cpu_halted(CPUState *env) {
}
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
}

5 changes: 0 additions & 5 deletions target-i386/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,11 +941,6 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
#include "hw/apic.h"
#endif

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->eip = tb->pc - tb->cs_base;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
6 changes: 6 additions & 0 deletions target-i386/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,9 @@ static inline void cpu_load_efer(CPUState *env, uint64_t val)
if (env->efer & MSR_EFER_SVME)
env->hflags |= HF_SVME_MASK;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->eip = tb->pc - tb->cs_base;
}

5 changes: 0 additions & 5 deletions target-m68k/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,6 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
#include "cpu-all.h"
#include "exec-all.h"

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
6 changes: 6 additions & 0 deletions target-m68k/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,9 @@ static inline int cpu_halted(CPUState *env) {
}
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
}

5 changes: 0 additions & 5 deletions target-microblaze/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,6 @@ static inline int cpu_interrupts_enabled(CPUState *env)
#include "cpu-all.h"
#include "exec-all.h"

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->sregs[SR_PC] = tb->pc;
}

static inline target_ulong cpu_get_pc(CPUState *env)
{
return env->sregs[SR_PC];
Expand Down
6 changes: 6 additions & 0 deletions target-microblaze/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,9 @@ static inline int cpu_halted(CPUState *env) {
}
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->sregs[SR_PC] = tb->pc;
}

7 changes: 0 additions & 7 deletions target-mips/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,13 +612,6 @@ target_phys_addr_t cpu_mips_translate_address (CPUState *env, target_ulong addre
int rw);
#endif

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->active_tc.PC = tb->pc;
env->hflags &= ~MIPS_HFLAG_BMASK;
env->hflags |= tb->flags & MIPS_HFLAG_BMASK;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
7 changes: 7 additions & 0 deletions target-mips/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,11 @@ static inline void compute_hflags(CPUState *env)
}
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->active_tc.PC = tb->pc;
env->hflags &= ~MIPS_HFLAG_BMASK;
env->hflags |= tb->flags & MIPS_HFLAG_BMASK;
}

#endif /* !defined(__QEMU_MIPS_EXEC_H__) */
5 changes: 0 additions & 5 deletions target-ppc/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1601,11 +1601,6 @@ enum {

/*****************************************************************************/

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->nip = tb->pc;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
5 changes: 5 additions & 0 deletions target-ppc/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,9 @@ static inline int cpu_halted(CPUState *env)
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->nip = tb->pc;
}

#endif /* !defined (__PPC_H__) */
5 changes: 0 additions & 5 deletions target-s390x/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ extern CPUState *s390_cpu_addr2state(uint16_t cpu_addr);
#define EXCP_ADDR 5 /* addressing exception */
#define EXCP_EXECUTE_SVC 0xff00000 /* supervisor call via execute insn */

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb)
{
env->psw.addr = tb->pc;
}

static inline void cpu_get_tb_cpu_state(CPUState* env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
6 changes: 6 additions & 0 deletions target-s390x/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,9 @@ static inline int cpu_halted(CPUState *env)
}
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb)
{
env->psw.addr = tb->pc;
}

6 changes: 0 additions & 6 deletions target-sh4/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,6 @@ static inline int cpu_ptel_pr (uint32_t ptel)
#define PTEA_TC (1 << 3)
#define cpu_ptea_tc(ptea) (((ptea) & PTEA_TC) >> 3)

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
env->flags = tb->flags;
}

#define TB_FLAG_PENDING_MOVCA (1 << 4)

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
Expand Down
6 changes: 6 additions & 0 deletions target-sh4/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,10 @@ static inline int cpu_halted(CPUState *env) {
#include "softmmu_exec.h"
#endif

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
env->flags = tb->flags;
}

#endif /* _EXEC_SH4_H */
6 changes: 0 additions & 6 deletions target-sparc/cpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,6 @@ void cpu_tick_set_limit(CPUTimer *timer, uint64_t limit);
trap_state* cpu_tsptr(CPUState* env);
#endif

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
env->npc = tb->cs_base;
}

static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
{
Expand Down
6 changes: 6 additions & 0 deletions target-sparc/exec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,10 @@ static inline int cpu_halted(CPUState *env1) {
return EXCP_HALTED;
}

static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
{
env->pc = tb->pc;
env->npc = tb->cs_base;
}

#endif

0 comments on commit 10eb0cc

Please sign in to comment.