ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/misc/mips_itu: Remove MIPSITUState::saar field 

This field is not set. Remove it along with the dead
code it was guarding.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240209090513.9401-7-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-09 08:51:53 +01:00
parent b8db6be27b
commit 48e06b6471
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/misc/mips_itu.c
View File

@ -94,12 +94,6 @@ static void itc_reconfigure(MIPSITUState *tag)
uint64_t size = (1 * KiB) + (am[1] & ITC_AM1_ADDR_MASK_MASK); uint64_t size = (1 * KiB) + (am[1] & ITC_AM1_ADDR_MASK_MASK);
bool is_enabled = (am[0] & ITC_AM0_EN_MASK) != 0; bool is_enabled = (am[0] & ITC_AM0_EN_MASK) != 0;
if (tag->saar) {
address = (tag->saar[0] & 0xFFFFFFFFE000ULL) << 4;
size = 1ULL << ((tag->saar[0] >> 1) & 0x1f);
is_enabled = tag->saar[0] & 1;
}
memory_region_transaction_begin(); memory_region_transaction_begin();
if (!(size & (size - 1))) { if (!(size & (size - 1))) {
memory_region_set_size(mr, size); memory_region_set_size(mr, size);
@ -158,12 +152,7 @@ static inline ITCView get_itc_view(hwaddr addr)
static inline int get_cell_stride_shift(const MIPSITUState *s) static inline int get_cell_stride_shift(const MIPSITUState *s)
{ {
/* Minimum interval (for EntryGain = 0) is 128 B */ /* Minimum interval (for EntryGain = 0) is 128 B */
if (s->saar) { return 7 + (s->ITCAddressMap[1] & ITC_AM1_ENTRY_GRAIN_MASK);
return 7 + ((s->icr0 >> ITC_ICR0_BLK_GRAIN) &
ITC_ICR0_BLK_GRAIN_MASK);
} else {
return 7 + (s->ITCAddressMap[1] & ITC_AM1_ENTRY_GRAIN_MASK);
}
} }
static inline ITCStorageCell *get_cell(MIPSITUState *s, static inline ITCStorageCell *get_cell(MIPSITUState *s,
@ -535,15 +524,10 @@ static void mips_itu_reset(DeviceState *dev)
{ {
MIPSITUState *s = MIPS_ITU(dev); MIPSITUState *s = MIPS_ITU(dev);
if (s->saar) { s->ITCAddressMap[0] = 0;
s->saar[0] = 0x11 << 1; s->ITCAddressMap[1] =
s->icr0 = get_num_cells(s) << ITC_ICR0_CELL_NUM;
} else {
s->ITCAddressMap[0] = 0;
s->ITCAddressMap[1] =
((ITC_STORAGE_ADDRSPACE_SZ - 1) & ITC_AM1_ADDR_MASK_MASK) | ((ITC_STORAGE_ADDRSPACE_SZ - 1) & ITC_AM1_ADDR_MASK_MASK) |
(get_num_cells(s) << ITC_AM1_NUMENTRIES_OFS); (get_num_cells(s) << ITC_AM1_NUMENTRIES_OFS);
}
itc_reconfigure(s); itc_reconfigure(s);
itc_reset_cells(s); itc_reset_cells(s);

3
include/hw/misc/mips_itu.h
View File

@ -70,9 +70,6 @@ struct MIPSITUState {
/* ITU Control Register */ /* ITU Control Register */
uint64_t icr0; uint64_t icr0;
/* SAAR */
uint64_t *saar;
}; };
/* Get ITC Configuration Tag memory region. */ /* Get ITC Configuration Tag memory region. */