target-arm: Move get_mem_index to translate.h
So that it can be shared with the AArch32 code. Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Message-id: 1400980132-25949-2-git-send-email-edgar.iglesias@gmail.com Message-id: 1400805738-11889-5-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
f0aff25570
commit
9d4c4e872e
|
@ -162,15 +162,6 @@ void aarch64_cpu_dump_state(CPUState *cs, FILE *f,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_mem_index(DisasContext *s)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_USER_ONLY
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
return s->user;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void gen_a64_set_pc_im(uint64_t val)
|
void gen_a64_set_pc_im(uint64_t val)
|
||||||
{
|
{
|
||||||
tcg_gen_movi_i64(cpu_pc, val);
|
tcg_gen_movi_i64(cpu_pc, val);
|
||||||
|
|
|
@ -52,6 +52,15 @@ static inline int arm_dc_feature(DisasContext *dc, int feature)
|
||||||
return (dc->features & (1ULL << feature)) != 0;
|
return (dc->features & (1ULL << feature)) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int get_mem_index(DisasContext *s)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_USER_ONLY
|
||||||
|
return 1;
|
||||||
|
#else
|
||||||
|
return s->user;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/* target-specific extra values for is_jmp */
|
/* target-specific extra values for is_jmp */
|
||||||
/* These instructions trap after executing, so the A32/T32 decoder must
|
/* These instructions trap after executing, so the A32/T32 decoder must
|
||||||
* defer them until after the conditional execution state has been updated.
|
* defer them until after the conditional execution state has been updated.
|
||||||
|
|
Loading…
Reference in a new issue