diff options
author | Peter Maydell | 2018-01-24 17:59:36 +0100 |
---|---|---|
committer | Peter Maydell | 2018-01-24 17:59:36 +0100 |
commit | 82de978a8b01c37e57a4782012b88ce89e0fa4f6 (patch) | |
tree | dea80d45ca7cff36a09b737506f0121262d29a16 /target/xtensa/translate.c | |
parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
parent | target/xtensa: disas/xtensa: fix coverity warnings (diff) | |
download | qemu-82de978a8b01c37e57a4782012b88ce89e0fa4f6.tar.gz qemu-82de978a8b01c37e57a4782012b88ce89e0fa4f6.tar.xz qemu-82de978a8b01c37e57a4782012b88ce89e0fa4f6.zip |
Merge remote-tracking branch 'remotes/xtensa/tags/20180122-xtensa' into staging
target/xtensa updates:
- make mini-bootloader independent of the initial CPU state;
- add noMMU XTFPGA variants;
- add two noMMU cores: de212 and sample_controller;
- fix issues reported by coverity against xtensa translator and disassembler.
# gpg: Signature made Mon 22 Jan 2018 20:00:01 GMT
# gpg: using RSA key 0x51F9CC91F83FA044
# gpg: Good signature from "Max Filippov <filippov@cadence.com>"
# gpg: aka "Max Filippov <max.filippov@cogentembedded.com>"
# gpg: aka "Max Filippov <jcmvbkbc@gmail.com>"
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB 17D8 51F9 CC91 F83F A044
* remotes/xtensa/tags/20180122-xtensa:
target/xtensa: disas/xtensa: fix coverity warnings
target/xtensa: add sample_controller core
target/xtensa: allow different default CPU for MMU/noMMU
target/xtensa: add de212 core
hw/xtensa/xtfpga: support noMMU cores
hw/xtensa/xtfpga: extract flash configuration
hw/xtensa: extract xtensa_create_memory_regions
target/xtensa: fix default sysrom/sysram addresses
hw/xtensa/xtfpga: clean up function/structure names
hw/xtensa/xtfpga: rewrite mini bootloader
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/xtensa/translate.c')
-rw-r--r-- | target/xtensa/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index bec9efc4d8..671d934ff4 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -942,7 +942,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) unsigned char b[MAX_INSN_LENGTH] = {cpu_ldub_code(env, dc->pc)}; unsigned len = xtensa_op0_insn_len(dc, b[0]); xtensa_format fmt; - unsigned slot, slots; + int slot, slots; unsigned i; if (len == XTENSA_UNDEFINED) { @@ -969,7 +969,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) slots = xtensa_format_num_slots(isa, fmt); for (slot = 0; slot < slots; ++slot) { xtensa_opcode opc; - unsigned opnd, vopnd, opnds; + int opnd, vopnd, opnds; uint32_t raw_arg[MAX_OPCODE_ARGS]; uint32_t arg[MAX_OPCODE_ARGS]; XtensaOpcodeOps *ops; |