yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-28 23:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Convert T16 branch and exchange

Browse source 
Backports commit a0ef07740425b679d010fac7d9954ae003c1b191 from qemu
This commit is contained in:
Richard Henderson 2019-11-20 12:18:07 -05:00 committed by Lioncash
parent c690f562c4
commit 7ca1b3f817
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qemu/target/arm/t16.decode
View file

@ -24,6 +24,7 @@
&s_rri_rot !extern s rn rd imm rot &s_rri_rot !extern s rn rd imm rot
&s_rrrr !extern s rd rn rm ra &s_rrrr !extern s rd rn rm ra
&ri !extern rd imm &ri !extern rd imm
&r !extern rm
&ldst_rr !extern p w u rn rt rm shimm shtype &ldst_rr !extern p w u rn rt rm shimm shtype
&ldst_ri !extern p w u rn rt imm &ldst_ri !extern p w u rn rt imm
&ldst_block !extern rn i b u w list &ldst_block !extern rn i b u w list
@ -144,3 +145,12 @@ MOV_rxi 00100 ... ........ @arith_1i %s
CMP_xri 00101 ... ........ @arith_1i s=1 CMP_xri 00101 ... ........ @arith_1i s=1
ADD_rri 00110 ... ........ @arith_1i %s ADD_rri 00110 ... ........ @arith_1i %s
SUB_rri 00111 ... ........ @arith_1i %s SUB_rri 00111 ... ........ @arith_1i %s
# Branch and exchange
@branchr .... .... . rm:4 ... &r
BX 0100 0111 0 .... 000 @branchr
BLX_r 0100 0111 1 .... 000 @branchr
BXNS 0100 0111 0 .... 100 @branchr
BLXNS 0100 0111 1 .... 100 @branchr

70
qemu/target/arm/translate.c
View file

@ -8659,7 +8659,7 @@ static bool trans_BX(DisasContext *s, arg_BX *a)
if (!ENABLE_ARCH_4T) { if (!ENABLE_ARCH_4T) {
return false; return false;
} }
gen_bx(s, load_reg(s, a->rm)); gen_bx_excret(s, load_reg(s, a->rm));
return true; return true;
} }
@ -8687,6 +8687,32 @@ static bool trans_BLX_r(DisasContext *s, arg_BLX_r *a)
return true; return true;
} }
/*
* BXNS/BLXNS: only exist for v8M with the security extensions,
* and always UNDEF if NonSecure. We don't implement these in
* the user-only mode either (in theory you can use them from
* Secure User mode but they are too tied in to system emulation).
*/
static bool trans_BXNS(DisasContext *s, arg_BXNS *a)
{
if (!s->v8m_secure || IS_USER_ONLY) {
unallocated_encoding(s);
} else {
gen_bxns(s, a->rm);
}
return true;
}
static bool trans_BLXNS(DisasContext *s, arg_BLXNS *a)
{
if (!s->v8m_secure || IS_USER_ONLY) {
unallocated_encoding(s);
} else {
gen_blxns(s, a->rm);
}
return true;
}
static bool trans_CLZ(DisasContext *s, arg_CLZ *a) static bool trans_CLZ(DisasContext *s, arg_CLZ *a)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
@ -11108,49 +11134,11 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn)
} }
break; break;
case 3: case 3:
{
/* 0b0100_0111_xxxx_xxxx /* 0b0100_0111_xxxx_xxxx
* - branch [and link] exchange thumb register * - branch [and link] exchange thumb register
* In decodetree
*/ */
bool link = insn & (1 << 7); goto illegal_op;
if (insn & 3) {
goto undef;
}
if (link) {
ARCH(5);
}
if ((insn & 4)) {
/* BXNS/BLXNS: only exists for v8M with the
* security extensions, and always UNDEF if NonSecure.
* We don't implement these in the user-only mode
* either (in theory you can use them from Secure User
* mode but they are too tied in to system emulation.)
*/
if (!s->v8m_secure || IS_USER_ONLY) {
goto undef;
}
if (link) {
gen_blxns(s, rm);
} else {
gen_bxns(s, rm);
}
break;
}
/* BLX/BX */
tmp = load_reg(s, rm);
if (link) {
val = (uint32_t)s->base.pc_next | 1;
tmp2 = tcg_temp_new_i32(tcg_ctx);
tcg_gen_movi_i32(tcg_ctx, tmp2, val);
store_reg(s, 14, tmp2);
gen_bx(s, tmp);
} else {
/* Only BX works as exception-return, not BLX */
gen_bx_excret(s, tmp);
}
break;
}
} }
break; break;
} }