From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 17 May 2019 09:28:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/vivier/tags/m68k-staging-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0f9690e78827d55a508c73432c73f057f59fd41;p=qemu.git

Merge remote-tracking branch 'remotes/vivier/tags/m68k-staging-pull-request' into staging

code cleanup, switch to transaction_failed hook

# gpg: Signature made Thu 16 May 2019 23:33:00 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-staging-pull-request:
  target/m68k: Optimize rotate_x() using extract_i32()
  target/m68k: Fix a tcg_temp leak
  target/m68k: Reduce the l1 TCGLabel scope
  target/m68k: Switch to transaction_failed hook
  target/m68k: In get_physical_address() check for memory access failures
  target/m68k: In dump_address_map() check for memory access failures

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	target/m68k/cpu.h
---

b0f9690e78827d55a508c73432c73f057f59fd41
diff --cc target/m68k/cpu.c
index 6f441bc973,6d09c630b0..b16957934a
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@@ -269,9 -269,9 +269,9 @@@ static void m68k_cpu_class_init(ObjectC
      cc->set_pc = m68k_cpu_set_pc;
      cc->gdb_read_register = m68k_cpu_gdb_read_register;
      cc->gdb_write_register = m68k_cpu_gdb_write_register;
 -    cc->handle_mmu_fault = m68k_cpu_handle_mmu_fault;
 +    cc->tlb_fill = m68k_cpu_tlb_fill;
  #if defined(CONFIG_SOFTMMU)
-     cc->do_unassigned_access = m68k_cpu_unassigned_access;
+     cc->do_transaction_failed = m68k_cpu_transaction_failed;
      cc->get_phys_page_debug = m68k_cpu_get_phys_page_debug;
  #endif
      cc->disas_set_info = m68k_cpu_disas_set_info;
diff --cc target/m68k/cpu.h
index 683d3e2f79,6039b47d0c..9deff9e234
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@@ -542,12 -542,12 +542,13 @@@ static inline int cpu_mmu_index (CPUM68
      return (env->sr & SR_S) == 0 ? 1 : 0;
  }
  
 -int m68k_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw,
 -                              int mmu_idx);
 +bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
 +                       MMUAccessType access_type, int mmu_idx,
 +                       bool probe, uintptr_t retaddr);
- void m68k_cpu_unassigned_access(CPUState *cs, hwaddr addr,
-                                 bool is_write, bool is_exec, int is_asi,
-                                 unsigned size);
+ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr,
+                                  unsigned size, MMUAccessType access_type,
+                                  int mmu_idx, MemTxAttrs attrs,
+                                  MemTxResult response, uintptr_t retaddr);
  
  #include "exec/cpu-all.h"