From 2c3cee6bd75e8547b5266b8b688c9eeb0ae2211e Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 26 Feb 2023 16:19:36 -1000 Subject: [PATCH] target/hexagon: Use tcg_constant_* for gen_constant_from_imm Rename from gen_tmp_value_from_imm to match gen_constant vs gen_tmp. Reviewed-by: Taylor Simpson Signed-off-by: Richard Henderson --- target/hexagon/idef-parser/parser-helpers.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/hexagon/idef-parser/parser-helpers.c b/target/hexagon/idef-parser/parser-helpers.c index 0b401f7dbe..6fb5f31cf7 100644 --- a/target/hexagon/idef-parser/parser-helpers.c +++ b/target/hexagon/idef-parser/parser-helpers.c @@ -325,9 +325,9 @@ HexValue gen_tmp_value(Context *c, return rvalue; } -static HexValue gen_tmp_value_from_imm(Context *c, - YYLTYPE *locp, - HexValue *value) +static HexValue gen_constant_from_imm(Context *c, + YYLTYPE *locp, + HexValue *value) { HexValue rvalue; assert(value->type == IMMEDIATE); @@ -338,11 +338,11 @@ static HexValue gen_tmp_value_from_imm(Context *c, rvalue.is_dotnew = false; rvalue.tmp.index = c->inst.tmp_count; /* - * Here we output the call to `tcg_const_i` in + * Here we output the call to `tcg_constant_i` in * order to create the temporary value. Note, that we * add a cast * - * `tcg_const_i`((int_t) ...)` + * `tcg_constant_i`((int_t) ...)` * * This cast is required to avoid implicit integer * conversion warnings since all immediates are @@ -350,7 +350,7 @@ static HexValue gen_tmp_value_from_imm(Context *c, * integer is 32-bit. */ OUT(c, locp, "TCGv_i", &rvalue.bit_width, " tmp_", &c->inst.tmp_count); - OUT(c, locp, " = tcg_const_i", &rvalue.bit_width, + OUT(c, locp, " = tcg_constant_i", &rvalue.bit_width, "((int", &rvalue.bit_width, "_t) (", value, "));\n"); c->inst.tmp_count++; @@ -395,8 +395,7 @@ HexValue gen_imm_qemu_tmp(Context *c, YYLTYPE *locp, unsigned bit_width, HexValue rvalue_materialize(Context *c, YYLTYPE *locp, HexValue *rvalue) { if (rvalue->type == IMMEDIATE) { - HexValue res = gen_tmp_value_from_imm(c, locp, rvalue); - return res; + return gen_constant_from_imm(c, locp, rvalue); } return *rvalue; } -- 2.11.0