Commit 45c73de5 authored by Emilio G. Cota's avatar Emilio G. Cota Committed by Richard Henderson
Browse files

translate-all: move tb_invalidate_phys_page_range up in the file 



This greatly simplifies next commit's diff.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarEmilio G. Cota <cota@braap.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent ae5486e2

accel/tcg/translate-all.c

+39 −38
Original line number Diff line number Diff line
@@ -1363,44 +1363,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
    return tb;

}



/*

 * Invalidate all TBs which intersect with the target physical address range

 * [start;end[. NOTE: start and end may refer to *different* physical pages.

 * 'is_cpu_write_access' should be true if called from a real cpu write

 * access: the virtual CPU will exit the current TB if code is modified inside

 * this TB.

 *

 * Called with mmap_lock held for user-mode emulation, grabs tb_lock

 * Called with tb_lock held for system-mode emulation

 */

static void tb_invalidate_phys_range_1(tb_page_addr_t start, tb_page_addr_t end)

{

    tb_page_addr_t next;



    for (next = (start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;

         start < end;

         start = next, next += TARGET_PAGE_SIZE) {

        tb_page_addr_t bound = MIN(next, end);



        tb_invalidate_phys_page_range(start, bound, 0);

    }

}



#ifdef CONFIG_SOFTMMU

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)

{

    assert_tb_locked();

    tb_invalidate_phys_range_1(start, end);

}

#else

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)

{

    assert_memory_lock();

    tb_lock();

    tb_invalidate_phys_range_1(start, end);

    tb_unlock();

}

#endif

/*

 * Invalidate all TBs which intersect with the target physical address range

 * [start;end[. NOTE: start and end must refer to the *same* physical page.
@@ -1500,6 +1462,45 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, 
#endif

}



/*

 * Invalidate all TBs which intersect with the target physical address range

 * [start;end[. NOTE: start and end may refer to *different* physical pages.

 * 'is_cpu_write_access' should be true if called from a real cpu write

 * access: the virtual CPU will exit the current TB if code is modified inside

 * this TB.

 *

 * Called with mmap_lock held for user-mode emulation, grabs tb_lock

 * Called with tb_lock held for system-mode emulation

 */

static void tb_invalidate_phys_range_1(tb_page_addr_t start, tb_page_addr_t end)

{

    tb_page_addr_t next;



    for (next = (start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;

         start < end;

         start = next, next += TARGET_PAGE_SIZE) {

        tb_page_addr_t bound = MIN(next, end);



        tb_invalidate_phys_page_range(start, bound, 0);

    }

}



#ifdef CONFIG_SOFTMMU

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)

{

    assert_tb_locked();

    tb_invalidate_phys_range_1(start, end);

}

#else

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)

{

    assert_memory_lock();

    tb_lock();

    tb_invalidate_phys_range_1(start, end);

    tb_unlock();

}

#endif



#ifdef CONFIG_SOFTMMU

/* len must be <= 8 and start must be a multiple of len.

 * Called via softmmu_template.h when code areas are written to with