gwj / at91sam9263 · Commits

Commit 7495fd0f4a7b0b017f56d8f0a4fc4c3c5c3aa085

Authored by ths
1 parent f8c6ff6c

Simplify code and fix formatting. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2282 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
target-mips/op_helper.c
  View file @7495fd0
... ... @@ -162,12 +162,12 @@ void do_drotrv (void)
162 162 #if TARGET_LONG_BITS > HOST_LONG_BITS
163 163 static inline uint64_t get_HILO (void)
164 164 {
165   - return ((uint64_t)env->HI << 32) | (uint64_t)env->LO;
  165 + return (env->HI << 32) | (uint32_t)env->LO;
166 166 }
167 167  
168 168 static inline void set_HILO (uint64_t HILO)
169 169 {
170   - env->LO = (int32_t)(HILO & 0xFFFFFFFF);
  170 + env->LO = (int32_t)HILO;
171 171 env->HI = (int32_t)(HILO >> 32);
172 172 }
173 173  
... ... @@ -523,10 +523,10 @@ void do_tlbr (void)
523 523 env->CP0_EntryHi = tlb->VPN | tlb->ASID;
524 524 size = (tlb->end - tlb->VPN) >> 12;
525 525 env->CP0_PageMask = (size - 1) << 13;
526   - env->CP0_EntryLo0 = tlb->G | (tlb->V0 << 1) | (tlb->D0 << 2)
527   - | (tlb->C0 << 3) | (tlb->PFN[0] >> 6);
528   - env->CP0_EntryLo1 = tlb->G | (tlb->V1 << 1) | (tlb->D1 << 2)
529   - | (tlb->C1 << 3) | (tlb->PFN[1] >> 6);
  526 + env->CP0_EntryLo0 = tlb->G | (tlb->V0 << 1) | (tlb->D0 << 2) |
  527 + (tlb->C0 << 3) | (tlb->PFN[0] >> 6);
  528 + env->CP0_EntryLo1 = tlb->G | (tlb->V1 << 1) | (tlb->D1 << 2) |
  529 + (tlb->C1 << 3) | (tlb->PFN[1] >> 6);
530 530 }
531 531 #endif
532 532  
... ...