Commit 86b182ac authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/xtensa/tags/20141217-xtensa' into staging 



Xtensa updates for 2.3:

- fix cross-page opcode handling;
- move window overflow exception generation decision to translation phase;
- don't generate dead code after privilege, window overflow or coprocessor
  exception;
- add monitor command 'info opcount' for dumping TCG opcode counters.

# gpg: Signature made Wed 17 Dec 2014 02:57:01 GMT using RSA key ID F83FA044
# gpg: Good signature from "Max Filippov <max.filippov@cogentembedded.com>"
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"

* remotes/xtensa/tags/20141217-xtensa:
  target-xtensa: don't generate dead code
  target-xtensa: record available window in TB flags
  target-xtensa: test cross-page opcode
  target-xtensa: fix translation for opcodes crossing page boundary
  tcg: add separate monitor command to dump opcode counters

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 84afc4dd 97e89ee9

include/exec/cpu-all.h

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ extern RAMList ram_list; 
#define TLB_MMIO        (1 << 5)



void dump_exec_info(FILE *f, fprintf_function cpu_fprintf);

void dump_opcount_info(FILE *f, fprintf_function cpu_fprintf);

ram_addr_t last_ram_offset(void);

void qemu_mutex_lock_ramlist(void);

void qemu_mutex_unlock_ramlist(void);

monitor.c

+12 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,11 @@ static void do_info_jit(Monitor *mon, const QDict *qdict) 
    dump_drift_info((FILE *)mon, monitor_fprintf);

}



static void do_info_opcount(Monitor *mon, const QDict *qdict)

{

    dump_opcount_info((FILE *)mon, monitor_fprintf);

}



static void do_info_history(Monitor *mon, const QDict *qdict)

{

    int i;
@@ -2738,6 +2743,13 @@ static mon_cmd_t info_cmds[] = { 
        .help       = "show dynamic compiler info",

        .mhandler.cmd = do_info_jit,

    },

    {

        .name       = "opcount",

        .args_type  = "",

        .params     = "",

        .help       = "show dynamic compiler opcode counters",

        .mhandler.cmd = do_info_opcount,

    },

    {

        .name       = "kvm",

        .args_type  = "",

target-xtensa/cpu.h

+12 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ static inline int cpu_mmu_index(CPUXtensaState *env) 
#define XTENSA_TBFLAG_CPENABLE_MASK 0x3fc0

#define XTENSA_TBFLAG_CPENABLE_SHIFT 6

#define XTENSA_TBFLAG_EXCEPTION 0x4000

#define XTENSA_TBFLAG_WINDOW_MASK 0x18000

#define XTENSA_TBFLAG_WINDOW_SHIFT 15



static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc,

        target_ulong *cs_base, int *flags)
@@ -528,6 +530,16 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc, 
    if (cs->singlestep_enabled && env->exception_taken) {

        *flags |= XTENSA_TBFLAG_EXCEPTION;

    }

    if (xtensa_option_enabled(env->config, XTENSA_OPTION_WINDOWED_REGISTER) &&

        (env->sregs[PS] & (PS_WOE | PS_EXCM)) == PS_WOE) {

        uint32_t windowstart = xtensa_replicate_windowstart(env) >>

            (env->sregs[WINDOW_BASE] + 1);

        uint32_t w = ctz32(windowstart | 0x8);



        *flags |= w << XTENSA_TBFLAG_WINDOW_SHIFT;

    } else {

        *flags |= 3 << XTENSA_TBFLAG_WINDOW_SHIFT;

    }

}



#include "exec/cpu-all.h"

target-xtensa/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ DEF_HELPER_2(wsr_windowbase, void, env, i32) 
DEF_HELPER_4(entry, void, env, i32, i32, i32)

DEF_HELPER_2(retw, i32, env, i32)

DEF_HELPER_2(rotw, void, env, i32)

DEF_HELPER_3(window_check, void, env, i32, i32)

DEF_HELPER_3(window_check, noreturn, env, i32, i32)

DEF_HELPER_1(restore_owb, void, env)

DEF_HELPER_2(movsp, void, env, i32)

DEF_HELPER_2(wsr_lbeg, void, env, i32)

target-xtensa/op_helper.c

+11 −18
Original line number Diff line number Diff line
@@ -251,34 +251,27 @@ void HELPER(entry)(CPUXtensaState *env, uint32_t pc, uint32_t s, uint32_t imm) 
void HELPER(window_check)(CPUXtensaState *env, uint32_t pc, uint32_t w)

{

    uint32_t windowbase = windowbase_bound(env->sregs[WINDOW_BASE], env);

    uint32_t windowstart = env->sregs[WINDOW_START];

    uint32_t m, n;

    uint32_t windowstart = xtensa_replicate_windowstart(env) >>

        (env->sregs[WINDOW_BASE] + 1);

    uint32_t n = ctz32(windowstart) + 1;



    if ((env->sregs[PS] & (PS_WOE | PS_EXCM)) ^ PS_WOE) {

        return;

    }

    assert(n <= w);



    for (n = 1; ; ++n) {

        if (n > w) {

            return;

        }

        if (windowstart & windowstart_bit(windowbase + n, env)) {

            break;

        }

    }



    m = windowbase_bound(windowbase + n, env);

    rotate_window(env, n);

    env->sregs[PS] = (env->sregs[PS] & ~PS_OWB) |

        (windowbase << PS_OWB_SHIFT) | PS_EXCM;

    env->sregs[EPC1] = env->pc = pc;



    if (windowstart & windowstart_bit(m + 1, env)) {

    switch (ctz32(windowstart >> n)) {

    case 0:

        HELPER(exception)(env, EXC_WINDOW_OVERFLOW4);

    } else if (windowstart & windowstart_bit(m + 2, env)) {

        break;

    case 1:

        HELPER(exception)(env, EXC_WINDOW_OVERFLOW8);

    } else {

        break;

    default:

        HELPER(exception)(env, EXC_WINDOW_OVERFLOW12);

        break;

    }

}