From 69d31fbbabe890e6e9109a89765b1496db5428d4 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 20 Feb 2018 16:47:51 -0500 Subject: [PATCH] target-mips: Stop using uint_fast*_t types in r4k_tlb_t struct The r4k_tlb_t structure uses the uint_fast*_t types. Most of these uses are in bitfields and are thus pointless, because the bitfield itself specifies the width of the type; just use 'unsigned int' instead. (On glibc uint_fast16_t is defined as either 32 or 64 bits, so we know the code is not reliant on it being exactly 16 bits.) There is also one use of uint_fast8_t, which we replace with uint8_t, because both are exactly 8 bits on glibc and this is the only place outside the softfloat code which uses an int_fast*_t type. Backports commit d783f78933b212537ece77c7ec66866cc2bc0f4d from qemu --- qemu/target-mips/cpu.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/qemu/target-mips/cpu.h b/qemu/target-mips/cpu.h index 9530c6c5..e0c3ed5d 100644 --- a/qemu/target-mips/cpu.h +++ b/qemu/target-mips/cpu.h @@ -19,19 +19,19 @@ typedef struct r4k_tlb_t r4k_tlb_t; struct r4k_tlb_t { target_ulong VPN; uint32_t PageMask; - uint_fast8_t ASID; - uint_fast16_t G:1; - uint_fast16_t C0:3; - uint_fast16_t C1:3; - uint_fast16_t V0:1; - uint_fast16_t V1:1; - uint_fast16_t D0:1; - uint_fast16_t D1:1; - uint_fast16_t XI0:1; - uint_fast16_t XI1:1; - uint_fast16_t RI0:1; - uint_fast16_t RI1:1; - uint_fast16_t EHINV:1; + uint8_t ASID; + uint16_t G:1; + uint16_t C0:3; + uint16_t C1:3; + uint16_t V0:1; + uint16_t V1:1; + uint16_t D0:1; + uint16_t D1:1; + uint16_t XI0:1; + uint16_t XI1:1; + uint16_t RI0:1; + uint16_t RI1:1; + uint16_t EHINV:1; uint64_t PFN[2]; };