diff mbox series

[RFC,29/66] Hexagon opcode data structures

Message ID 1581381644-13678-30-git-send-email-tsimpson@quicinc.com (mailing list archive)
State New, archived
Headers show
Series Hexagon patch series | expand

Commit Message

Taylor Simpson Feb. 11, 2020, 12:40 a.m. UTC 
Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
---
 target/hexagon/opcodes.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
 target/hexagon/opcodes.h |  67 ++++++++++++++
 2 files changed, 290 insertions(+)
 create mode 100644 target/hexagon/opcodes.c
 create mode 100644 target/hexagon/opcodes.h

Comments

Philippe Mathieu-Daudé Feb. 11, 2020, 7:40 a.m. UTC | #1 
On 2/11/20 1:40 AM, Taylor Simpson wrote:
> Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
> ---
>   target/hexagon/opcodes.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
>   target/hexagon/opcodes.h |  67 ++++++++++++++
>   2 files changed, 290 insertions(+)
>   create mode 100644 target/hexagon/opcodes.c
>   create mode 100644 target/hexagon/opcodes.h
> 
> diff --git a/target/hexagon/opcodes.c b/target/hexagon/opcodes.c
> new file mode 100644
> index 0000000..1c1b200
> --- /dev/null
> +++ b/target/hexagon/opcodes.c
> @@ -0,0 +1,223 @@
> +/*
> + *  Copyright (c) 2019 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/>.
> + */
> +
> +/*
> + * opcodes.c
> + *
> + * data tables generated automatically
> + * Maybe some functions too
> + */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <strings.h>
> +#include <string.h>
> +#include <stdarg.h>
> +#include <ctype.h>

Previous includes not needed ("qemu/osdep.h" includes them for you).

> +#include "qemu/osdep.h"
> +#include "opcodes.h"
> +#include "decode.h"
> +
> +#define VEC_DESCR(A, B, C) DESCR(A, B, C)
> +#define DONAME(X) #X
> +
> +const char *opcode_names[] = {
> +#define OPCODE(IID) DONAME(IID)
> +#include "opcodes_def_generated.h"
> +    NULL
> +#undef OPCODE
> +};
> +
> +const char *opcode_reginfo[] = {
> +#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2)    /* nothing */
> +#define REGINFO(TAG, REGINFO, RREGS, WREGS) REGINFO,
> +#include "op_regs_generated.h"
> +    NULL
> +#undef REGINFO
> +#undef IMMINFO
> +};
> +
> +
> +const char *opcode_rregs[] = {
> +#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2)    /* nothing */
> +#define REGINFO(TAG, REGINFO, RREGS, WREGS) RREGS,
> +#include "op_regs_generated.h"
> +    NULL
> +#undef REGINFO
> +#undef IMMINFO
> +};
> +
> +
> +const char *opcode_wregs[] = {
> +#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2)    /* nothing */
> +#define REGINFO(TAG, REGINFO, RREGS, WREGS) WREGS,
> +#include "op_regs_generated.h"
> +    NULL
> +#undef REGINFO
> +#undef IMMINFO
> +};
> +
> +const char *opcode_short_semantics[] = {
> +#define OPCODE(X)              NULL
> +#include "opcodes_def_generated.h"
> +#undef OPCODE
> +    NULL
> +};
> +
> +
> +size4u_t
> +    opcode_attribs[XX_LAST_OPCODE][(A_ZZ_LASTATTRIB / ATTRIB_WIDTH) + 1] = {0};
> +
> +static void init_attribs(int tag, ...)
> +{
> +    va_list ap;
> +    int attr;
> +    va_start(ap, tag);
> +    while ((attr = va_arg(ap, int)) != 0) {
> +        opcode_attribs[tag][attr / ATTRIB_WIDTH] |= 1 << (attr % ATTRIB_WIDTH);
> +    }
> +}
> +
> +static size4u_t str2val(const char *str)
> +{
> +    size4u_t ret = 0;
> +    for ( ; *str; str++) {
> +        switch (*str) {
> +        case ' ':
> +        case '\t':
> +            break;
> +        case 's':
> +        case 't':
> +        case 'u':
> +        case 'v':
> +        case 'w':
> +        case 'd':
> +        case 'e':
> +        case 'x':
> +        case 'y':
> +        case 'i':
> +        case 'I':
> +        case 'P':
> +        case 'E':
> +        case 'o':
> +        case '-':
> +        case '0':
> +            ret = (ret << 1) | 0;
> +            break;
> +        case '1':
> +            ret = (ret << 1) | 1;
> +            break;
> +        default:
> +            break;
> +        }
> +    }
> +    return ret;
> +}
> +
> +static size1u_t has_ee(const char *str)
> +{
> +    return (strchr(str, 'E') != NULL);
> +}
> +
> +opcode_encoding_t opcode_encodings[] = {
> +#define DEF_ENC32(OPCODE, ENCSTR) \
> +    [OPCODE] = { .encoding = ENCSTR },
> +
> +#define DEF_ENC_SUBINSN(OPCODE, CLASS, ENCSTR) \
> +    [OPCODE] = { .encoding = ENCSTR, .enc_class = CLASS },
> +
> +#define DEF_EXT_ENC(OPCODE, CLASS, ENCSTR) \
> +    [OPCODE] = { .encoding = ENCSTR, .enc_class = CLASS },
> +
> +#include "imported/encode.def"
> +
> +#undef DEF_ENC32
> +#undef DEF_ENC_SUBINSN
> +#undef DEF_EXT_ENC
> +};
> +
> +void opcode_init(void)
> +{
> +    init_attribs(0, 0);
> +
> +#define DEF_ENC32(OPCODE, ENCSTR) \
> +    opcode_encodings[OPCODE].vals = str2val(ENCSTR); \
> +    opcode_encodings[OPCODE].is_ee = has_ee(ENCSTR);
> +
> +#define DEF_ENC_SUBINSN(OPCODE, CLASS, ENCSTR) \
> +    opcode_encodings[OPCODE].vals = str2val(ENCSTR);
> +
> +#define LEGACY_DEF_ENC32(OPCODE, ENCSTR) \
> +    opcode_encodings[OPCODE].dep_vals = str2val(ENCSTR);
> +
> +#define DEF_EXT_ENC(OPCODE, CLASS, ENCSTR) \
> +    opcode_encodings[OPCODE].vals = str2val(ENCSTR);
> +
> +#include "imported/encode.def"
> +
> +#undef LEGACY_DEF_ENC32
> +#undef DEF_ENC32
> +#undef DEF_ENC_SUBINSN
> +#undef DEF_EXT_ENC
> +
> +#define ATTRIBS(...) , ## __VA_ARGS__, 0
> +#define OP_ATTRIB(TAG, ARGS) init_attribs(TAG ARGS);
> +#include "op_attribs_generated.h"
> +#undef OP_ATTRIB
> +#undef ATTRIBS
> +
> +    decode_init();
> +
> +#define DEF_QEMU(TAG, SHORTCODE, HELPER, GENFN, HELPFN) \
> +    opcode_short_semantics[TAG] = #SHORTCODE;
> +#include "qemu_def_generated.h"
> +#undef DEF_QEMU
> +}
> +
> +
> +#define NEEDLE "IMMEXT("
> +
> +int opcode_which_immediate_is_extended(opcode_t opcode)
> +{
> +    const char *p;
> +    if (opcode >= XX_LAST_OPCODE) {
> +        g_assert_not_reached();
> +        return 0;
> +    }
> +    if (!GET_ATTRIB(opcode, A_EXTENDABLE)) {
> +        g_assert_not_reached();
> +        return 0;
> +    }
> +    p = opcode_short_semantics[opcode];
> +    p = strstr(p, NEEDLE);
> +    if (p == NULL) {
> +        g_assert_not_reached();
> +        return 0;
> +    }
> +    p += strlen(NEEDLE);
> +    while (isspace(*p)) {
> +        p++;
> +    }
> +    /* lower is always imm 0, upper always imm 1. */
> +    if (islower(*p)) {
> +        return 0;
> +    } else if (isupper(*p)) {
> +        return 1;
> +    } else {
> +        g_assert_not_reached();
> +    }
> +}
> diff --git a/target/hexagon/opcodes.h b/target/hexagon/opcodes.h
> new file mode 100644
> index 0000000..ff90207
> --- /dev/null
> +++ b/target/hexagon/opcodes.h
> @@ -0,0 +1,67 @@
> +/*
> + *  Copyright (c) 2019 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 OPCODES_H

HEXAGON_OPCODES_H

I wonder if it would ease review to split this patch in 2, keep the C 
here, but provide opcodes.h in an earlier patch.

> +#define OPCODES_H
> +
> +#include "hex_arch_types.h"
> +#include "attribs.h"
> +
> +typedef enum {
> +#define OPCODE(IID) IID
> +#include "opcodes_def_generated.h"
> +    XX_LAST_OPCODE
> +#undef OPCODE
> +} opcode_t;
> +
> +typedef enum {
> +    NORMAL,
> +    HALF,
> +    SUBINSN_A,
> +    SUBINSN_L1,
> +    SUBINSN_L2,
> +    SUBINSN_S1,
> +    SUBINSN_S2,
> +    EXT_noext,
> +    EXT_mmvec,
> +    XX_LAST_ENC_CLASS
> +} enc_class_t;
> +
> +extern const char *opcode_names[];
> +
> +extern const char *opcode_reginfo[];
> +extern const char *opcode_rregs[];
> +extern const char *opcode_wregs[];
> +
> +typedef struct {
> +    const char * const encoding;
> +    size4u_t vals;
> +    size4u_t dep_vals;
> +    const enc_class_t enc_class;
> +    size1u_t is_ee:1;
> +} opcode_encoding_t;
> +
> +extern opcode_encoding_t opcode_encodings[XX_LAST_OPCODE];
> +
> +extern size4u_t
> +    opcode_attribs[XX_LAST_OPCODE][(A_ZZ_LASTATTRIB / ATTRIB_WIDTH) + 1];
> +
> +extern void opcode_init(void);
> +
> +extern int opcode_which_immediate_is_extended(opcode_t opcode);
> +
> +#endif
>
Taylor Simpson Feb. 12, 2020, 5:36 p.m. UTC | #2 
> -----Original Message-----
> From: Philippe Mathieu-Daudé <philmd@redhat.com>
> Sent: Tuesday, February 11, 2020 1:41 AM
> To: Taylor Simpson <tsimpson@quicinc.com>; qemu-devel@nongnu.org
> Cc: richard.henderson@linaro.org; laurent@vivier.eu; riku.voipio@iki.fi;
> aleksandar.m.mail@gmail.com
> Subject: Re: [RFC PATCH 29/66] Hexagon opcode data structures
>
> > +#ifndef OPCODES_H
>
> HEXAGON_OPCODES_H
>
> I wonder if it would ease review to split this patch in 2, keep the C
> here, but provide opcodes.h in an earlier patch.

Wouldn't using scripts/git.orderfile solve this just as well?  It will put opcodes.h ahead of opcodes.c in this patch.

>
> > +#define OPCODES_H
> > +
diff mbox series

Patch

diff --git a/target/hexagon/opcodes.c b/target/hexagon/opcodes.c
new file mode 100644
index 0000000..1c1b200
--- /dev/null
+++ b/target/hexagon/opcodes.c
@@ -0,0 +1,223 @@ 
+/*
+ *  Copyright (c) 2019 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/>.
+ */
+
+/*
+ * opcodes.c
+ *
+ * data tables generated automatically
+ * Maybe some functions too
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include "qemu/osdep.h"
+#include "opcodes.h"
+#include "decode.h"
+
+#define VEC_DESCR(A, B, C) DESCR(A, B, C)
+#define DONAME(X) #X
+
+const char *opcode_names[] = {
+#define OPCODE(IID) DONAME(IID)
+#include "opcodes_def_generated.h"
+    NULL
+#undef OPCODE
+};
+
+const char *opcode_reginfo[] = {
+#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2)    /* nothing */
+#define REGINFO(TAG, REGINFO, RREGS, WREGS) REGINFO,
+#include "op_regs_generated.h"
+    NULL
+#undef REGINFO
+#undef IMMINFO
+};
+
+
+const char *opcode_rregs[] = {
+#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2)    /* nothing */
+#define REGINFO(TAG, REGINFO, RREGS, WREGS) RREGS,
+#include "op_regs_generated.h"
+    NULL
+#undef REGINFO
+#undef IMMINFO
+};
+
+
+const char *opcode_wregs[] = {
+#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2)    /* nothing */
+#define REGINFO(TAG, REGINFO, RREGS, WREGS) WREGS,
+#include "op_regs_generated.h"
+    NULL
+#undef REGINFO
+#undef IMMINFO
+};
+
+const char *opcode_short_semantics[] = {
+#define OPCODE(X)              NULL
+#include "opcodes_def_generated.h"
+#undef OPCODE
+    NULL
+};
+
+
+size4u_t
+    opcode_attribs[XX_LAST_OPCODE][(A_ZZ_LASTATTRIB / ATTRIB_WIDTH) + 1] = {0};
+
+static void init_attribs(int tag, ...)
+{
+    va_list ap;
+    int attr;
+    va_start(ap, tag);
+    while ((attr = va_arg(ap, int)) != 0) {
+        opcode_attribs[tag][attr / ATTRIB_WIDTH] |= 1 << (attr % ATTRIB_WIDTH);
+    }
+}
+
+static size4u_t str2val(const char *str)
+{
+    size4u_t ret = 0;
+    for ( ; *str; str++) {
+        switch (*str) {
+        case ' ':
+        case '\t':
+            break;
+        case 's':
+        case 't':
+        case 'u':
+        case 'v':
+        case 'w':
+        case 'd':
+        case 'e':
+        case 'x':
+        case 'y':
+        case 'i':
+        case 'I':
+        case 'P':
+        case 'E':
+        case 'o':
+        case '-':
+        case '0':
+            ret = (ret << 1) | 0;
+            break;
+        case '1':
+            ret = (ret << 1) | 1;
+            break;
+        default:
+            break;
+        }
+    }
+    return ret;
+}
+
+static size1u_t has_ee(const char *str)
+{
+    return (strchr(str, 'E') != NULL);
+}
+
+opcode_encoding_t opcode_encodings[] = {
+#define DEF_ENC32(OPCODE, ENCSTR) \
+    [OPCODE] = { .encoding = ENCSTR },
+
+#define DEF_ENC_SUBINSN(OPCODE, CLASS, ENCSTR) \
+    [OPCODE] = { .encoding = ENCSTR, .enc_class = CLASS },
+
+#define DEF_EXT_ENC(OPCODE, CLASS, ENCSTR) \
+    [OPCODE] = { .encoding = ENCSTR, .enc_class = CLASS },
+
+#include "imported/encode.def"
+
+#undef DEF_ENC32
+#undef DEF_ENC_SUBINSN
+#undef DEF_EXT_ENC
+};
+
+void opcode_init(void)
+{
+    init_attribs(0, 0);
+
+#define DEF_ENC32(OPCODE, ENCSTR) \
+    opcode_encodings[OPCODE].vals = str2val(ENCSTR); \
+    opcode_encodings[OPCODE].is_ee = has_ee(ENCSTR);
+
+#define DEF_ENC_SUBINSN(OPCODE, CLASS, ENCSTR) \
+    opcode_encodings[OPCODE].vals = str2val(ENCSTR);
+
+#define LEGACY_DEF_ENC32(OPCODE, ENCSTR) \
+    opcode_encodings[OPCODE].dep_vals = str2val(ENCSTR);
+
+#define DEF_EXT_ENC(OPCODE, CLASS, ENCSTR) \
+    opcode_encodings[OPCODE].vals = str2val(ENCSTR);
+
+#include "imported/encode.def"
+
+#undef LEGACY_DEF_ENC32
+#undef DEF_ENC32
+#undef DEF_ENC_SUBINSN
+#undef DEF_EXT_ENC
+
+#define ATTRIBS(...) , ## __VA_ARGS__, 0
+#define OP_ATTRIB(TAG, ARGS) init_attribs(TAG ARGS);
+#include "op_attribs_generated.h"
+#undef OP_ATTRIB
+#undef ATTRIBS
+
+    decode_init();
+
+#define DEF_QEMU(TAG, SHORTCODE, HELPER, GENFN, HELPFN) \
+    opcode_short_semantics[TAG] = #SHORTCODE;
+#include "qemu_def_generated.h"
+#undef DEF_QEMU
+}
+
+
+#define NEEDLE "IMMEXT("
+
+int opcode_which_immediate_is_extended(opcode_t opcode)
+{
+    const char *p;
+    if (opcode >= XX_LAST_OPCODE) {
+        g_assert_not_reached();
+        return 0;
+    }
+    if (!GET_ATTRIB(opcode, A_EXTENDABLE)) {
+        g_assert_not_reached();
+        return 0;
+    }
+    p = opcode_short_semantics[opcode];
+    p = strstr(p, NEEDLE);
+    if (p == NULL) {
+        g_assert_not_reached();
+        return 0;
+    }
+    p += strlen(NEEDLE);
+    while (isspace(*p)) {
+        p++;
+    }
+    /* lower is always imm 0, upper always imm 1. */
+    if (islower(*p)) {
+        return 0;
+    } else if (isupper(*p)) {
+        return 1;
+    } else {
+        g_assert_not_reached();
+    }
+}
diff --git a/target/hexagon/opcodes.h b/target/hexagon/opcodes.h
new file mode 100644
index 0000000..ff90207
--- /dev/null
+++ b/target/hexagon/opcodes.h
@@ -0,0 +1,67 @@ 
+/*
+ *  Copyright (c) 2019 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 OPCODES_H
+#define OPCODES_H
+
+#include "hex_arch_types.h"
+#include "attribs.h"
+
+typedef enum {
+#define OPCODE(IID) IID
+#include "opcodes_def_generated.h"
+    XX_LAST_OPCODE
+#undef OPCODE
+} opcode_t;
+
+typedef enum {
+    NORMAL,
+    HALF,
+    SUBINSN_A,
+    SUBINSN_L1,
+    SUBINSN_L2,
+    SUBINSN_S1,
+    SUBINSN_S2,
+    EXT_noext,
+    EXT_mmvec,
+    XX_LAST_ENC_CLASS
+} enc_class_t;
+
+extern const char *opcode_names[];
+
+extern const char *opcode_reginfo[];
+extern const char *opcode_rregs[];
+extern const char *opcode_wregs[];
+
+typedef struct {
+    const char * const encoding;
+    size4u_t vals;
+    size4u_t dep_vals;
+    const enc_class_t enc_class;
+    size1u_t is_ee:1;
+} opcode_encoding_t;
+
+extern opcode_encoding_t opcode_encodings[XX_LAST_OPCODE];
+
+extern size4u_t
+    opcode_attribs[XX_LAST_OPCODE][(A_ZZ_LASTATTRIB / ATTRIB_WIDTH) + 1];
+
+extern void opcode_init(void);
+
+extern int opcode_which_immediate_is_extended(opcode_t opcode);
+
+#endif