yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 02:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: move page_size_init() function

Browse source 
translate-all.c will be disabled if tcg is disabled in the build,
so page_size_init() function and related variables will be moved
to exec.c file.

Backports commit a0be0c585f5dcc4d50a37f6a20d3d625c5ef3a2c from qemu
This commit is contained in:
Yang Zhong 2018-03-03 21:26:06 -05:00 committed by Lioncash
parent cf5d583ef0
commit d70c141675
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qemu/exec.c
View file

@ -2642,3 +2642,18 @@ int qemu_ram_foreach_block(struct uc_struct *uc, RAMBlockIterFunc func, void *op
return ret; return ret;
} }
#endif #endif
void page_size_init(struct uc_struct *uc)
{
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */
uc->qemu_real_host_page_size = getpagesize();
uc->qemu_real_host_page_mask = -(intptr_t)uc->qemu_real_host_page_size;
if (uc->qemu_host_page_size == 0) {
uc->qemu_host_page_size = uc->qemu_real_host_page_size;
}
if (uc->qemu_host_page_size < TARGET_PAGE_SIZE) {
uc->qemu_host_page_size = TARGET_PAGE_SIZE;
}
uc->qemu_host_page_mask = -(intptr_t)uc->qemu_host_page_size;
}

3
qemu/include/exec/exec-all.h
View file

@ -443,4 +443,7 @@ static inline bool cpu_can_do_io(CPUState *cpu)
// Unicorn: Used for freeing // Unicorn: Used for freeing
void phys_mem_clean(AddressSpace *as); void phys_mem_clean(AddressSpace *as);
// Unicorn: Prototype place here
void page_size_init(struct uc_struct *uc);
#endif #endif

18
qemu/translate-all.c
View file

@ -345,21 +345,6 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t retaddr)
return false; return false;
} }
static void page_size_init(struct uc_struct *uc)
{
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */
uc->qemu_real_host_page_size = getpagesize();
uc->qemu_real_host_page_mask = -(intptr_t)uc->qemu_real_host_page_size;
if (uc->qemu_host_page_size == 0) {
uc->qemu_host_page_size = uc->qemu_real_host_page_size;
}
if (uc->qemu_host_page_size < TARGET_PAGE_SIZE) {
uc->qemu_host_page_size = TARGET_PAGE_SIZE;
}
uc->qemu_host_page_mask = -(intptr_t)uc->qemu_host_page_size;
}
static void page_init(struct uc_struct *uc) static void page_init(struct uc_struct *uc)
{ {
page_size_init(uc); page_size_init(uc);
@ -949,7 +934,6 @@ void tb_flush(CPUState *cpu)
{ {
struct uc_struct* uc = cpu->uc; struct uc_struct* uc = cpu->uc;
TCGContext *tcg_ctx = uc->tcg_ctx; TCGContext *tcg_ctx = uc->tcg_ctx;
int i;
#if defined(DEBUG_TB_FLUSH) #if defined(DEBUG_TB_FLUSH)
printf("qemu: flush code_size=%ld nb_tbs=%d avg_tb_size=%ld\n", printf("qemu: flush code_size=%ld nb_tbs=%d avg_tb_size=%ld\n",
@ -1870,8 +1854,6 @@ static void tb_jmp_cache_clear_page(CPUState *cpu, target_ulong page_addr)
void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr) void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr)
{ {
unsigned int i;
/* Discard jump cache entries for any tb which might potentially /* Discard jump cache entries for any tb which might potentially
overlap the flushed page. */ overlap the flushed page. */
tb_jmp_cache_clear_page(cpu, addr - TARGET_PAGE_SIZE); tb_jmp_cache_clear_page(cpu, addr - TARGET_PAGE_SIZE);