From a17d448274575efbfcc1c04ec2641a0afeb74e17 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Mon, 17 Aug 2015 20:28:18 -0700 Subject: [PATCH] exec-all: Translate TCI return addresses backwards too This subtraction of return addresses applies directly to TCI as well as host-TCG. This fixes Linux boots for at least Microblaze, CRIS, ARM and SH4 when using TCI. [sw: Removed indentation for preprocessor statement] [sw: The patch also fixes Linux boot for x86_64] Reviewed-by: Richard Henderson Signed-off-by: Stefan Weil Signed-off-by: Peter Crosthwaite --- include/exec/exec-all.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index fbc6dcb90c..83b925172f 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -357,11 +357,7 @@ extern uintptr_t tci_tb_ptr; to indicate the compressed mode; subtracting two works around that. It is also the case that there are no host isas that contain a call insn smaller than 4 bytes, so we don't worry about special-casing this. */ -#if defined(CONFIG_TCG_INTERPRETER) -# define GETPC_ADJ 0 -#else -# define GETPC_ADJ 2 -#endif +#define GETPC_ADJ 2 #define GETPC() (GETRA() - GETPC_ADJ)