[RFC,v3,29/34] Hexagon (target/hexagon) TCG generation

Commit Message

Taylor Simpson Aug. 18, 2020, 3:50 p.m. UTC

Include the generated files and set up the data structures

Signed-off-by: Taylor Simpson <[e-mail]>
---
 target/hexagon/genptr.h | 25 ++++++++++++++++++++++
 target/hexagon/genptr.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 target/hexagon/genptr.h
 create mode 100644 target/hexagon/genptr.c

Comments

Richard Henderson Aug. 29, 2020, 1:58 a.m. UTC | #1

On 8/18/20 8:50 AM, Taylor Simpson wrote:
> +/* Fill in the table with NULLs because not all the opcodes have DEF_QEMU */
> +semantic_insn_t opcode_genptr[] = {
> +#define OPCODE(X)                              NULL
> +#include "opcodes_def_generated.h"
> +    NULL
> +#undef OPCODE
> +};
> +
> +/* This function overwrites the NULL entries where we have a DEF_QEMU */
> +void init_genptr(void)
> +{
> +#define DEF_TCG_FUNC(TAG, GENFN) \
> +    opcode_genptr[TAG] = generate_##TAG;
> +#include "tcg_funcs_generated.h"
> +#undef DEF_TCG_FUNC
> +}

Just size the array properly to start.

const semantic_insn_t opcode_genptr[XX_LAST_OPCODE] = {

#define DEF_TCG_FUNC(TAG, GENFN) \
    [TAG] = generate_##TAG,
#include "tcg_funcs_generated.h"

};

Taylor Simpson Aug. 30, 2020, 7:49 p.m. UTC | #2

> -----Original Message-----
> From: Richard Henderson <[e-mail]>
> Sent: Friday, August 28, 2020 7:58 PM
> To: Taylor Simpson <[e-mail]>; [e-mail]
> Cc: [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]
> Subject: Re: [RFC PATCH v3 29/34] Hexagon (target/hexagon) TCG
> generation
>
> On 8/18/20 8:50 AM, Taylor Simpson wrote:
> > +/* Fill in the table with NULLs because not all the opcodes have
> DEF_QEMU */
> > +semantic_insn_t opcode_genptr[] = {
> > +#define OPCODE(X)                              NULL
> > +#include "opcodes_def_generated.h"
> > +    NULL
> > +#undef OPCODE
> > +};
> > +
> > +/* This function overwrites the NULL entries where we have a DEF_QEMU
> */
> > +void init_genptr(void)
> > +{
> > +#define DEF_TCG_FUNC(TAG, GENFN) \
> > +    opcode_genptr[TAG] = generate_##TAG;
> > +#include "tcg_funcs_generated.h"
> > +#undef DEF_TCG_FUNC
> > +}
>
> Just size the array properly to start.
>
> const semantic_insn_t opcode_genptr[XX_LAST_OPCODE] = {
>
> #define DEF_TCG_FUNC(TAG, GENFN) \
>     [TAG] = generate_##TAG,
> #include "tcg_funcs_generated.h"
>
> };

OK

Patch

diff --git a/target/hexagon/genptr.h b/target/hexagon/genptr.h
new file mode 100644
index 0000000..a3a3db1
--- /dev/null
+++ b/target/hexagon/genptr.h
@@ -0,0 +1,25 @@ 
+/*
+ *  Copyright(c) 2019-2020 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_GENPTR_H
+#define HEXAGON_GENPTR_H
+
+#include "insn.h"
+
+extern semantic_insn_t opcode_genptr[];
+
+#endif
diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c
new file mode 100644
index 0000000..a85fc14
--- /dev/null
+++ b/target/hexagon/genptr.c
@@ -0,0 +1,55 @@ 
+/*
+ *  Copyright(c) 2019-2020 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/>.
+ */
+
+#define QEMU_GENERATE
+#include "qemu/osdep.h"
+#include "qemu/log.h"
+#include "cpu.h"
+#include "internal.h"
+#include "tcg/tcg-op.h"
+#include "insn.h"
+#include "opcodes.h"
+#include "translate.h"
+#include "macros.h"
+#include "genptr_helpers.h"
+
+#define DEF_TCG_FUNC(TAG, GENFN) \
+static void generate_##TAG(CPUHexagonState *env, DisasContext *ctx, \
+                           insn_t *insn, packet_t *pkt) \
+{ \
+    GENFN \
+}
+#include "tcg_funcs_generated.h"
+#undef DEF_TCG_FUNC
+
+
+/* Fill in the table with NULLs because not all the opcodes have DEF_QEMU */
+semantic_insn_t opcode_genptr[] = {
+#define OPCODE(X)                              NULL
+#include "opcodes_def_generated.h"
+    NULL
+#undef OPCODE
+};
+
+/* This function overwrites the NULL entries where we have a DEF_QEMU */
+void init_genptr(void)
+{
+#define DEF_TCG_FUNC(TAG, GENFN) \
+    opcode_genptr[TAG] = generate_##TAG;
+#include "tcg_funcs_generated.h"
+#undef DEF_TCG_FUNC
+}