From: Peter Maydell Date: Tue, 27 May 2014 16:09:50 +0000 (+0100) Subject: target-arm/translate.c: Use get_mem_index() for SRS memory accesses X-Git-Tag: v2.1.0-rc0~99^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1197795436f51652bbb253c9422265676264050;p=thirdparty%2Fqemu.git target-arm/translate.c: Use get_mem_index() for SRS memory accesses The SRS instruction was using a hardcoded 0 for the memory accesses. This happens to be OK since the SRS instruction is UNPREDICTABLE in User and System modes, but is awkward if we want to rearrange the MMU index uses. Switch to using get_mem_index() like all the other accesses. Reviewed-by: Edgar E. Iglesias Signed-off-by: Peter Maydell Message-id: 1400980132-25949-4-git-send-email-edgar.iglesias@gmail.com --- diff --git a/target-arm/translate.c b/target-arm/translate.c index e708f4ab1a6..e40b0a76bec 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7338,11 +7338,11 @@ static void gen_srs(DisasContext *s, } tcg_gen_addi_i32(addr, addr, offset); tmp = load_reg(s, 14); - gen_aa32_st32(tmp, addr, 0); + gen_aa32_st32(tmp, addr, get_mem_index(s)); tcg_temp_free_i32(tmp); tmp = load_cpu_field(spsr); tcg_gen_addi_i32(addr, addr, 4); - gen_aa32_st32(tmp, addr, 0); + gen_aa32_st32(tmp, addr, get_mem_index(s)); tcg_temp_free_i32(tmp); if (writeback) { switch (amode) {