From ffba87862b37f1d7762370c8d31b09f6e359ff09 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 20 Jan 2012 04:06:18 +0100 Subject: PPC: booke206: allow NULL raddr in ppcmas_tlb_check We might want to call the tlb check function without actually caring about the real address resolution. Check if we really should write the value back. Signed-off-by: Alexander Graf --- target-ppc/helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'target-ppc/helper.c') diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 58474536c0..2ce2d9238f 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -1338,7 +1338,10 @@ int ppcmas_tlb_check(CPUState *env, ppcmas_tlb_t *tlb, if ((address & mask) != (tlb->mas2 & MAS2_EPN_MASK)) { return -1; } - *raddrp = (tlb->mas7_3 & mask) | (address & ~mask); + + if (raddrp) { + *raddrp = (tlb->mas7_3 & mask) | (address & ~mask); + } return 0; } -- cgit v1.2.1