gwj / at91sam9263 · Commits

Commit 9706285b78800f85b18e17e47000a429e277051c

Authored by j_mayer
1 parent 92868412

Avoid compilation warnings on 32 bits hosts. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3203 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
target-ppc/helper.c
  View file @9706285
@@ -846,10 +846,12 @@ static int ppcemb_tlb_check (CPUState *env, ppcemb_tlb_t *tlb, @@ -846,10 +846,12 @@ static int ppcemb_tlb_check (CPUState *env, ppcemb_tlb_t *tlb,
846 if ((address & mask) != tlb->EPN) 846 if ((address & mask) != tlb->EPN)
847 return -1; 847 return -1;
848 *raddrp = (tlb->RPN & mask) | (address & ~mask); 848 *raddrp = (tlb->RPN & mask) | (address & ~mask);
  849 +#if (TARGET_PHYS_ADDR_BITS >= 36)
849 if (ext) { 850 if (ext) {
850 /* Extend the physical address to 36 bits */ 851 /* Extend the physical address to 36 bits */
851 *raddrp |= (target_phys_addr_t)(tlb->RPN & 0xF) << 32; 852 *raddrp |= (target_phys_addr_t)(tlb->RPN & 0xF) << 32;
852 } 853 }
  854 +#endif
853 855
854 return 0; 856 return 0;
855 } 857 }
@@ -1078,11 +1080,11 @@ static int check_physical (CPUState *env, mmu_ctx_t *ctx, @@ -1078,11 +1080,11 @@ static int check_physical (CPUState *env, mmu_ctx_t *ctx,
1078 #if defined(TARGET_PPC64) 1080 #if defined(TARGET_PPC64)
1079 case PPC_FLAGS_MMU_64B: 1081 case PPC_FLAGS_MMU_64B:
1080 case PPC_FLAGS_MMU_64BRIDGE: 1082 case PPC_FLAGS_MMU_64BRIDGE:
1081 -#endif  
1082 /* Real address are 60 bits long */ 1083 /* Real address are 60 bits long */
1083 ctx->raddr &= 0x0FFFFFFFFFFFFFFFUL; 1084 ctx->raddr &= 0x0FFFFFFFFFFFFFFFUL;
1084 ctx->prot |= PAGE_WRITE; 1085 ctx->prot |= PAGE_WRITE;
1085 break; 1086 break;
  1087 +#endif
1086 case PPC_FLAGS_MMU_403: 1088 case PPC_FLAGS_MMU_403:
1087 if (unlikely(msr_pe != 0)) { 1089 if (unlikely(msr_pe != 0)) {
1088 /* 403 family add some particular protections, 1090 /* 403 family add some particular protections,