Commit ff323a6b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging 



Patch queue for ppc - 2014-11-20

Hopefully the last few fixups for 2.2:

  - KVM memory slot fix (should usually only occur on PPC)
  - e300 fix
  - Altivec mtvscr instruction fix

# gpg: Signature made Thu 20 Nov 2014 13:53:34 GMT using RSA key ID 03FEDC60
# gpg: Good signature from "Alexander Graf <agraf@suse.de>"
# gpg:                 aka "Alexander Graf <alex@csgraf.de>"

* remotes/agraf/tags/signed-ppc-for-upstream:
  target-ppc: Altivec's mtvscr Decodes Wrong Register
  kvm: Fix memory slot page alignment logic
  target-ppc: Fix breakpoint registers for e300

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f75ad80f 76cb6584

kvm-all.c

+4 −2
Original line number Diff line number Diff line
@@ -634,8 +634,10 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) 
    unsigned delta;



    /* kvm works in page size chunks, but the function may be called

       with sub-page size and unaligned start address. */

    delta = TARGET_PAGE_ALIGN(size) - size;

       with sub-page size and unaligned start address. Pad the start

       address to next and truncate size to previous page boundary. */

    delta = (TARGET_PAGE_SIZE - (start_addr & ~TARGET_PAGE_MASK));

    delta &= ~TARGET_PAGE_MASK;

    if (delta > size) {

        return;

    }

target-ppc/translate.c

+1 −1
Original line number Diff line number Diff line
@@ -6848,7 +6848,7 @@ static void gen_mtvscr(DisasContext *ctx) 
        gen_exception(ctx, POWERPC_EXCP_VPU);

        return;

    }

    p = gen_avr_ptr(rD(ctx->opcode));

    p = gen_avr_ptr(rB(ctx->opcode));

    gen_helper_mtvscr(cpu_env, p);

    tcg_temp_free_ptr(p);

}

target-ppc/translate_init.c

+26 −26
Original line number Diff line number Diff line
@@ -4374,32 +4374,6 @@ static void init_proc_G2LE (CPUPPCState *env) 
                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* Breakpoints */

    /* XXX : not implemented */

    spr_register(env, SPR_DABR, "DABR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_DABR2, "DABR2",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_IABR2, "IABR2",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_IBCR, "IBCR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_DBCR, "DBCR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);



    /* Memory management */

    gen_low_BATs(env);
@@ -4628,6 +4602,32 @@ static void init_proc_e300 (CPUPPCState *env) 
                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* Breakpoints */

    /* XXX : not implemented */

    spr_register(env, SPR_DABR, "DABR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_DABR2, "DABR2",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_IABR2, "IABR2",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_IBCR, "IBCR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* XXX : not implemented */

    spr_register(env, SPR_DBCR, "DBCR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    /* Memory management */

    gen_low_BATs(env);

    gen_high_BATs(env);