Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
target-xtensa
/
helper.c
diff --git
a/qemu/target-xtensa/helper.c
b/qemu/target-xtensa/helper.c
index
76be50d
..
839f4a7
100644
(file)
--- a/
qemu/target-xtensa/helper.c
+++ b/
qemu/target-xtensa/helper.c
@@
-25,6
+25,7
@@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
@@
-254,8
+255,8
@@
void xtensa_cpu_do_interrupt(CPUState *cs)
env->config->exception_vector[cs->exception_index]);
env->exception_taken = 1;
} else {
env->config->exception_vector[cs->exception_index]);
env->exception_taken = 1;
} else {
- qemu_log
(
"%s(pc = %08x) bad exception_index: %d\n",
- __func__, env->pc, cs->exception_index);
+ qemu_log
_mask(CPU_LOG_INT,
"%s(pc = %08x) bad exception_index: %d\n",
+
__func__, env->pc, cs->exception_index);
}
break;
}
break;
@@
-541,8
+542,8
@@
static int get_physical_addr_mmu(CPUXtensaState *env, bool update_tlb,
wi = ++env->autorefill_idx & 0x3;
xtensa_tlb_set_entry(env, dtlb, wi, ei, vpn, pte);
env->sregs[EXCVADDR] = vaddr;
wi = ++env->autorefill_idx & 0x3;
xtensa_tlb_set_entry(env, dtlb, wi, ei, vpn, pte);
env->sregs[EXCVADDR] = vaddr;
- qemu_log
(
"%s: autorefill(%08x): %08x -> %08x\n",
- __func__, vaddr, vpn, pte);
+ qemu_log
_mask(CPU_LOG_MMU,
"%s: autorefill(%08x): %08x -> %08x\n",
+
__func__, vaddr, vpn, pte);
} else {
xtensa_tlb_set_entry_mmu(env, &tmp_entry, dtlb, wi, ei, vpn, pte);
entry = &tmp_entry;
} else {
xtensa_tlb_set_entry_mmu(env, &tmp_entry, dtlb, wi, ei, vpn, pte);
entry = &tmp_entry;
@@
-590,8
+591,8
@@
static int get_pte(CPUXtensaState *env, uint32_t vaddr, uint32_t *pte)
int ret = get_physical_addr_mmu(env, false, pt_vaddr, 0, 0,
&paddr, &page_size, &access, false);
int ret = get_physical_addr_mmu(env, false, pt_vaddr, 0, 0,
&paddr, &page_size, &access, false);
- qemu_log
("%s: trying autorefill(%08x) -> %08x\n", __func__
,
- vaddr, ret ? ~0 : paddr);
+ qemu_log
_mask(CPU_LOG_MMU, "%s: trying autorefill(%08x) -> %08x\n"
,
+
__func__,
vaddr, ret ? ~0 : paddr);
if (ret == 0) {
*pte = ldl_phys(cs->as, paddr);
if (ret == 0) {
*pte = ldl_phys(cs->as, paddr);