Skip to content

Fix CSEL/CSINC/CSINV/CSNEG treating r15 as PC instead of zero in Thumb legacy decoder #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mananni-silabs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix CSEL/CSINC/CSINV/CSNEG treating r15 as PC instead of zero in Thumb legacy decoder #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions arch/arm/translate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11919,7 +11919,14 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1)
int end_label = gen_new_label();

gen_test_cc(fcond, cond_true_label);
tmp2 = load_reg(s, rm);

/* In CSEL/CSINC/CSINV/CSNEG, register field 0b1111 means "zero", not PC */
if(rm == 0xf) {
tmp2 = tcg_temp_new_i32();
tcg_gen_movi_i32(tmp2, 0);
} else {
tmp2 = load_reg(s, rm);
}

switch(op1) {
case 0:
Expand Down Expand Up @@ -11947,7 +11954,13 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1)
tcg_gen_br(end_label);
gen_set_label(cond_true_label);

tmp = load_reg(s, rn);
/* In CSEL/CSINC/CSINV/CSNEG, register field 0b1111 means "zero", not PC */
if(rn == 0xf) {
tmp = tcg_temp_new_i32();
tcg_gen_movi_i32(tmp, 0);
} else {
tmp = load_reg(s, rn);
}
store_reg(s, rd, tmp);
gen_set_label(end_label);
} else {
Expand Down