Commit a578cdfb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190610' into staging 



Move softmmu tlb into CPUNegativeOffsetState

# gpg: Signature made Mon 10 Jun 2019 15:07:55 BST
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-tcg-20190610: (39 commits)
  tcg/arm: Remove mostly unreachable tlb special case
  tcg/arm: Use LDRD to load tlb mask+table
  tcg/aarch64: Use LDP to load tlb mask+table
  cpu: Remove CPU_COMMON
  cpu: Move the softmmu tlb to CPUNegativeOffsetState
  cpu: Move icount_decr to CPUNegativeOffsetState
  cpu: Introduce CPUNegativeOffsetState
  cpu: Introduce cpu_set_cpustate_pointers
  cpu: Move ENV_OFFSET to exec/gen-icount.h
  target/xtensa: Use env_cpu, env_archcpu
  target/unicore32: Use env_cpu, env_archcpu
  target/tricore: Use env_cpu
  target/tilegx: Use env_cpu
  target/sparc: Use env_cpu, env_archcpu
  target/sh4: Use env_cpu, env_archcpu
  target/s390x: Use env_cpu, env_archcpu
  target/riscv: Use env_cpu, env_archcpu
  target/ppc: Use env_cpu, env_archcpu
  target/openrisc: Use env_cpu, env_archcpu
  target/nios2: Use env_cpu, env_archcpu
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 19735c83 43b3952d

accel/tcg/atomic_template.h

+4 −4
Original line number Diff line number Diff line
@@ -62,21 +62,21 @@ 
#define ATOMIC_TRACE_RMW do {                                           \

        uint8_t info = glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); \

                                                                        \

        trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info);      \

        trace_guest_mem_before_exec(ENV_GET_CPU(env), addr,             \

        trace_guest_mem_before_exec(env_cpu(env), addr, info);      \

        trace_guest_mem_before_exec(env_cpu(env), addr,             \

                                    info | TRACE_MEM_ST);               \

    } while (0)



#define ATOMIC_TRACE_LD do {                                            \

        uint8_t info = glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); \

                                                                        \

        trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info);      \

        trace_guest_mem_before_exec(env_cpu(env), addr, info);      \

    } while (0)



# define ATOMIC_TRACE_ST do {                                           \

        uint8_t info = glue(trace_mem_build_info_no_se, MEND)(SHIFT, true); \

                                                                        \

        trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info);      \

        trace_guest_mem_before_exec(env_cpu(env), addr, info);      \

    } while (0)



/* Define host-endian atomic operations.  Note that END is used within

accel/tcg/cpu-exec.c

+12 −11
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ typedef struct SyncClocks { 
#define MAX_DELAY_PRINT_RATE 2000000000LL

#define MAX_NB_PRINTS 100



static void align_clocks(SyncClocks *sc, const CPUState *cpu)

static void align_clocks(SyncClocks *sc, CPUState *cpu)

{

    int64_t cpu_icount;
@@ -62,7 +62,7 @@ static void align_clocks(SyncClocks *sc, const CPUState *cpu) 
        return;

    }



    cpu_icount = cpu->icount_extra + cpu->icount_decr.u16.low;

    cpu_icount = cpu->icount_extra + cpu_neg(cpu)->icount_decr.u16.low;

    sc->diff_clk += cpu_icount_to_ns(sc->last_cpu_icount - cpu_icount);

    sc->last_cpu_icount = cpu_icount;
@@ -105,15 +105,15 @@ static void print_delay(const SyncClocks *sc) 
    }

}



static void init_delay_params(SyncClocks *sc,

                              const CPUState *cpu)

static void init_delay_params(SyncClocks *sc, CPUState *cpu)

{

    if (!icount_align_option) {

        return;

    }

    sc->realtime_clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL_RT);

    sc->diff_clk = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - sc->realtime_clock;

    sc->last_cpu_icount = cpu->icount_extra + cpu->icount_decr.u16.low;

    sc->last_cpu_icount

        = cpu->icount_extra + cpu_neg(cpu)->icount_decr.u16.low;

    if (sc->diff_clk < max_delay) {

        max_delay = sc->diff_clk;

    }
@@ -467,7 +467,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) 
    if (cpu->exception_index < 0) {

#ifndef CONFIG_USER_ONLY

        if (replay_has_exception()

               && cpu->icount_decr.u16.low + cpu->icount_extra == 0) {

            && cpu_neg(cpu)->icount_decr.u16.low + cpu->icount_extra == 0) {

            /* try to cause an exception pending in the log */

            cpu_exec_nocache(cpu, 1, tb_find(cpu, NULL, 0, curr_cflags()), true);

        }
@@ -525,7 +525,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, 
     * Ensure zeroing happens before reading cpu->exit_request or

     * cpu->interrupt_request (see also smp_wmb in cpu_exit())

     */

    atomic_mb_set(&cpu->icount_decr.u16.high, 0);

    atomic_mb_set(&cpu_neg(cpu)->icount_decr.u16.high, 0);



    if (unlikely(atomic_read(&cpu->interrupt_request))) {

        int interrupt_request;
@@ -596,8 +596,9 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, 
    }



    /* Finally, check if we need to exit to the main loop.  */

    if (unlikely(atomic_read(&cpu->exit_request)

        || (use_icount && cpu->icount_decr.u16.low + cpu->icount_extra == 0))) {

    if (unlikely(atomic_read(&cpu->exit_request))

        || (use_icount

            && cpu_neg(cpu)->icount_decr.u16.low + cpu->icount_extra == 0)) {

        atomic_set(&cpu->exit_request, 0);

        if (cpu->exception_index == -1) {

            cpu->exception_index = EXCP_INTERRUPT;
@@ -624,7 +625,7 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb, 
    }



    *last_tb = NULL;

    insns_left = atomic_read(&cpu->icount_decr.u32);

    insns_left = atomic_read(&cpu_neg(cpu)->icount_decr.u32);

    if (insns_left < 0) {

        /* Something asked us to stop executing chained TBs; just

         * continue round the main loop. Whatever requested the exit
@@ -643,7 +644,7 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb, 
    cpu_update_icount(cpu);

    /* Refill decrementer and continue execution.  */

    insns_left = MIN(0xffff, cpu->icount_budget);

    cpu->icount_decr.u16.low = insns_left;

    cpu_neg(cpu)->icount_decr.u16.low = insns_left;

    cpu->icount_extra = cpu->icount_budget - insns_left;

    if (!cpu->icount_extra) {

        /* Execute any remaining instructions, then let the main loop

accel/tcg/cputlb.c

+119 −107

File changed.

Preview size limit exceeded, changes collapsed.

accel/tcg/tcg-all.c

+2 −4
Original line number Diff line number Diff line
@@ -28,13 +28,12 @@ 
#include "sysemu/sysemu.h"

#include "qom/object.h"

#include "qemu-common.h"

#include "qom/cpu.h"

#include "cpu.h"

#include "sysemu/cpus.h"

#include "qemu/main-loop.h"



unsigned long tcg_tb_size;



#ifndef CONFIG_USER_ONLY

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

static void tcg_handle_interrupt(CPUState *cpu, int mask)

{
@@ -51,7 +50,7 @@ static void tcg_handle_interrupt(CPUState *cpu, int mask) 
    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

    } else {

        atomic_set(&cpu->icount_decr.u16.high, -1);

        atomic_set(&cpu_neg(cpu)->icount_decr.u16.high, -1);

        if (use_icount &&

            !cpu->can_do_io

            && (mask & ~old_mask) != 0) {
@@ -59,7 +58,6 @@ static void tcg_handle_interrupt(CPUState *cpu, int mask) 
        }

    }

}

#endif



static int tcg_init(MachineState *ms)

{

accel/tcg/tcg-runtime.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ uint64_t HELPER(ctpop_i64)(uint64_t arg) 


void *HELPER(lookup_tb_ptr)(CPUArchState *env)

{

    CPUState *cpu = ENV_GET_CPU(env);

    CPUState *cpu = env_cpu(env);

    TranslationBlock *tb;

    target_ulong cs_base, pc;

    uint32_t flags;
@@ -165,5 +165,5 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env) 


void HELPER(exit_atomic)(CPUArchState *env)

{

    cpu_loop_exit_atomic(ENV_GET_CPU(env), GETPC());

    cpu_loop_exit_atomic(env_cpu(env), GETPC());

}