From 023261ef851b22a04f6c5d76da870051031757a6 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 1 Oct 2013 13:47:38 -0700 Subject: tcg-aarch64: Update to helper_ret_*_mmu routines A minimal update to use the new helpers with the return address argument. Tested-by: Claudio Fontana Reviewed-by: Claudio Fontana Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'include/exec/exec-all.h') diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 8dd15948d8..3ce80d1587 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -320,24 +320,6 @@ extern uintptr_t tci_tb_ptr; #define GETPC() (GETRA() - GETPC_ADJ) -/* The LDST optimizations splits code generation into fast and slow path. - In some implementations, we pass the "logical" return address manually; - in others, we must infer the logical return from the true return. */ -#if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU) -# if defined(__aarch64__) -# define GETRA_LDST(RA) tcg_getra_ldst(RA) -static inline uintptr_t tcg_getra_ldst(uintptr_t ra) -{ - int32_t b; - ra += 4; /* skip one instruction */ - b = *(int32_t *)ra; /* load the branch insn */ - b = (b << 6) >> (6 - 2); /* extract the displacement */ - ra += b; /* apply the displacement */ - return ra; -} -# endif -#endif /* CONFIG_QEMU_LDST_OPTIMIZATION */ - /* ??? Delete these once they are no longer used. */ bool is_tcg_gen_code(uintptr_t pc_ptr); #ifdef GETRA_LDST -- cgit v1.2.1 From dbdbe0cd3124a3e9afa2d1c11da7c6476097bb9d Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 3 Sep 2013 14:24:58 -0700 Subject: exec: Delete is_tcg_gen_code and GETRA_EXT All implementations now boil down to GETRA. Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'include/exec/exec-all.h') diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 3ce80d1587..6ad05cacf5 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -320,18 +320,6 @@ extern uintptr_t tci_tb_ptr; #define GETPC() (GETRA() - GETPC_ADJ) -/* ??? Delete these once they are no longer used. */ -bool is_tcg_gen_code(uintptr_t pc_ptr); -#ifdef GETRA_LDST -# define GETRA_EXT() tcg_getra_ext(GETRA()) -static inline uintptr_t tcg_getra_ext(uintptr_t ra) -{ - return is_tcg_gen_code(ra) ? GETRA_LDST(ra) : ra; -} -#else -# define GETRA_EXT() GETRA() -#endif - #if !defined(CONFIG_USER_ONLY) void phys_mem_set_alloc(void *(*alloc)(ram_addr_t)); -- cgit v1.2.1