Commit 2eb967c4 authored by Max Filippov's avatar Max Filippov
Browse files

target/xtensa: pass actual frame size to the entry helper 



Currently 'entry' opcode helper accepts frame size divided by 8, as it
is encoded in the opcode. Make it more natural and accept actual frame
size instead.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 0a0dc59d

target/xtensa/op_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ void HELPER(entry)(CPUXtensaState *env, uint32_t pc, uint32_t s, uint32_t imm) 
        if (windowstart & ((1 << callinc) - 1)) {

            HELPER(window_check)(env, pc, callinc);

        }

        env->regs[(callinc << 2) | (s & 3)] = env->regs[s] - (imm << 3);

        env->regs[(callinc << 2) | (s & 3)] = env->regs[s] - imm;

        rotate_window(env, callinc);

        env->sregs[WINDOW_START] |=

            windowstart_bit(env->sregs[WINDOW_BASE], env);

target/xtensa/translate.c

+1 −1
Original line number Diff line number Diff line
@@ -2830,7 +2830,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) 
                {

                    TCGv_i32 pc = tcg_const_i32(dc->pc);

                    TCGv_i32 s = tcg_const_i32(BRI12_S);

                    TCGv_i32 imm = tcg_const_i32(BRI12_IMM12);

                    TCGv_i32 imm = tcg_const_i32(BRI12_IMM12 << 3);

                    gen_helper_entry(cpu_env, pc, s, imm);

                    tcg_temp_free(imm);

                    tcg_temp_free(s);