diff options
| author | Peter Maydell | 2020-06-11 14:07:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-06-11 14:07:34 +0200 |
| commit | 470dd165d152ff7ceac61c7b71c2b89220b3aad7 (patch) | |
| tree | f0f0444b132c9089e10ec4ff4f5f08899639a146 /target/mips/internal.h | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-dt-20200609' into staging (diff) | |
| parent | target/mips: Enable hardware page table walker and CMGCR features for P5600 (diff) | |
| download | qemu-470dd165d152ff7ceac61c7b71c2b89220b3aad7.tar.gz qemu-470dd165d152ff7ceac61c7b71c2b89220b3aad7.tar.xz qemu-470dd165d152ff7ceac61c7b71c2b89220b3aad7.zip | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-09-2020' into staging
MIPS queue for June 9th, 2020
# gpg: Signature made Tue 09 Jun 2020 17:18:59 BST
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-jun-09-2020:
target/mips: Enable hardware page table walker and CMGCR features for P5600
target/mips: Add Loongson-3 CPU definition
target/mips: fpu: Refactor conversion from ieee to mips exception flags
target/mips: fpu: Name better paired-single variables
target/mips: fpu: Remove now unused FLOAT_RINT macro
target/mips: fpu: Demacro RINT.<D|S>
target/mips: fpu: Remove now unused FLOAT_CLASS macro
target/mips: fpu: Demacro CLASS.<D|S>
target/mips: fpu: Remove now unused UNFUSED_FMA and FLOAT_FMA macros
target/mips: fpu: Demacro NMSUB.<D|S|PS>
target/mips: fpu: Demacro NMADD.<D|S|PS>
target/mips: fpu: Demacro MSUB.<D|S|PS>
target/mips: fpu: Demacro MADD.<D|S|PS>
target/mips: fpu: Remove now unused macro FLOAT_BINOP
target/mips: fpu: Demacro DIV.<D|S|PS>
target/mips: fpu: Demacro MUL.<D|S|PS>
target/mips: fpu: Demacro SUB.<D|S|PS>
target/mips: fpu: Demacro ADD.<D|S|PS>
mailmap: Change email address of Stefan Brankovic
mailmap: Change email address of Filip Bozuta
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/mips/internal.h')
| -rw-r--r-- | target/mips/internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/mips/internal.h b/target/mips/internal.h index 1bf274b3ef..7f159a9230 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -36,7 +36,9 @@ struct mips_def_t { int32_t CP0_Config5; int32_t CP0_Config5_rw_bitmask; int32_t CP0_Config6; + int32_t CP0_Config6_rw_bitmask; int32_t CP0_Config7; + int32_t CP0_Config7_rw_bitmask; target_ulong CP0_LLAddr_rw_bitmask; int CP0_LLAddr_shift; int32_t SYNCI_Step; @@ -224,7 +226,6 @@ uint32_t float_class_s(uint32_t arg, float_status *fst); uint64_t float_class_d(uint64_t arg, float_status *fst); extern unsigned int ieee_rm[]; -int ieee_ex_to_mips(int xcpt); void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask); static inline void restore_rounding_mode(CPUMIPSState *env) |