ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg: simplify !CONFIG_TCG handling of tb_invalidate_* 

There is no need for a stub, since tb_invalidate_phys_addr can be excised
altogether when TCG is disabled.  This is a bit cleaner since it avoids
using code that is clearly specific to user-mode emulation (it calls
mmap_lock/unlock) for the !CONFIG_TCG case.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-07-02 14:45:25 +02:00
parent 3afc969a6e
commit c40d479207
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accel/stubs/tcg-stub.c
View File

@ -16,7 +16,6 @@
#include "tcg/tcg.h" #include "tcg/tcg.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "translate-all.h"
void tb_flush(CPUState *cpu) void tb_flush(CPUState *cpu)
{ {
@ -25,8 +24,3 @@ void tb_flush(CPUState *cpu)
void tlb_set_dirty(CPUState *cpu, target_ulong vaddr) void tlb_set_dirty(CPUState *cpu, target_ulong vaddr)
{ {
} }
void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
int is_cpu_write_access)
{
}

6
exec.c
View File

@ -1027,7 +1027,7 @@ const char *parse_cpu_model(const char *cpu_model)
return cpu_type; return cpu_type;
} }
#if defined(CONFIG_USER_ONLY) || !defined(CONFIG_TCG) #if defined(CONFIG_USER_ONLY)
void tb_invalidate_phys_addr(target_ulong addr) void tb_invalidate_phys_addr(target_ulong addr)
{ {
mmap_lock(); mmap_lock();
@ -1046,6 +1046,10 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)
MemoryRegion *mr; MemoryRegion *mr;
hwaddr l = 1; hwaddr l = 1;
if (!tcg_enabled()) {
return;
}
rcu_read_lock(); rcu_read_lock();
mr = address_space_translate(as, addr, &addr, &l, false, attrs); mr = address_space_translate(as, addr, &addr, &l, false, attrs);
if (!(memory_region_is_ram(mr) if (!(memory_region_is_ram(mr)

8
include/exec/exec-all.h
View File

@ -412,13 +412,11 @@ static inline uint32_t curr_cflags(void)
} }
/* TranslationBlock invalidate API */ /* TranslationBlock invalidate API */
#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs);
#else
void tb_invalidate_phys_addr(target_ulong addr);
#endif
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
void tb_invalidate_phys_addr(target_ulong addr);
void tb_invalidate_phys_range(target_ulong start, target_ulong end); void tb_invalidate_phys_range(target_ulong start, target_ulong end);
#else
void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs);
#endif #endif
void tb_flush(CPUState *cpu); void tb_flush(CPUState *cpu);
void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr);