Commit b76f21a7 authored by Laurent Vivier's avatar Laurent Vivier Committed by Richard Henderson
Browse files

linux-user: remove useless macros GUEST_BASE and RESERVED_VA 



As we have removed CONFIG_USE_GUEST_BASE, we always use a guest base
and the macros GUEST_BASE and RESERVED_VA become useless: replace
them by their values.

Reviewed-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <1440420834-8388-1-git-send-email-laurent@vivier.eu>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent 4cbea598

include/exec/cpu-all.h

+1 −3
Original line number Diff line number Diff line
@@ -163,10 +163,8 @@ static inline void tswap64s(uint64_t *s) 
extern unsigned long guest_base;

extern int have_guest_base;

extern unsigned long reserved_va;

#define GUEST_BASE guest_base

#define RESERVED_VA reserved_va



#define GUEST_ADDR_MAX (RESERVED_VA ? RESERVED_VA : \

#define GUEST_ADDR_MAX (reserved_va ? reserved_va : \

                                    (1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1)

#endif

include/exec/cpu_ldst.h

+4 −4
Original line number Diff line number Diff line
@@ -49,20 +49,20 @@ 


#if defined(CONFIG_USER_ONLY)

/* All direct uses of g2h and h2g need to go away for usermode softmmu.  */

#define g2h(x) ((void *)((unsigned long)(target_ulong)(x) + GUEST_BASE))

#define g2h(x) ((void *)((unsigned long)(target_ulong)(x) + guest_base))



#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS

#define h2g_valid(x) 1

#else

#define h2g_valid(x) ({ \

    unsigned long __guest = (unsigned long)(x) - GUEST_BASE; \

    unsigned long __guest = (unsigned long)(x) - guest_base; \

    (__guest < (1ul << TARGET_VIRT_ADDR_SPACE_BITS)) && \

    (!RESERVED_VA || (__guest < RESERVED_VA)); \

    (!reserved_va || (__guest < reserved_va)); \

})

#endif



#define h2g_nocheck(x) ({ \

    unsigned long __ret = (unsigned long)(x) - GUEST_BASE; \

    unsigned long __ret = (unsigned long)(x) - guest_base; \

    (abi_ulong)__ret; \

})

linux-user/mmap.c

+10 −10
Original line number Diff line number Diff line
@@ -215,14 +215,14 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size) 
    int prot;

    int looped = 0;



    if (size > RESERVED_VA) {

    if (size > reserved_va) {

        return (abi_ulong)-1;

    }



    size = HOST_PAGE_ALIGN(size);

    end_addr = start + size;

    if (end_addr > RESERVED_VA) {

        end_addr = RESERVED_VA;

    if (end_addr > reserved_va) {

        end_addr = reserved_va;

    }

    addr = end_addr - qemu_host_page_size;
@@ -231,7 +231,7 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size) 
            if (looped) {

                return (abi_ulong)-1;

            }

            end_addr = RESERVED_VA;

            end_addr = reserved_va;

            addr = end_addr - qemu_host_page_size;

            looped = 1;

            continue;
@@ -274,7 +274,7 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size) 


    size = HOST_PAGE_ALIGN(size);



    if (RESERVED_VA) {

    if (reserved_va) {

        return mmap_find_vma_reserved(start, size);

    }
@@ -667,7 +667,7 @@ int target_munmap(abi_ulong start, abi_ulong len) 
    ret = 0;

    /* unmap what we can */

    if (real_start < real_end) {

        if (RESERVED_VA) {

        if (reserved_va) {

            mmap_reserve(real_start, real_end - real_start);

        } else {

            ret = munmap(g2h(real_start), real_end - real_start);
@@ -697,7 +697,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, 
                                     flags,

                                     g2h(new_addr));



        if (RESERVED_VA && host_addr != MAP_FAILED) {

        if (reserved_va && host_addr != MAP_FAILED) {

            /* If new and old addresses overlap then the above mremap will

               already have failed with EINVAL.  */

            mmap_reserve(old_addr, old_size);
@@ -715,13 +715,13 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, 
                                         old_size, new_size,

                                         flags | MREMAP_FIXED,

                                         g2h(mmap_start));

            if ( RESERVED_VA ) {

            if (reserved_va) {

                mmap_reserve(old_addr, old_size);

            }

        }

    } else {

        int prot = 0;

        if (RESERVED_VA && old_size < new_size) {

        if (reserved_va && old_size < new_size) {

            abi_ulong addr;

            for (addr = old_addr + old_size;

                 addr < old_addr + new_size;
@@ -731,7 +731,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, 
        }

        if (prot == 0) {

            host_addr = mremap(g2h(old_addr), old_size, new_size, flags);

            if (host_addr != MAP_FAILED && RESERVED_VA && old_size > new_size) {

            if (host_addr != MAP_FAILED && reserved_va && old_size > new_size) {

                mmap_reserve(old_addr + old_size, new_size - old_size);

            }

        } else {

tcg/aarch64/tcg-target.c

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { 
static const int tcg_target_reg_alloc_order[] = {

    TCG_REG_X20, TCG_REG_X21, TCG_REG_X22, TCG_REG_X23,

    TCG_REG_X24, TCG_REG_X25, TCG_REG_X26, TCG_REG_X27,

    TCG_REG_X28, /* we will reserve this for GUEST_BASE if configured */

    TCG_REG_X28, /* we will reserve this for guest_base if configured */



    TCG_REG_X8, TCG_REG_X9, TCG_REG_X10, TCG_REG_X11,

    TCG_REG_X12, TCG_REG_X13, TCG_REG_X14, TCG_REG_X15,
@@ -1225,7 +1225,7 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, 
                        s->code_ptr, label_ptr);

#else /* !CONFIG_SOFTMMU */

    tcg_out_qemu_ld_direct(s, memop, ext, data_reg,

                           GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR,

                           guest_base ? TCG_REG_GUEST_BASE : TCG_REG_XZR,

                           otype, addr_reg);

#endif /* CONFIG_SOFTMMU */

}
@@ -1246,7 +1246,7 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, 
                        data_reg, addr_reg, s->code_ptr, label_ptr);

#else /* !CONFIG_SOFTMMU */

    tcg_out_qemu_st_direct(s, memop, data_reg,

                           GUEST_BASE ? TCG_REG_GUEST_BASE : TCG_REG_XZR,

                           guest_base ? TCG_REG_GUEST_BASE : TCG_REG_XZR,

                           otype, addr_reg);

#endif /* CONFIG_SOFTMMU */

}
@@ -1806,8 +1806,8 @@ static void tcg_target_qemu_prologue(TCGContext *s) 
                  CPU_TEMP_BUF_NLONGS * sizeof(long));



#if !defined(CONFIG_SOFTMMU)

    if (GUEST_BASE) {

        tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_GUEST_BASE, GUEST_BASE);

    if (guest_base) {

        tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_GUEST_BASE, guest_base);

        tcg_regset_set_reg(s->reserved_regs, TCG_REG_GUEST_BASE);

    }

#endif

tcg/arm/tcg-target.c

+4 −4
Original line number Diff line number Diff line
@@ -1493,8 +1493,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) 
    add_qemu_ldst_label(s, true, oi, datalo, datahi, addrlo, addrhi,

                        s->code_ptr, label_ptr);

#else /* !CONFIG_SOFTMMU */

    if (GUEST_BASE) {

        tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP, GUEST_BASE);

    if (guest_base) {

        tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP, guest_base);

        tcg_out_qemu_ld_index(s, opc, datalo, datahi, addrlo, TCG_REG_TMP);

    } else {

        tcg_out_qemu_ld_direct(s, opc, datalo, datahi, addrlo);
@@ -1623,8 +1623,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64) 
    add_qemu_ldst_label(s, false, oi, datalo, datahi, addrlo, addrhi,

                        s->code_ptr, label_ptr);

#else /* !CONFIG_SOFTMMU */

    if (GUEST_BASE) {

        tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP, GUEST_BASE);

    if (guest_base) {

        tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP, guest_base);

        tcg_out_qemu_st_index(s, COND_AL, opc, datalo,

                              datahi, addrlo, TCG_REG_TMP);

    } else {