Commit 577f25a5 authored by Blue Swirl's avatar Blue Swirl
Browse files

ppc: avoid write only variables 



Compiling with GCC 4.6.0 20100925 produced warnings:
/src/qemu/target-ppc/op_helper.c: In function 'helper_icbi':
/src/qemu/target-ppc/op_helper.c:351:14: error: variable 'tmp' set but not used [-Werror=unused-but-set-variable]
/src/qemu/target-ppc/op_helper.c: In function 'do_6xx_tlb':
/src/qemu/target-ppc/op_helper.c:3805:28: error: variable 'EPN' set but not used [-Werror=unused-but-set-variable]
/src/qemu/target-ppc/op_helper.c: In function 'do_74xx_tlb':
/src/qemu/target-ppc/op_helper.c:3838:28: error: variable 'EPN' set but not used [-Werror=unused-but-set-variable]

Fix by adding a dummy cast so that the variable is not unused. Delete tmp.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 4581cbcd

target-ppc/op_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -348,15 +348,13 @@ void helper_dcbz_970(target_ulong addr) 


void helper_icbi(target_ulong addr)

{

    uint32_t tmp;



    addr &= ~(env->dcache_line_size - 1);

    /* Invalidate one cache line :

     * PowerPC specification says this is to be treated like a load

     * (not a fetch) by the MMU. To be sure it will be so,

     * do the load "by hand".

     */

    tmp = ldl(addr);

    ldl(addr);

    tb_invalidate_page_range(addr, addr + env->icache_line_size);

}
@@ -3814,6 +3812,7 @@ static void do_6xx_tlb (target_ulong new_EPN, int is_code) 
        EPN = env->spr[SPR_DMISS];

    }

    way = (env->spr[SPR_SRR1] >> 17) & 1;

    (void)EPN; /* avoid a compiler warning */

    LOG_SWTLB("%s: EPN " TARGET_FMT_lx " " TARGET_FMT_lx " PTE0 " TARGET_FMT_lx

              " PTE1 " TARGET_FMT_lx " way %d\n", __func__, new_EPN, EPN, CMP,

              RPN, way);
@@ -3842,6 +3841,7 @@ static void do_74xx_tlb (target_ulong new_EPN, int is_code) 
    CMP = env->spr[SPR_PTEHI];

    EPN = env->spr[SPR_TLBMISS] & ~0x3;

    way = env->spr[SPR_TLBMISS] & 0x3;

    (void)EPN; /* avoid a compiler warning */

    LOG_SWTLB("%s: EPN " TARGET_FMT_lx " " TARGET_FMT_lx " PTE0 " TARGET_FMT_lx

              " PTE1 " TARGET_FMT_lx " way %d\n", __func__, new_EPN, EPN, CMP,

              RPN, way);