diff mbox series

[v7,14/35] Hexagon (target/hexagon) instruction printing

Message ID 1611113349-24906-15-git-send-email-tsimpson@quicinc.com (mailing list archive)
State New, archived
Headers show
Series [v7,01/35] Hexagon Update MAINTAINERS file | expand

Commit Message

Taylor Simpson Jan. 20, 2021, 3:28 a.m. UTC
Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org
---
 target/hexagon/printinsn.h |  28 +++++++++
 target/hexagon/printinsn.c | 146 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 target/hexagon/printinsn.h
 create mode 100644 target/hexagon/printinsn.c

Comments

Philippe Mathieu-Daudé Jan. 22, 2021, 5:58 p.m. UTC | #1
On 1/20/21 4:28 AM, Taylor Simpson wrote:
> Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org

Missing trailing '>' ;)

> ---
>  target/hexagon/printinsn.h |  28 +++++++++
>  target/hexagon/printinsn.c | 146 +++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 174 insertions(+)
>  create mode 100644 target/hexagon/printinsn.h
>  create mode 100644 target/hexagon/printinsn.c
> 
> diff --git a/target/hexagon/printinsn.h b/target/hexagon/printinsn.h
> new file mode 100644
> index 0000000..d6331e0
> --- /dev/null
> +++ b/target/hexagon/printinsn.h
> @@ -0,0 +1,28 @@
> +/*
> + *  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_PRINTINSN_H
> +#define HEXAGON_PRINTINSN_H
> +
> +#include "qemu/osdep.h"
> +#include "insn.h"
> +
> +extern void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
> +                                target_ulong pc);
> +extern void snprint_a_pkt_debug(GString *buf, Packet *pkt);

No need to declare prototypes in header with 'extern'...
(also noticed in other patches).

I'm surprise checkpatch.pl doesn't warn about this.

> +
> +#endif
Eric Blake Jan. 22, 2021, 6:10 p.m. UTC | #2
On 1/22/21 11:58 AM, Philippe Mathieu-Daudé wrote:

>> +#include "qemu/osdep.h"
>> +#include "insn.h"
>> +
>> +extern void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
>> +                                target_ulong pc);
>> +extern void snprint_a_pkt_debug(GString *buf, Packet *pkt);
> 
> No need to declare prototypes in header with 'extern'...
> (also noticed in other patches).

Using the extern on function declarations is not wrong (in fact, some
projects prefer to use extern for everything in a header, regardless of
whether it is function or data, rather than just limiting it to data).
But you do have a point that it's not common practice in qemu, and local
consistency is better than any habits you've picked up in other projects.
diff mbox series

Patch

diff --git a/target/hexagon/printinsn.h b/target/hexagon/printinsn.h
new file mode 100644
index 0000000..d6331e0
--- /dev/null
+++ b/target/hexagon/printinsn.h
@@ -0,0 +1,28 @@ 
+/*
+ *  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_PRINTINSN_H
+#define HEXAGON_PRINTINSN_H
+
+#include "qemu/osdep.h"
+#include "insn.h"
+
+extern void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
+                                target_ulong pc);
+extern void snprint_a_pkt_debug(GString *buf, Packet *pkt);
+
+#endif
diff --git a/target/hexagon/printinsn.c b/target/hexagon/printinsn.c
new file mode 100644
index 0000000..9a716b1
--- /dev/null
+++ b/target/hexagon/printinsn.c
@@ -0,0 +1,146 @@ 
+/*
+ *  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/>.
+ */
+
+#include "qemu/osdep.h"
+#include "opcodes.h"
+#include "printinsn.h"
+#include "insn.h"
+#include "reg_fields.h"
+#include "internal.h"
+
+static const char *sreg2str(unsigned int reg)
+{
+    if (reg < TOTAL_PER_THREAD_REGS) {
+        return hexagon_regnames[reg];
+    } else {
+        return "???";
+    }
+}
+
+static const char *creg2str(unsigned int reg)
+{
+    return sreg2str(reg + HEX_REG_SA0);
+}
+
+static void snprintinsn(GString *buf, Insn *insn)
+{
+    switch (insn->opcode) {
+#define DEF_VECX_PRINTINFO(TAG, FMT, ...) DEF_PRINTINFO(TAG, FMT, __VA_ARGS__)
+#define DEF_PRINTINFO(TAG, FMT, ...) \
+    case TAG: \
+        g_string_append_printf(buf, FMT, __VA_ARGS__); \
+        break;
+#include "printinsn_generated.h"
+#undef DEF_VECX_PRINTINFO
+#undef DEF_PRINTINFO
+    }
+}
+
+void snprint_a_pkt_disas(GString *buf, Packet *pkt, uint32_t *words,
+                         target_ulong pc)
+{
+    bool has_endloop0 = false;
+    bool has_endloop1 = false;
+    bool has_endloop01 = false;
+
+    for (int i = 0; i < pkt->num_insns; i++) {
+        if (pkt->insn[i].part1) {
+            continue;
+        }
+
+        /* We'll print the endloop's at the end of the packet */
+        if (pkt->insn[i].opcode == J2_endloop0) {
+            has_endloop0 = true;
+            continue;
+        }
+        if (pkt->insn[i].opcode == J2_endloop1) {
+            has_endloop1 = true;
+            continue;
+        }
+        if (pkt->insn[i].opcode == J2_endloop01) {
+            has_endloop01 = true;
+            continue;
+        }
+
+        g_string_append_printf(buf, "0x" TARGET_FMT_lx "\t", words[i]);
+
+        if (i == 0) {
+            g_string_append(buf, "{");
+        }
+
+        g_string_append(buf, "\t");
+        snprintinsn(buf, &(pkt->insn[i]));
+
+        if (i < pkt->num_insns - 1) {
+            /*
+             * Subinstructions are two instructions encoded
+             * in the same word. Print them on the same line.
+             */
+            if (GET_ATTRIB(pkt->insn[i].opcode, A_SUBINSN)) {
+                g_string_append(buf, "; ");
+                snprintinsn(buf, &(pkt->insn[i + 1]));
+                i++;
+            } else if (pkt->insn[i + 1].opcode != J2_endloop0 &&
+                       pkt->insn[i + 1].opcode != J2_endloop1 &&
+                       pkt->insn[i + 1].opcode != J2_endloop01) {
+                pc += 4;
+                g_string_append_printf(buf, "\n0x" TARGET_FMT_lx ":  ", pc);
+            }
+        }
+    }
+    g_string_append(buf, " }");
+    if (has_endloop0) {
+        g_string_append(buf, "  :endloop0");
+    }
+    if (has_endloop1) {
+        g_string_append(buf, "  :endloop1");
+    }
+    if (has_endloop01) {
+        g_string_append(buf, "  :endloop01");
+    }
+}
+
+void snprint_a_pkt_debug(GString *buf, Packet *pkt)
+{
+    int slot, opcode;
+
+    if (pkt->num_insns > 1) {
+        g_string_append(buf, "\n{\n");
+    }
+
+    for (int i = 0; i < pkt->num_insns; i++) {
+        if (pkt->insn[i].part1) {
+            continue;
+        }
+        g_string_append(buf, "\t");
+        snprintinsn(buf, &(pkt->insn[i]));
+
+        if (GET_ATTRIB(pkt->insn[i].opcode, A_SUBINSN)) {
+            g_string_append(buf, " //subinsn");
+        }
+        if (pkt->insn[i].extension_valid) {
+            g_string_append(buf, " //constant extended");
+        }
+        slot = pkt->insn[i].slot;
+        opcode = pkt->insn[i].opcode;
+        g_string_append_printf(buf, " //slot=%d:tag=%s\n",
+                               slot, opcode_names[opcode]);
+    }
+    if (pkt->num_insns > 1) {
+        g_string_append(buf, "}\n");
+    }
+}