Diff for /qemu/target-m68k/op_helper.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2018/04/24 19:02:59 version 1.1.1.5, 2018/04/24 19:31:20
Line 16 Line 16
  * You should have received a copy of the GNU Lesser General Public   * You should have received a copy of the GNU Lesser General Public
  * 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 "helpers.h"  #include "helpers.h"
   
 #if defined(CONFIG_USER_ONLY)  #if defined(CONFIG_USER_ONLY)
Line 34  void do_interrupt_m68k_hardirq(CPUState  Line 35  void do_interrupt_m68k_hardirq(CPUState 
   
 extern int semihosting_enabled;  extern int semihosting_enabled;
   
   #include "softmmu_exec.h"
   
 #define MMUSUFFIX _mmu  #define MMUSUFFIX _mmu
   
 #define SHIFT 0  #define SHIFT 0
Line 52  extern int semihosting_enabled; Line 55  extern int semihosting_enabled;
    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;
     ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);      ret = cpu_m68k_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.4  
changed lines
  Added in v.1.1.1.5


unix.superglobalmegacorp.com