[v3] Replace TARGET_TB_PCREL with CF_PCREL

[PATCH v3 24/27] target/hexagon: Replace `tb_pc()` with `tb->pc`

Anton Johansson via posted 27 patches 2 years, 11 months ago

Diff against v1 v2
Download mbox

Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Michael Rolnik <mrolnik@gmail.com>, Taylor Simpson <tsimpson@quicinc.com>, Eduardo Habkost <eduardo@habkost.net>, Song Gao <gaosong@loongson.cn>, Xiaojuan Yang <yangxiaojuan@loongson.cn>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Stafford Horne <shorne@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liweiwei@iscas.ac.cn>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>

Expand all Fold all

[PATCH v3 24/27] target/hexagon: Replace `tb_pc()` with `tb->pc`

Posted by Anton Johansson via 2 years, 11 months ago

Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/hexagon/cpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c
index 807037c586..ab40cfc283 100644
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -23,6 +23,7 @@
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "fpu/softfloat-helpers.h"
+#include "tcg/tcg.h"
 
 static void hexagon_v67_cpu_init(Object *obj)
 {
@@ -263,7 +264,8 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *cs,
 {
     HexagonCPU *cpu = HEXAGON_CPU(cs);
     CPUHexagonState *env = &cpu->env;
-    env->gpr[HEX_REG_PC] = tb_pc(tb);
+    tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
+    env->gpr[HEX_REG_PC] = tb->pc;
 }
 
 static bool hexagon_cpu_has_work(CPUState *cs)
-- 
2.39.1

RE: [PATCH v3 24/27] target/hexagon: Replace `tb_pc()` with `tb->pc`

Posted by Taylor Simpson 2 years, 11 months ago


> -----Original Message-----
> From: Anton Johansson <anjo@rev.ng>
> Sent: Monday, February 27, 2023 6:52 AM
> To: qemu-devel@nongnu.org
> Cc: ale@rev.ng; richard.henderson@linaro.org; pbonzini@redhat.com;
> eduardo@habkost.net; peter.maydell@linaro.org; mrolnik@gmail.com;
> Taylor Simpson <tsimpson@quicinc.com>; gaosong@loongson.cn;
> yangxiaojuan@loongson.cn; edgar.iglesias@gmail.com; philmd@linaro.org;
> shorne@gmail.com; palmer@dabbelt.com; alistair.francis@wdc.com;
> bin.meng@windriver.com; ysato@users.sourceforge.jp; mark.cave-
> ayland@ilande.co.uk; atar4qemu@gmail.com; kbastian@mail.uni-
> paderborn.de
> Subject: [PATCH v3 24/27] target/hexagon: Replace `tb_pc()` with `tb->pc`
> 
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  target/hexagon/cpu.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index
> 807037c586..ab40cfc283 100644
> --- a/target/hexagon/cpu.c
> +++ b/target/hexagon/cpu.c
> @@ -23,6 +23,7 @@
>  #include "qapi/error.h"
>  #include "hw/qdev-properties.h"
>  #include "fpu/softfloat-helpers.h"
> +#include "tcg/tcg.h"
> 
>  static void hexagon_v67_cpu_init(Object *obj)  { @@ -263,7 +264,8 @@
> static void hexagon_cpu_synchronize_from_tb(CPUState *cs,  {
>      HexagonCPU *cpu = HEXAGON_CPU(cs);
>      CPUHexagonState *env = &cpu->env;
> -    env->gpr[HEX_REG_PC] = tb_pc(tb);
> +    tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
> +    env->gpr[HEX_REG_PC] = tb->pc;
>  }

Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>