| Message ID | 20190809154153.31763-4-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | decodetree improvements | expand |
On 8/9/19 5:41 PM, Richard Henderson wrote: > These are now generated by decodetree itself. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/riscv/translate.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/target/riscv/translate.c b/target/riscv/translate.c > index 8d6ab73258..adeddb85f6 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -708,26 +708,9 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, > #include "insn_trans/trans_rvd.inc.c" > #include "insn_trans/trans_privileged.inc.c" > > -/* > - * Auto-generated decoder. > - * Note that the 16-bit decoder reuses some of the trans_* functions > - * initially declared by the 32-bit decoder, which results in duplicate > - * declaration warnings. Suppress them. > - */ > -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > -# pragma GCC diagnostic push > -# pragma GCC diagnostic ignored "-Wredundant-decls" > -# ifdef __clang__ > -# pragma GCC diagnostic ignored "-Wtypedef-redefinition" > -# endif > -#endif > - > +/* Include the auto-generated decoder for 16 bit insn */ > #include "decode_insn16.inc.c" > > -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > -# pragma GCC diagnostic pop > -#endif > - > static void decode_opc(DisasContext *ctx) > { > /* check for compressed insn */ >
On Fri, 09 Aug 2019 08:41:53 PDT (-0700), richard.henderson@linaro.org wrote: > These are now generated by decodetree itself. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/riscv/translate.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/target/riscv/translate.c b/target/riscv/translate.c > index 8d6ab73258..adeddb85f6 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -708,26 +708,9 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, > #include "insn_trans/trans_rvd.inc.c" > #include "insn_trans/trans_privileged.inc.c" > > -/* > - * Auto-generated decoder. > - * Note that the 16-bit decoder reuses some of the trans_* functions > - * initially declared by the 32-bit decoder, which results in duplicate > - * declaration warnings. Suppress them. > - */ > -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > -# pragma GCC diagnostic push > -# pragma GCC diagnostic ignored "-Wredundant-decls" > -# ifdef __clang__ > -# pragma GCC diagnostic ignored "-Wtypedef-redefinition" > -# endif > -#endif > - > +/* Include the auto-generated decoder for 16 bit insn */ > #include "decode_insn16.inc.c" > > -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > -# pragma GCC diagnostic pop > -#endif > - > static void decode_opc(DisasContext *ctx) > { > /* check for compressed insn */ Acked-by: Palmer Dabbelt <palmer@sifive.com> I assume you're taking this along with the rest though your tree.
On 8/9/19 10:43 AM, Palmer Dabbelt wrote: > Acked-by: Palmer Dabbelt <palmer@sifive.com> > > I assume you're taking this along with the rest though your tree. Yes, that was my plan. r~
On Fri, Aug 9, 2019 at 8:43 AM Richard Henderson <richard.henderson@linaro.org> wrote: > > These are now generated by decodetree itself. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/translate.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/target/riscv/translate.c b/target/riscv/translate.c > index 8d6ab73258..adeddb85f6 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -708,26 +708,9 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, > #include "insn_trans/trans_rvd.inc.c" > #include "insn_trans/trans_privileged.inc.c" > > -/* > - * Auto-generated decoder. > - * Note that the 16-bit decoder reuses some of the trans_* functions > - * initially declared by the 32-bit decoder, which results in duplicate > - * declaration warnings. Suppress them. > - */ > -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > -# pragma GCC diagnostic push > -# pragma GCC diagnostic ignored "-Wredundant-decls" > -# ifdef __clang__ > -# pragma GCC diagnostic ignored "-Wtypedef-redefinition" > -# endif > -#endif > - > +/* Include the auto-generated decoder for 16 bit insn */ > #include "decode_insn16.inc.c" > > -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > -# pragma GCC diagnostic pop > -#endif > - > static void decode_opc(DisasContext *ctx) > { > /* check for compressed insn */ > -- > 2.17.1 > >
diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 8d6ab73258..adeddb85f6 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -708,26 +708,9 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, #include "insn_trans/trans_rvd.inc.c" #include "insn_trans/trans_privileged.inc.c" -/* - * Auto-generated decoder. - * Note that the 16-bit decoder reuses some of the trans_* functions - * initially declared by the 32-bit decoder, which results in duplicate - * declaration warnings. Suppress them. - */ -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wredundant-decls" -# ifdef __clang__ -# pragma GCC diagnostic ignored "-Wtypedef-redefinition" -# endif -#endif - +/* Include the auto-generated decoder for 16 bit insn */ #include "decode_insn16.inc.c" -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -# pragma GCC diagnostic pop -#endif - static void decode_opc(DisasContext *ctx) { /* check for compressed insn */
These are now generated by decodetree itself. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/riscv/translate.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) -- 2.17.1