When cpu->cfg.ieee_fp_extension is off, IEEE FP instructions don't get
executed. Let's print that info on the "-d in_asm" output to help users.
This will generate an output like the following:
0x00020e30: 0x1f82e1c0 { V0.sf = vadd(V1.sf,V2.sf) (disabled: no ieee_fp) }
Signed-off-by: Matheus Tavares Bernardino <matheus.bernardino@oss.qualcomm.com>
---
target/hexagon/cpu_bits.h | 3 ++-
target/hexagon/printinsn.h | 2 +-
disas/hexagon.c | 3 ++-
target/hexagon/cpu.c | 2 ++
target/hexagon/decode.c | 4 ++--
target/hexagon/printinsn.c | 7 ++++++-
6 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/target/hexagon/cpu_bits.h b/target/hexagon/cpu_bits.h
index 83d13de569..1f9e617d72 100644
--- a/target/hexagon/cpu_bits.h
+++ b/target/hexagon/cpu_bits.h
@@ -72,6 +72,7 @@ static inline bool is_packet_end(uint32_t endocing)
return ((bits == 0x3) || (bits == 0x0));
}
-int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc, GString *buf);
+int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc,
+ GString *buf, const HexagonCPUConfig *cfg);
#endif
diff --git a/target/hexagon/printinsn.h b/target/hexagon/printinsn.h
index 2ecd1731d0..6a45ec571f 100644
--- a/target/hexagon/printinsn.h
+++ b/target/hexagon/printinsn.h
@@ -21,7 +21,7 @@
#include "insn.h"
void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
- target_ulong pc);
+ target_ulong pc, const HexagonCPUConfig *cfg);
void snprint_a_pkt_debug(GString *buf, Packet *pkt);
#endif
diff --git a/disas/hexagon.c b/disas/hexagon.c
index c1a4ffc5f6..e2d3804606 100644
--- a/disas/hexagon.c
+++ b/disas/hexagon.c
@@ -57,8 +57,9 @@ int print_insn_hexagon(bfd_vma memaddr, struct disassemble_info *info)
return PACKET_WORDS_MAX * sizeof(uint32_t);
}
+ const HexagonCPUConfig *cfg = info->target_info;
buf = g_string_sized_new(PACKET_BUFFER_LEN);
- len = disassemble_hexagon(words, i, memaddr, buf);
+ len = disassemble_hexagon(words, i, memaddr, buf, cfg);
(*info->fprintf_func)(info->stream, "%s", buf->str);
g_string_free(buf, true);
diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c
index 5470d9c7ce..d7f4df5f96 100644
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -307,6 +307,8 @@ static void hexagon_cpu_disas_set_info(const CPUState *cs,
{
info->print_insn = print_insn_hexagon;
info->endian = BFD_ENDIAN_LITTLE;
+ HexagonCPU *cpu = HEXAGON_CPU(cs);
+ info->target_info = &cpu->cfg;
}
static void hexagon_cpu_realize(DeviceState *dev, Error **errp)
diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c
index dbc9c630e8..d7ce8c8e1b 100644
--- a/target/hexagon/decode.c
+++ b/target/hexagon/decode.c
@@ -801,7 +801,7 @@ int decode_packet(DisasContext *ctx, int max_words, const uint32_t *words,
/* Used for "-d in_asm" logging */
int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc,
- GString *buf)
+ GString *buf, const HexagonCPUConfig *cfg)
{
DisasContext ctx;
Packet pkt;
@@ -810,7 +810,7 @@ int disassemble_hexagon(uint32_t *words, int nwords, bfd_vma pc,
ctx.pkt = &pkt;
if (decode_packet(&ctx, nwords, words, &pkt, true) > 0) {
- snprint_a_pkt_disas(buf, &pkt, words, pc);
+ snprint_a_pkt_disas(buf, &pkt, words, pc, cfg);
return pkt.encod_pkt_size_in_bytes;
} else {
g_string_assign(buf, "<invalid>");
diff --git a/target/hexagon/printinsn.c b/target/hexagon/printinsn.c
index 4865cdd133..85527f56e2 100644
--- a/target/hexagon/printinsn.c
+++ b/target/hexagon/printinsn.c
@@ -51,7 +51,7 @@ static void snprintinsn(GString *buf, Insn *insn)
}
void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
- target_ulong pc)
+ target_ulong pc, const HexagonCPUConfig *cfg)
{
bool has_endloop0 = false;
bool has_endloop1 = false;
@@ -85,6 +85,11 @@ void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
g_string_append(buf, "\t");
snprintinsn(buf, &(pkt->insn[i]));
+ if (!cfg->ieee_fp_extension &&
+ GET_ATTRIB(pkt->insn[i].opcode, A_HVX_IEEE_FP)) {
+ g_string_append(buf, " (disabled: no ieee_fp)");
+ }
+
if (i < pkt->num_insns - 1) {
/*
* Subinstructions are two instructions encoded
--
2.37.2