jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
target/openrisc: Merge mmu_helper.c into mmu.c
With tlb_fill in mmu.c, we can simplify things further.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Stafford Horne <shorne@gmail.com>
authored by
Richard Henderson
and committed by
Stafford Horne
fd992ee7
23d45ebd
+12
-41
+1
-1
target/openrisc/Makefile.objs
+1
-1
target/openrisc/Makefile.objs
···
1
1
obj-$(CONFIG_SOFTMMU) += machine.o
2
2
obj-y += cpu.o exception.o interrupt.o mmu.o translate.o disas.o
3
3
obj-y += exception_helper.o fpu_helper.o \
4
-
interrupt_helper.o mmu_helper.o sys_helper.o
4
+
interrupt_helper.o sys_helper.o
5
5
obj-y += gdbstub.o
6
6
7
7
DECODETREE = $(SRC_PATH)/scripts/decodetree.py
+11
target/openrisc/mmu.c
+11
target/openrisc/mmu.c
···
240
240
return phys_addr;
241
241
}
242
242
}
243
+
244
+
void tlb_fill(CPUState *cs, target_ulong addr, int size,
245
+
MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
246
+
{
247
+
int ret = openrisc_cpu_handle_mmu_fault(cs, addr, size,
248
+
access_type, mmu_idx);
249
+
if (ret) {
250
+
/* Raise Exception. */
251
+
cpu_loop_exit_restore(cs, retaddr);
252
+
}
253
+
}
243
254
#endif
-40
target/openrisc/mmu_helper.c
-40
target/openrisc/mmu_helper.c
···
1
-
/*
2
-
* OpenRISC MMU helper routines
3
-
*
4
-
* Copyright (c) 2011-2012 Jia Liu <proljc@gmail.com>
5
-
* Zhizhou Zhang <etouzh@gmail.com>
6
-
*
7
-
* This library is free software; you can redistribute it and/or
8
-
* modify it under the terms of the GNU Lesser General Public
9
-
* License as published by the Free Software Foundation; either
10
-
* version 2 of the License, or (at your option) any later version.
11
-
*
12
-
* This library is distributed in the hope that it will be useful,
13
-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15
-
* Lesser General Public License for more details.
16
-
*
17
-
* You should have received a copy of the GNU Lesser General Public
18
-
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
19
-
*/
20
-
21
-
#include "qemu/osdep.h"
22
-
#include "cpu.h"
23
-
#include "exec/exec-all.h"
24
-
#include "exec/cpu_ldst.h"
25
-
26
-
#ifndef CONFIG_USER_ONLY
27
-
28
-
void tlb_fill(CPUState *cs, target_ulong addr, int size,
29
-
MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
30
-
{
31
-
int ret;
32
-
33
-
ret = openrisc_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx);
34
-
35
-
if (ret) {
36
-
/* Raise Exception. */
37
-
cpu_loop_exit_restore(cs, retaddr);
38
-
}
39
-
}
40
-
#endif