yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-19 07:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Diagnose too few registers in list for LDM/STM

Browse source 
This has been a TODO item for quite a while. The minimum bit
count for A32 and T16 is 1, and for T32 is 2.

Backports commit 4b222545dbf30b60c033e1cd6eddda612575fd8c from qemu
This commit is contained in:
Richard Henderson 2019-11-20 11:24:48 -05:00 committed by Lioncash
parent fc81b12631
commit 1a0986ee25
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10178,7 +10178,7 @@ static void op_addr_block_post(DisasContext *s, arg_ldst_block *a,
} }
} }
static bool op_stm(DisasContext *s, arg_ldst_block *a) static bool op_stm(DisasContext *s, arg_ldst_block *a, int min_n)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
int i, j, n, list, mem_idx; int i, j, n, list, mem_idx;
@ -10196,7 +10196,10 @@ static bool op_stm(DisasContext *s, arg_ldst_block *a)
list = a->list; list = a->list;
n = ctpop16(list); n = ctpop16(list);
/* TODO: test invalid n == 0 case */ if (n < min_n) {
unallocated_encoding(s);
return true;
}
addr = op_addr_block_pre(s, a, n); addr = op_addr_block_pre(s, a, n);
mem_idx = get_mem_index(s); mem_idx = get_mem_index(s);
@ -10229,7 +10232,8 @@ static bool op_stm(DisasContext *s, arg_ldst_block *a)
static bool trans_STM(DisasContext *s, arg_ldst_block *a) static bool trans_STM(DisasContext *s, arg_ldst_block *a)
{ {
return op_stm(s, a); /* BitCount(list) < 1 is UNPREDICTABLE */
return op_stm(s, a, 1);
} }
static bool trans_STM_t32(DisasContext *s, arg_ldst_block *a) static bool trans_STM_t32(DisasContext *s, arg_ldst_block *a)
@ -10239,10 +10243,11 @@ static bool trans_STM_t32(DisasContext *s, arg_ldst_block *a)
unallocated_encoding(s); unallocated_encoding(s);
return true; return true;
} }
return op_stm(s, a); /* BitCount(list) < 2 is UNPREDICTABLE */
return op_stm(s, a, 2);
} }
static bool do_ldm(DisasContext *s, arg_ldst_block *a) static bool do_ldm(DisasContext *s, arg_ldst_block *a, int min_n)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
int i, j, n, list, mem_idx; int i, j, n, list, mem_idx;
@ -10272,7 +10277,10 @@ static bool do_ldm(DisasContext *s, arg_ldst_block *a)
list = a->list; list = a->list;
n = ctpop16(list); n = ctpop16(list);
/* TODO: test invalid n == 0 case */ if (n < min_n) {
unallocated_encoding(s);
return true;
}
addr = op_addr_block_pre(s, a, n); addr = op_addr_block_pre(s, a, n);
mem_idx = get_mem_index(s); mem_idx = get_mem_index(s);
@ -10340,7 +10348,8 @@ static bool trans_LDM_a32(DisasContext *s, arg_ldst_block *a)
unallocated_encoding(s); unallocated_encoding(s);
return true; return true;
} }
return do_ldm(s, a); /* BitCount(list) < 1 is UNPREDICTABLE */
return do_ldm(s, a, 1);
} }
static bool trans_LDM_t32(DisasContext *s, arg_ldst_block *a) static bool trans_LDM_t32(DisasContext *s, arg_ldst_block *a)
@ -10350,7 +10359,8 @@ static bool trans_LDM_t32(DisasContext *s, arg_ldst_block *a)
unallocated_encoding(s); unallocated_encoding(s);
return true; return true;
} }
return do_ldm(s, a); /* BitCount(list) < 2 is UNPREDICTABLE */
return do_ldm(s, a, 2);
} }
/* /*