OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

e2k: fix broken proc chain stack expanding

Browse Source
This commit is contained in:
Denis Drakhnia 2024-07-18 16:26:41 +03:00
parent c8b31962ad
commit 80c6a2f002
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/e2k/helper.c
View File

@ -165,10 +165,6 @@ void e2k_proc_call(CPUE2KState *env, int base, target_ulong ret_ip,
{
E2KCrs crs;
if ((env->pcsp.size - env->pcsp.index) <= (sizeof(E2KCrs) * 2)) {
raise_exception_ra(env, E2K_EXCP_CHAIN_STACK_BOUNDS, GETPC());
}
crs.cr0_lo = env->pregs;
crs.cr0_hi = ret_ip & ~7;
crs.cr1.wbs = base / 2;
@ -219,6 +215,15 @@ static inline void do_call(CPUE2KState *env, int wbs, target_ulong ret_ip)
reset_ctprs(env);
}
#ifdef CONFIG_USER_ONLY
void HELPER(expand_proc_chain_stack)(CPUE2KState *env)
{
if ((env->pcsp.size - env->pcsp.index) <= (sizeof(E2KCrs) * 2)) {
raise_exception_ra(env, E2K_EXCP_CHAIN_STACK_BOUNDS, GETPC());
}
}
#endif /* CONFIG_USER_ONLY */
void HELPER(call)(CPUE2KState *env, uint64_t ctpr_raw, int call_wbs,
target_ulong pc_next)
{

3
target/e2k/helper.h
View File

@ -2,6 +2,9 @@
#define vec i128
DEF_HELPER_2(raise_exception, noreturn, env, int)
#ifdef CONFIG_USER_ONLY
DEF_HELPER_1(expand_proc_chain_stack, void, env)
#endif
DEF_HELPER_4(call, void, env, i64, int, tl)
DEF_HELPER_4(icalld, void, env, tl, int, tl)

8
target/e2k/translate.c
View File

@ -6787,6 +6787,14 @@ static void e2k_tr_translate_insn(DisasContextBase *db, CPUState *cs)
pc_next = do_decode(ctx, cs);
ctx->loop_mode = (ctx->bundle.hs & (1 << 10)) != 0;
if (validate_bundle(ctx)) {
#ifdef CONFIG_USER_ONLY
if (ctx->cs1.type == CS1_CALL) {
gen_save_cpu_state(ctx);
// NOTE: Keep this call before any state modification
// so bundle can be safely restarted.
gen_helper_expand_proc_chain_stack(tcg_env);
}
#endif /* CONFIG_USER_ONLY */
gen_setwd(ctx);
gen_cs0(ctx);
gen_cs1(ctx);