diff options
| author | Peter Maydell | 2019-08-19 17:55:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-08-19 17:55:30 +0200 |
| commit | 6894576347a71cdf7a1638650ccf3378cfa2a22d (patch) | |
| tree | cfb221f43082c9463107a986708ca41a02412313 /target/riscv | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-softfloat-headers-190... (diff) | |
| parent | target/riscv: Remove redundant declaration pragmas (diff) | |
| download | qemu-6894576347a71cdf7a1638650ccf3378cfa2a22d.tar.gz qemu-6894576347a71cdf7a1638650ccf3378cfa2a22d.tar.xz qemu-6894576347a71cdf7a1638650ccf3378cfa2a22d.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-dt-20190819' into staging
Implement parameter fields.
Push warning pragmas into the generated code.
# gpg: Signature made Mon 19 Aug 2019 16:14:41 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-dt-20190819:
target/riscv: Remove redundant declaration pragmas
decodetree: Suppress redundant declaration warnings
decodetree: Allow !function with no input bits
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/riscv')
| -rw-r--r-- | target/riscv/translate.c | 19 |
1 files changed, 1 insertions, 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 */ |