Commit 0b49c339 authored Mar 11, 2019 by Sven Schnelle Committed by Richard Henderson Mar 12, 2019

target/hppa: fix TLB handling for page 0



Assume the following sequence:

pitlbe r0(sr0,r0)
iitlba r4,(sr0,r0)
ldil L%3000000,r5
iitlbp r5,(sr0,r0)

This will purge the whole TLB and add an entry for page 0. However
the current TLB implementation in helper_iitlba() will store to
the last empty TLB entry, while helper_iitlbp() will write to the
first empty entry. That is because an empty entry will match address
0 in helper_iitlba()

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Message-Id: <20190311191602.25796-3-svens@stackframe.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

parent 43675d20

target/hppa/mem_helper.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -242,13 +242,15 @@ void HELPER(itlba)(CPUHPPAState *env, target_ulong addr, target_ureg reg)
		/* Zap any old entries covering ADDR; notice empty entries on the way. */
		for (i = 0; i < ARRAY_SIZE(env->tlb); ++i) {
		hppa_tlb_entry *ent = &env->tlb[i];
		if (!ent->entry_valid) {
		empty = ent;
		} else if (ent->va_b <= addr && addr <= ent->va_e) {
		if (ent->va_b <= addr && addr <= ent->va_e) {
		if (ent->entry_valid) {
		hppa_flush_tlb_ent(env, ent);
		}
		if (!empty) {
		empty = ent;
		}
		}
		}

		/* If we didn't see an empty entry, evict one. */
		if (empty == NULL) {