Commit a0be0c58 authored by Yang Zhong's avatar Yang Zhong Committed by Paolo Bonzini
Browse files

tcg: move page_size_init() function 



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.

Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e7b161d5

accel/tcg/translate-all.c

+0 −18
Original line number Diff line number Diff line
@@ -112,9 +112,6 @@ typedef struct PageDesc { 
#define V_L2_BITS 10

#define V_L2_SIZE (1 << V_L2_BITS)



uintptr_t qemu_host_page_size;

intptr_t qemu_host_page_mask;



/*

 * L1 Mapping properties

 */
@@ -363,21 +360,6 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t retaddr) 
    return r;

}



void page_size_init(void)

{

    /* NOTE: we can always suppose that qemu_host_page_size >=

       TARGET_PAGE_SIZE */

    qemu_real_host_page_size = getpagesize();

    qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;

    if (qemu_host_page_size == 0) {

        qemu_host_page_size = qemu_real_host_page_size;

    }

    if (qemu_host_page_size < TARGET_PAGE_SIZE) {

        qemu_host_page_size = TARGET_PAGE_SIZE;

    }

    qemu_host_page_mask = -(intptr_t)qemu_host_page_size;

}



static void page_init(void)

{

    page_size_init();

accel/tcg/translate-common.c

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
#include "sysemu/cpus.h"

#include "qemu/main-loop.h"



uintptr_t qemu_real_host_page_size;

intptr_t qemu_real_host_page_mask;



#ifndef CONFIG_USER_ONLY

/* mask must never be zero, except for A20 change call */

static void tcg_handle_interrupt(CPUState *cpu, int mask)

exec.c

+20 −0
Original line number Diff line number Diff line
@@ -118,6 +118,11 @@ __thread CPUState *current_cpu; 
   2 = Adaptive rate instruction counting.  */

int use_icount;



uintptr_t qemu_host_page_size;

intptr_t qemu_host_page_mask;

uintptr_t qemu_real_host_page_size;

intptr_t qemu_real_host_page_mask;



bool set_preferred_target_page_bits(int bits)

{

    /* The target page size is the lowest common denominator for all
@@ -3590,3 +3595,18 @@ err: 
}



#endif



void page_size_init(void)

{

    /* NOTE: we can always suppose that qemu_host_page_size >=

       TARGET_PAGE_SIZE */

    qemu_real_host_page_size = getpagesize();

    qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;

    if (qemu_host_page_size == 0) {

        qemu_host_page_size = qemu_real_host_page_size;

    }

    if (qemu_host_page_size < TARGET_PAGE_SIZE) {

        qemu_host_page_size = TARGET_PAGE_SIZE;

    }

    qemu_host_page_mask = -(intptr_t)qemu_host_page_size;

}