projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dcb2b9e
)
PPC: booke206: allow NULL raddr in ppcmas_tlb_check
author
Alexander Graf
<agraf@suse.de>
Fri, 20 Jan 2012 03:06:18 +0000
(
04:06
+0100)
committer
Alexander Graf
<agraf@suse.de>
Thu, 2 Feb 2012 01:47:45 +0000
(
02:47
+0100)
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 <agraf@suse.de>
target-ppc/helper.c
patch
|
blob
|
history
diff --git
a/target-ppc/helper.c
b/target-ppc/helper.c
index 58474536c0fefb73808c04f06a16214b4b05d36b..2ce2d9238f31a24912ca3b4a82483ee81e2e4374 100644
(file)
--- 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;
}