Makes sure gen_slotval() and check_noshuf() remains defined when helper-to-tcg and idef-parser are both used. gen_slotval() is needed for creating a TCGv of the slot value fed to helpers (generated helper-to-tcg code), and check_noshuf() is needed for helper definitions used as input to helper-to-tcg.
Signed-off-by: Anton Johansson <a...@rev.ng> --- target/hexagon/genptr.c | 2 +- target/hexagon/op_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index dbae6c570a..ea3ccf649a 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -399,7 +399,7 @@ static inline void gen_store_conditional8(DisasContext *ctx, tcg_gen_movi_tl(hex_llsc_addr, ~0); } -#ifndef CONFIG_HEXAGON_IDEF_PARSER +#if !defined(CONFIG_HEXAGON_IDEF_PARSER) || defined(CONFIG_HELPER_TO_TCG) static TCGv gen_slotval(DisasContext *ctx) { int slotval = (ctx->pkt->pkt_has_store_s1 & 1) | (ctx->insn->slot << 1); diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 90e7aaa097..0f9c6ab19f 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -567,7 +567,7 @@ void HELPER(probe_pkt_scalar_hvx_stores)(CPUHexagonState *env, int mask) } } -#ifndef CONFIG_HEXAGON_IDEF_PARSER +#if !defined(CONFIG_HEXAGON_IDEF_PARSER) || defined(CONFIG_HELPER_TO_TCG) /* * mem_noshuf * Section 5.5 of the Hexagon V67 Programmer's Reference Manual -- 2.45.2