Revision decb4714 target-ppc/helper.c

b/target-ppc/helper.c
606 606
            r = pte64_check(ctx, pte0, pte1, h, rw, type);
607 607
            LOG_MMU("Load pte from " TARGET_FMT_lx " => " TARGET_FMT_lx " "
608 608
                    TARGET_FMT_lx " %d %d %d " TARGET_FMT_lx "\n",
609
                    pteg_base + (i * 16), pte0, pte1, (int)(pte0 & 1), h,
609
                    pteg_off + (i * 16), pte0, pte1, (int)(pte0 & 1), h,
610 610
                    (int)((pte0 >> 1) & 1), ctx->ptem);
611 611
        } else
612 612
#endif
......
621 621
            r = pte32_check(ctx, pte0, pte1, h, rw, type);
622 622
            LOG_MMU("Load pte from " TARGET_FMT_lx " => " TARGET_FMT_lx " "
623 623
                    TARGET_FMT_lx " %d %d %d " TARGET_FMT_lx "\n",
624
                    pteg_base + (i * 8), pte0, pte1, (int)(pte0 >> 31), h,
624
                    pteg_off + (i * 8), pte0, pte1, (int)(pte0 >> 31), h,
625 625
                    (int)((pte0 >> 6) & 1), ctx->ptem);
626 626
        }
627 627
        switch (r) {
......
918 918
                    if (eaddr != 0xEFFFFFFF)
919 919
                        LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx
920 920
                                " vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx
921
                                " hash=" TARGET_FMT_plx " pg_addr="
922
                                TARGET_FMT_plx "\n", env->htab_base,
921
                                " hash=" TARGET_FMT_plx "\n", env->htab_base,
923 922
                                env->htab_mask, vsid, ctx->ptem, ctx->hash[1]);
924 923
                    ret2 = find_pte(env, ctx, 1, rw, type,
925 924
                                    target_page_bits);
......
2140 2139
        /* VSID = VSID */
2141 2140
        rs |= (value & 0xfffffff) << 12;
2142 2141
        /* flags = flags */
2143
        rs |= ((value >> 27) & 0xf) << 9;
2142
        rs |= ((value >> 27) & 0xf) << 8;
2144 2143

  
2145 2144
        ppc_store_slb(env, rb, rs);
2146 2145
    } else

Also available in: Unified diff