diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-28 12:59:49 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-28 12:59:49 +0000 |
| commit | 711d13d5e2e160c1c3bcbd302af6df3980a99469 (patch) | |
| tree | 7204f6c186475e8d7399989b02fd4848f172d8c0 /disas/nanomips.h | |
| parent | 093a2af7b67e98808dbb7c5364ac21602bec0881 (diff) | |
| parent | 37b9aae2e6e005e6df206a0b4804972460806166 (diff) | |
| download | qemu-711d13d5e2e160c1c3bcbd302af6df3980a99469.zip qemu-711d13d5e2e160c1c3bcbd302af6df3980a99469.tar.gz qemu-711d13d5e2e160c1c3bcbd302af6df3980a99469.tar.bz2 | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-feb-27-2019' into staging
MIPS queue for February 27th, 2019
# gpg: Signature made Wed 27 Feb 2019 13:27:36 GMT
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-feb-27-2019:
target/mips: Preparing for adding MMI instructions
tests/tcg: target/mips: Add tests for MSA integer max/min instructions
tests/tcg: target/mips: Add wrappers for MSA integer max/min instructions
qemu-doc: Add section on MIPS' Boston board
qemu-doc: Add section on MIPS' Fulong 2E board
qemu-doc: Move section on MIPS' mipssim pseudo board
disas: nanoMIPS: Fix a function misnomer
tests/tcg: target/mips: Add tests for MSA integer compare instructions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'disas/nanomips.h')
| -rw-r--r-- | disas/nanomips.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/disas/nanomips.h b/disas/nanomips.h index 6482eda..243c3e3 100644 --- a/disas/nanomips.h +++ b/disas/nanomips.h @@ -159,7 +159,7 @@ private: int64 extract_s__se31_0_11_to_2_20_to_12_s12(uint64 instruction); int64 extract_shift__se5_21_20_19_18_17_16(uint64 instruction); - uint64 extract_ac_13_12(uint64 instruction); + uint64 extract_ac_15_14(uint64 instruction); uint64 extract_bit_16_15_14_13_12_11(uint64 instruction); uint64 extract_bit_23_22_21(uint64 instruction); uint64 extract_c0s_20_19_18_17_16(uint64 instruction); |