Diff for /qemu/exec-all.h between versions 1.1.1.11 and 1.1.1.12

version 1.1.1.11, 2018/04/24 18:23:09 version 1.1.1.12, 2018/04/24 18:33:18
Line 177  static inline unsigned int tb_jmp_cache_ Line 177  static inline unsigned int tb_jmp_cache_
   
 static inline unsigned int tb_phys_hash_func(tb_page_addr_t pc)  static inline unsigned int tb_phys_hash_func(tb_page_addr_t pc)
 {  {
     return pc & (CODE_GEN_PHYS_HASH_SIZE - 1);      return (pc >> 2) & (CODE_GEN_PHYS_HASH_SIZE - 1);
 }  }
   
 TranslationBlock *tb_alloc(target_ulong pc);  TranslationBlock *tb_alloc(target_ulong pc);
Line 192  extern TranslationBlock *tb_phys_hash[CO Line 192  extern TranslationBlock *tb_phys_hash[CO
 #if defined(USE_DIRECT_JUMP)  #if defined(USE_DIRECT_JUMP)
   
 #if defined(_ARCH_PPC)  #if defined(_ARCH_PPC)
 extern void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);  void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);
 #define tb_set_jmp_target1 ppc_tb_set_jmp_target  #define tb_set_jmp_target1 ppc_tb_set_jmp_target
 #elif defined(__i386__) || defined(__x86_64__)  #elif defined(__i386__) || defined(__x86_64__)
 static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)  static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)
Line 204  static inline void tb_set_jmp_target1(un Line 204  static inline void tb_set_jmp_target1(un
 #elif defined(__arm__)  #elif defined(__arm__)
 static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)  static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)
 {  {
 #if QEMU_GNUC_PREREQ(4, 1)  #if !QEMU_GNUC_PREREQ(4, 1)
     void __clear_cache(char *beg, char *end);  
 #else  
     register unsigned long _beg __asm ("a1");      register unsigned long _beg __asm ("a1");
     register unsigned long _end __asm ("a2");      register unsigned long _end __asm ("a2");
     register unsigned long _flg __asm ("a3");      register unsigned long _flg __asm ("a3");
Line 218  static inline void tb_set_jmp_target1(un Line 216  static inline void tb_set_jmp_target1(un
         | (((addr - (jmp_addr + 8)) >> 2) & 0xffffff);          | (((addr - (jmp_addr + 8)) >> 2) & 0xffffff);
   
 #if QEMU_GNUC_PREREQ(4, 1)  #if QEMU_GNUC_PREREQ(4, 1)
     __clear_cache((char *) jmp_addr, (char *) jmp_addr + 4);      __builtin___clear_cache((char *) jmp_addr, (char *) jmp_addr + 4);
 #else  #else
     /* flush icache */      /* flush icache */
     _beg = jmp_addr;      _beg = jmp_addr;
Line 334  static inline tb_page_addr_t get_page_ad Line 332  static inline tb_page_addr_t get_page_ad
     }      }
     p = (void *)(unsigned long)addr      p = (void *)(unsigned long)addr
         + env1->tlb_table[mmu_idx][page_index].addend;          + env1->tlb_table[mmu_idx][page_index].addend;
     return qemu_ram_addr_from_host(p);      return qemu_ram_addr_from_host_nofail(p);
 }  }
 #endif  #endif
   

Removed from v.1.1.1.11  
changed lines
  Added in v.1.1.1.12


unix.superglobalmegacorp.com