Diff for /qemu/user-exec.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2018/04/24 18:56:20 version 1.1.1.2, 2018/04/24 19:17:25
Line 17 Line 17
  * 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 "config.h"  #include "config.h"
 #include "exec.h"  #include "cpu.h"
   #include "dyngen-exec.h"
 #include "disas.h"  #include "disas.h"
 #include "tcg.h"  #include "tcg.h"
   
Line 40 Line 41
 static void exception_action(CPUState *env1)  static void exception_action(CPUState *env1)
 {  {
 #if defined(TARGET_I386)  #if defined(TARGET_I386)
     raise_exception_err(env1->exception_index, env1->error_code);      raise_exception_err_env(env1, env1->exception_index, env1->error_code);
 #else  #else
     cpu_loop_exit(env1);      cpu_loop_exit(env1);
 #endif  #endif
Line 101  static inline int handle_cpu_signal(unsi Line 102  static inline int handle_cpu_signal(unsi
     }      }
   
     /* see if it is an MMU fault */      /* see if it is an MMU fault */
     ret = cpu_handle_mmu_fault(env, address, is_write, MMU_USER_IDX, 0);      ret = cpu_handle_mmu_fault(env, address, is_write, MMU_USER_IDX);
     if (ret < 0) {      if (ret < 0) {
         return 0; /* not an MMU fault */          return 0; /* not an MMU fault */
     }      }
Line 628  int cpu_signal_handler(int host_signum,  Line 629  int cpu_signal_handler(int host_signum, 
 #error host CPU specific signal handler needed  #error host CPU specific signal handler needed
   
 #endif  #endif
   
 #if defined(TARGET_I386)  
   
 void cpu_x86_load_seg(CPUX86State *s, int seg_reg, int selector)  
 {  
     CPUX86State *saved_env;  
   
     saved_env = env;  
     env = s;  
     if (!(env->cr[0] & CR0_PE_MASK) || (env->eflags & VM_MASK)) {  
         selector &= 0xffff;  
         cpu_x86_load_seg_cache(env, seg_reg, selector,  
                                (selector << 4), 0xffff, 0);  
     } else {  
         helper_load_seg(seg_reg, selector);  
     }  
     env = saved_env;  
 }  
   
 void cpu_x86_fsave(CPUX86State *s, target_ulong ptr, int data32)  
 {  
     CPUX86State *saved_env;  
   
     saved_env = env;  
     env = s;  
   
     helper_fsave(ptr, data32);  
   
     env = saved_env;  
 }  
   
 void cpu_x86_frstor(CPUX86State *s, target_ulong ptr, int data32)  
 {  
     CPUX86State *saved_env;  
   
     saved_env = env;  
     env = s;  
   
     helper_frstor(ptr, data32);  
   
     env = saved_env;  
 }  
   
 #endif /* TARGET_I386 */  

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


unix.superglobalmegacorp.com