Diff for /qemu/target-cris/op_helper.c between versions 1.1.1.6 and 1.1.1.7

version 1.1.1.6, 2018/04/24 19:03:26 version 1.1.1.7, 2018/04/24 19:32:00
Line 18 Line 18
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.   * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */   */
   
 #include "exec.h"  #include "cpu.h"
   #include "dyngen-exec.h"
 #include "mmu.h"  #include "mmu.h"
 #include "helper.h"  #include "helper.h"
 #include "host-utils.h"  #include "host-utils.h"
Line 35 Line 36
 #endif  #endif
   
 #if !defined(CONFIG_USER_ONLY)  #if !defined(CONFIG_USER_ONLY)
   #include "softmmu_exec.h"
   
 #define MMUSUFFIX _mmu  #define MMUSUFFIX _mmu
   
Line 54 Line 56
    NULL, it means that the function was called in C code (i.e. not     NULL, it means that the function was called in C code (i.e. not
    from generated code or from helper.c) */     from generated code or from helper.c) */
 /* XXX: fix it to restore all registers */  /* XXX: fix it to restore all registers */
 void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)  void tlb_fill(CPUState *env1, target_ulong addr, int is_write, int mmu_idx,
                 void *retaddr)
 {  {
     TranslationBlock *tb;      TranslationBlock *tb;
     CPUState *saved_env;      CPUState *saved_env;
     unsigned long pc;      unsigned long pc;
     int ret;      int ret;
   
     /* XXX: hack to restore env in all cases, even if not called from  
        generated code */  
     saved_env = env;      saved_env = env;
     env = cpu_single_env;      env = env1;
   
     D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__,       D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__, 
              env->pc, env->debug1, retaddr);               env->pc, env->debug1, retaddr);
     ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);      ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx);
     if (unlikely(ret)) {      if (unlikely(ret)) {
         if (retaddr) {          if (retaddr) {
             /* now we have a real cpu fault */              /* now we have a real cpu fault */

Removed from v.1.1.1.6  
changed lines
  Added in v.1.1.1.7


unix.superglobalmegacorp.com