On 21.05.2012, at 18:31, Andreas Färber <afaer...@suse.de> wrote:
> Am 21.05.2012 18:11, schrieb Fabien Chouteau: >> The size of EPN field in MAS2 depends on page size. This patch adds a >> mask to discard invalid bits in EPN field. >> >> Definition of EPN field from e500v2 RM: >> EPN Effective page number: Depending on page size, only the bits >> associated with a page boundary are valid. Bits that represent offsets >> within a page are ignored and should be cleared. >> >> There is a similar (but more complicated) definition in PowerISA V2.06. >> >> Signed-off-by: Fabien Chouteau <chout...@adacore.com> >> --- >> target-ppc/op_helper.c | 17 +++++++++++++++-- >> 1 file changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c >> index 4ef2332..481b51c 100644 >> --- a/target-ppc/op_helper.c >> +++ b/target-ppc/op_helper.c >> @@ -4227,6 +4227,8 @@ void helper_booke206_tlbwe(void) >> uint32_t tlbncfg, tlbn; >> ppcmas_tlb_t *tlb; >> uint32_t size_tlb, size_ps; >> + target_ulong mask; >> + >> >> switch (env->spr[SPR_BOOKE_MAS0] & MAS0_WQ_MASK) { >> case MAS0_WQ_ALWAYS: > > Minor nitpick: This adds a second white line. > > More severely, this patch is not marked as for 1.1 and I believe > op_helper.c is dropped in Blue's AREG0 conversion, so I would recommend > to rebase on that, since rebasing the large code movements was kind of > nasty. Now that we've fixed ppc and ppc64 TCG it could be applied to > ppc-next, no? Good point. Blue, mind to resend? :) Alex