[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 11/23] target/rx: Convert to CPUClass::tlb_fill
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v16 11/23] target/rx: Convert to CPUClass::tlb_fill |
Date: |
Fri, 31 May 2019 08:43:03 -0500 |
The interface for tlb_fill has changed very recently.
Move the function into cpu.c so that it may be static
while assigning to the CPUClass methods.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/rx/cpu.c | 14 ++++++++++++++
target/rx/op_helper.c | 11 -----------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/target/rx/cpu.c b/target/rx/cpu.c
index 4b96f2e463..3268077d08 100644
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -143,6 +143,19 @@ static void rx_cpu_disas_set_info(CPUState *cpu,
disassemble_info *info)
info->print_insn = print_insn_rx;
}
+static bool rx_cpu_tlb_fill(CPUState *cs, vaddr addr, int size,
+ MMUAccessType access_type, int mmu_idx,
+ bool probe, uintptr_t retaddr)
+{
+ uint32_t address, physical, prot;
+
+ /* Linear mapping */
+ address = physical = addr & TARGET_PAGE_MASK;
+ prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
+ tlb_set_page(cs, address, physical, prot, mmu_idx, TARGET_PAGE_SIZE);
+ return true;
+}
+
static void rx_cpu_init(Object *obj)
{
CPUState *cs = CPU(obj);
@@ -177,6 +190,7 @@ static void rxcpu_class_init(ObjectClass *klass, void *data)
cc->get_phys_page_debug = rx_cpu_get_phys_page_debug;
cc->disas_set_info = rx_cpu_disas_set_info;
cc->tcg_initialize = rx_translate_init;
+ cc->tlb_fill = rx_cpu_tlb_fill;
cc->gdb_num_core_regs = 26;
}
diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
index 9a460070e9..fb7ae3c3ec 100644
--- a/target/rx/op_helper.c
+++ b/target/rx/op_helper.c
@@ -468,14 +468,3 @@ void QEMU_NORETURN helper_rxbrk(CPURXState *env)
{
raise_exception(env, 0x100, 0);
}
-
-void tlb_fill(CPUState *cs, target_ulong addr, int size,
- MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
-{
- uint32_t address, physical, prot;
-
- /* Linear mapping */
- address = physical = addr & TARGET_PAGE_MASK;
- prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
- tlb_set_page(cs, address, physical, prot, mmu_idx, TARGET_PAGE_SIZE);
-}
--
2.17.1
- [Qemu-devel] [PATCH v16 13/23] target/rx: Fix cpu types and names, (continued)
- [Qemu-devel] [PATCH v16 10/23] hw/registerfields.h: Add 8bit and 16bit register macros, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 08/23] hw/rx: RX Target hardware definition, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 15/23] hw/rx: Honor -accel qtest, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 12/23] target/rx: Add RX to SysEmuTarget, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 16/23] Add rx-softmmu, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 14/23] tests: Add rx to machine-none-test.c, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 11/23] target/rx: Convert to CPUClass::tlb_fill,
Richard Henderson <=
- [Qemu-devel] [PATCH v16 17/23] MAINTAINERS: Add RX, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 18/23] target/rx: Disassemble rx_index_addr into a string, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 20/23] target/rx: Use prt_ldmi for XCHG_mr disassembly, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 19/23] target/rx: Replace operand with prt_ldmi in disassembler, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 21/23] target/rx: Emit all disassembly in one prt(), Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 23/23] target/rx: Dump bytes for each insn during disassembly, Richard Henderson, 2019/05/31
- [Qemu-devel] [PATCH v16 22/23] target/rx: Collect all bytes during disassembly, Richard Henderson, 2019/05/31