target/hexagon: make helper functions non-static

Make certain helper functions non-static, making them available outside
genptr.c. These functions are required by code generated by the
idef-parser.

This commit also makes some functions in op_helper.c non-static in order
to avoid having them marked as unused when using the idef-parser
generated code.

Signed-off-by: Alessandro Di Federico <ale@rev.ng>
Signed-off-by: Paolo Montesel <babush@rev.ng>
Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
Message-Id: <20220923173831.227551-5-anjo@rev.ng>
This commit is contained in:
Paolo Montesel 2022-09-23 19:38:24 +02:00 committed by Taylor Simpson
parent d909808ec0
commit 7e8b3b395f
4 changed files with 99 additions and 35 deletions

View File

@ -29,6 +29,13 @@
#undef QEMU_GENERATE #undef QEMU_GENERATE
#include "gen_tcg.h" #include "gen_tcg.h"
#include "gen_tcg_hvx.h" #include "gen_tcg_hvx.h"
#include "genptr.h"
TCGv gen_read_preg(TCGv pred, uint8_t num)
{
tcg_gen_mov_tl(pred, hex_pred[num]);
return pred;
}
static inline void gen_log_predicated_reg_write(int rnum, TCGv val, static inline void gen_log_predicated_reg_write(int rnum, TCGv val,
uint32_t slot) uint32_t slot)
@ -54,7 +61,7 @@ static inline void gen_log_predicated_reg_write(int rnum, TCGv val,
tcg_temp_free(slot_mask); tcg_temp_free(slot_mask);
} }
static inline void gen_log_reg_write(int rnum, TCGv val) void gen_log_reg_write(int rnum, TCGv val)
{ {
tcg_gen_mov_tl(hex_new_value[rnum], val); tcg_gen_mov_tl(hex_new_value[rnum], val);
if (HEX_DEBUG) { if (HEX_DEBUG) {
@ -116,7 +123,7 @@ static void gen_log_reg_write_pair(int rnum, TCGv_i64 val)
} }
} }
static inline void gen_log_pred_write(DisasContext *ctx, int pnum, TCGv val) void gen_log_pred_write(DisasContext *ctx, int pnum, TCGv val)
{ {
TCGv base_val = tcg_temp_new(); TCGv base_val = tcg_temp_new();
@ -274,7 +281,7 @@ static inline void gen_write_ctrl_reg_pair(DisasContext *ctx, int reg_num,
} }
} }
static TCGv gen_get_byte(TCGv result, int N, TCGv src, bool sign) TCGv gen_get_byte(TCGv result, int N, TCGv src, bool sign)
{ {
if (sign) { if (sign) {
tcg_gen_sextract_tl(result, src, N * 8, 8); tcg_gen_sextract_tl(result, src, N * 8, 8);
@ -284,7 +291,7 @@ static TCGv gen_get_byte(TCGv result, int N, TCGv src, bool sign)
return result; return result;
} }
static TCGv gen_get_byte_i64(TCGv result, int N, TCGv_i64 src, bool sign) TCGv gen_get_byte_i64(TCGv result, int N, TCGv_i64 src, bool sign)
{ {
TCGv_i64 res64 = tcg_temp_new_i64(); TCGv_i64 res64 = tcg_temp_new_i64();
if (sign) { if (sign) {
@ -298,7 +305,7 @@ static TCGv gen_get_byte_i64(TCGv result, int N, TCGv_i64 src, bool sign)
return result; return result;
} }
static inline TCGv gen_get_half(TCGv result, int N, TCGv src, bool sign) TCGv gen_get_half(TCGv result, int N, TCGv src, bool sign)
{ {
if (sign) { if (sign) {
tcg_gen_sextract_tl(result, src, N * 16, 16); tcg_gen_sextract_tl(result, src, N * 16, 16);
@ -308,12 +315,12 @@ static inline TCGv gen_get_half(TCGv result, int N, TCGv src, bool sign)
return result; return result;
} }
static inline void gen_set_half(int N, TCGv result, TCGv src) void gen_set_half(int N, TCGv result, TCGv src)
{ {
tcg_gen_deposit_tl(result, result, src, N * 16, 16); tcg_gen_deposit_tl(result, result, src, N * 16, 16);
} }
static inline void gen_set_half_i64(int N, TCGv_i64 result, TCGv src) void gen_set_half_i64(int N, TCGv_i64 result, TCGv src)
{ {
TCGv_i64 src64 = tcg_temp_new_i64(); TCGv_i64 src64 = tcg_temp_new_i64();
tcg_gen_extu_i32_i64(src64, src); tcg_gen_extu_i32_i64(src64, src);
@ -321,7 +328,7 @@ static inline void gen_set_half_i64(int N, TCGv_i64 result, TCGv src)
tcg_temp_free_i64(src64); tcg_temp_free_i64(src64);
} }
static void gen_set_byte_i64(int N, TCGv_i64 result, TCGv src) void gen_set_byte_i64(int N, TCGv_i64 result, TCGv src)
{ {
TCGv_i64 src64 = tcg_temp_new_i64(); TCGv_i64 src64 = tcg_temp_new_i64();
tcg_gen_extu_i32_i64(src64, src); tcg_gen_extu_i32_i64(src64, src);
@ -396,60 +403,60 @@ static inline void gen_store_conditional8(DisasContext *ctx,
tcg_gen_movi_tl(hex_llsc_addr, ~0); tcg_gen_movi_tl(hex_llsc_addr, ~0);
} }
static inline void gen_store32(TCGv vaddr, TCGv src, int width, uint32_t slot) void gen_store32(TCGv vaddr, TCGv src, int width, uint32_t slot)
{ {
tcg_gen_mov_tl(hex_store_addr[slot], vaddr); tcg_gen_mov_tl(hex_store_addr[slot], vaddr);
tcg_gen_movi_tl(hex_store_width[slot], width); tcg_gen_movi_tl(hex_store_width[slot], width);
tcg_gen_mov_tl(hex_store_val32[slot], src); tcg_gen_mov_tl(hex_store_val32[slot], src);
} }
static inline void gen_store1(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot) void gen_store1(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot)
{ {
gen_store32(vaddr, src, 1, slot); gen_store32(vaddr, src, 1, slot);
} }
static inline void gen_store1i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot) void gen_store1i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot)
{ {
TCGv tmp = tcg_constant_tl(src); TCGv tmp = tcg_constant_tl(src);
gen_store1(cpu_env, vaddr, tmp, slot); gen_store1(cpu_env, vaddr, tmp, slot);
} }
static inline void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot) void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot)
{ {
gen_store32(vaddr, src, 2, slot); gen_store32(vaddr, src, 2, slot);
} }
static inline void gen_store2i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot) void gen_store2i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot)
{ {
TCGv tmp = tcg_constant_tl(src); TCGv tmp = tcg_constant_tl(src);
gen_store2(cpu_env, vaddr, tmp, slot); gen_store2(cpu_env, vaddr, tmp, slot);
} }
static inline void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot) void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot)
{ {
gen_store32(vaddr, src, 4, slot); gen_store32(vaddr, src, 4, slot);
} }
static inline void gen_store4i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot) void gen_store4i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot)
{ {
TCGv tmp = tcg_constant_tl(src); TCGv tmp = tcg_constant_tl(src);
gen_store4(cpu_env, vaddr, tmp, slot); gen_store4(cpu_env, vaddr, tmp, slot);
} }
static inline void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src, uint32_t slot) void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src, uint32_t slot)
{ {
tcg_gen_mov_tl(hex_store_addr[slot], vaddr); tcg_gen_mov_tl(hex_store_addr[slot], vaddr);
tcg_gen_movi_tl(hex_store_width[slot], 8); tcg_gen_movi_tl(hex_store_width[slot], 8);
tcg_gen_mov_i64(hex_store_val64[slot], src); tcg_gen_mov_i64(hex_store_val64[slot], src);
} }
static inline void gen_store8i(TCGv_env cpu_env, TCGv vaddr, int64_t src, uint32_t slot) void gen_store8i(TCGv_env cpu_env, TCGv vaddr, int64_t src, uint32_t slot)
{ {
TCGv_i64 tmp = tcg_constant_i64(src); TCGv_i64 tmp = tcg_constant_i64(src);
gen_store8(cpu_env, vaddr, tmp, slot); gen_store8(cpu_env, vaddr, tmp, slot);
} }
static TCGv gen_8bitsof(TCGv result, TCGv value) TCGv gen_8bitsof(TCGv result, TCGv value)
{ {
TCGv zero = tcg_constant_tl(0); TCGv zero = tcg_constant_tl(0);
TCGv ones = tcg_constant_tl(0xff); TCGv ones = tcg_constant_tl(0xff);
@ -1014,7 +1021,7 @@ static void vec_to_qvec(size_t size, intptr_t dstoff, intptr_t srcoff)
tcg_temp_free_i64(mask); tcg_temp_free_i64(mask);
} }
static void probe_noshuf_load(TCGv va, int s, int mi) void probe_noshuf_load(TCGv va, int s, int mi)
{ {
TCGv size = tcg_constant_tl(s); TCGv size = tcg_constant_tl(s);
TCGv mem_idx = tcg_constant_tl(mi); TCGv mem_idx = tcg_constant_tl(mi);

View File

@ -19,7 +19,30 @@
#define HEXAGON_GENPTR_H #define HEXAGON_GENPTR_H
#include "insn.h" #include "insn.h"
#include "tcg/tcg.h"
#include "translate.h"
extern const SemanticInsn opcode_genptr[]; extern const SemanticInsn opcode_genptr[];
void gen_store32(TCGv vaddr, TCGv src, int width, uint32_t slot);
void gen_store1(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot);
void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot);
void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src, uint32_t slot);
void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src, uint32_t slot);
void gen_store1i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot);
void gen_store2i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot);
void gen_store4i(TCGv_env cpu_env, TCGv vaddr, int32_t src, uint32_t slot);
void gen_store8i(TCGv_env cpu_env, TCGv vaddr, int64_t src, uint32_t slot);
TCGv gen_read_preg(TCGv pred, uint8_t num);
void gen_log_reg_write(int rnum, TCGv val);
void gen_log_pred_write(DisasContext *ctx, int pnum, TCGv val);
TCGv gen_8bitsof(TCGv result, TCGv value);
void gen_set_byte_i64(int N, TCGv_i64 result, TCGv src);
TCGv gen_get_byte(TCGv result, int N, TCGv src, bool sign);
TCGv gen_get_byte_i64(TCGv result, int N, TCGv_i64 src, bool sign);
TCGv gen_get_half(TCGv result, int N, TCGv src, bool sign);
void gen_set_half(int N, TCGv result, TCGv src);
void gen_set_half_i64(int N, TCGv_i64 result, TCGv src);
void probe_noshuf_load(TCGv va, int s, int mi);
#endif #endif

View File

@ -29,6 +29,7 @@
#include "fma_emu.h" #include "fma_emu.h"
#include "mmvec/mmvec.h" #include "mmvec/mmvec.h"
#include "mmvec/macros.h" #include "mmvec/macros.h"
#include "op_helper.h"
#define SF_BIAS 127 #define SF_BIAS 127
#define SF_MANTBITS 23 #define SF_MANTBITS 23
@ -50,8 +51,8 @@ G_NORETURN void HELPER(raise_exception)(CPUHexagonState *env, uint32_t excp)
do_raise_exception_err(env, excp, 0); do_raise_exception_err(env, excp, 0);
} }
static void log_reg_write(CPUHexagonState *env, int rnum, void log_reg_write(CPUHexagonState *env, int rnum,
target_ulong val, uint32_t slot) target_ulong val, uint32_t slot)
{ {
HEX_DEBUG_LOG("log_reg_write[%d] = " TARGET_FMT_ld " (0x" TARGET_FMT_lx ")", HEX_DEBUG_LOG("log_reg_write[%d] = " TARGET_FMT_ld " (0x" TARGET_FMT_lx ")",
rnum, val, val); rnum, val, val);
@ -82,8 +83,8 @@ static void log_pred_write(CPUHexagonState *env, int pnum, target_ulong val)
} }
} }
static void log_store32(CPUHexagonState *env, target_ulong addr, void log_store32(CPUHexagonState *env, target_ulong addr,
target_ulong val, int width, int slot) target_ulong val, int width, int slot)
{ {
HEX_DEBUG_LOG("log_store%d(0x" TARGET_FMT_lx HEX_DEBUG_LOG("log_store%d(0x" TARGET_FMT_lx
", %" PRId32 " [0x08%" PRIx32 "])\n", ", %" PRId32 " [0x08%" PRIx32 "])\n",
@ -93,8 +94,8 @@ static void log_store32(CPUHexagonState *env, target_ulong addr,
env->mem_log_stores[slot].data32 = val; env->mem_log_stores[slot].data32 = val;
} }
static void log_store64(CPUHexagonState *env, target_ulong addr, void log_store64(CPUHexagonState *env, target_ulong addr,
int64_t val, int width, int slot) int64_t val, int width, int slot)
{ {
HEX_DEBUG_LOG("log_store%d(0x" TARGET_FMT_lx HEX_DEBUG_LOG("log_store%d(0x" TARGET_FMT_lx
", %" PRId64 " [0x016%" PRIx64 "])\n", ", %" PRId64 " [0x016%" PRIx64 "])\n",
@ -104,7 +105,7 @@ static void log_store64(CPUHexagonState *env, target_ulong addr,
env->mem_log_stores[slot].data64 = val; env->mem_log_stores[slot].data64 = val;
} }
static void write_new_pc(CPUHexagonState *env, bool pkt_has_multi_cof, void write_new_pc(CPUHexagonState *env, bool pkt_has_multi_cof,
target_ulong addr) target_ulong addr)
{ {
HEX_DEBUG_LOG("write_new_pc(0x" TARGET_FMT_lx ")\n", addr); HEX_DEBUG_LOG("write_new_pc(0x" TARGET_FMT_lx ")\n", addr);
@ -541,32 +542,28 @@ static void check_noshuf(CPUHexagonState *env, uint32_t slot,
} }
} }
static uint8_t mem_load1(CPUHexagonState *env, uint32_t slot, uint8_t mem_load1(CPUHexagonState *env, uint32_t slot, target_ulong vaddr)
target_ulong vaddr)
{ {
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
check_noshuf(env, slot, vaddr, 1); check_noshuf(env, slot, vaddr, 1);
return cpu_ldub_data_ra(env, vaddr, ra); return cpu_ldub_data_ra(env, vaddr, ra);
} }
static uint16_t mem_load2(CPUHexagonState *env, uint32_t slot, uint16_t mem_load2(CPUHexagonState *env, uint32_t slot, target_ulong vaddr)
target_ulong vaddr)
{ {
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
check_noshuf(env, slot, vaddr, 2); check_noshuf(env, slot, vaddr, 2);
return cpu_lduw_data_ra(env, vaddr, ra); return cpu_lduw_data_ra(env, vaddr, ra);
} }
static uint32_t mem_load4(CPUHexagonState *env, uint32_t slot, uint32_t mem_load4(CPUHexagonState *env, uint32_t slot, target_ulong vaddr)
target_ulong vaddr)
{ {
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
check_noshuf(env, slot, vaddr, 4); check_noshuf(env, slot, vaddr, 4);
return cpu_ldl_data_ra(env, vaddr, ra); return cpu_ldl_data_ra(env, vaddr, ra);
} }
static uint64_t mem_load8(CPUHexagonState *env, uint32_t slot, uint64_t mem_load8(CPUHexagonState *env, uint32_t slot, target_ulong vaddr)
target_ulong vaddr)
{ {
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
check_noshuf(env, slot, vaddr, 8); check_noshuf(env, slot, vaddr, 8);
@ -1471,7 +1468,7 @@ void HELPER(vwhist128qm)(CPUHexagonState *env, int32_t uiV)
} }
} }
static void cancel_slot(CPUHexagonState *env, uint32_t slot) void cancel_slot(CPUHexagonState *env, uint32_t slot)
{ {
HEX_DEBUG_LOG("Slot %d cancelled\n", slot); HEX_DEBUG_LOG("Slot %d cancelled\n", slot);
env->slot_cancelled |= (1 << slot); env->slot_cancelled |= (1 << slot);

View File

@ -0,0 +1,37 @@
/*
* Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef HEXAGON_OP_HELPER_H
#define HEXAGON_OP_HELPER_H
/* Misc functions */
void cancel_slot(CPUHexagonState *env, uint32_t slot);
void write_new_pc(CPUHexagonState *env, bool pkt_has_multi_cof, target_ulong addr);
uint8_t mem_load1(CPUHexagonState *env, uint32_t slot, target_ulong vaddr);
uint16_t mem_load2(CPUHexagonState *env, uint32_t slot, target_ulong vaddr);
uint32_t mem_load4(CPUHexagonState *env, uint32_t slot, target_ulong vaddr);
uint64_t mem_load8(CPUHexagonState *env, uint32_t slot, target_ulong vaddr);
void log_reg_write(CPUHexagonState *env, int rnum,
target_ulong val, uint32_t slot);
void log_store64(CPUHexagonState *env, target_ulong addr,
int64_t val, int width, int slot);
void log_store32(CPUHexagonState *env, target_ulong addr,
target_ulong val, int width, int slot);
#endif