[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v4 30/69] target/arm: Diagnose too few registers in li
From: |
Richard Henderson |
Subject: |
[Qemu-arm] [PATCH v4 30/69] target/arm: Diagnose too few registers in list for LDM/STM |
Date: |
Wed, 4 Sep 2019 12:30:20 -0700 |
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.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/translate.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/target/arm/translate.c b/target/arm/translate.c
index b67e7389d3..b623dbcd48 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -9846,7 +9846,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)
{
int i, j, n, list, mem_idx;
bool user = a->u;
@@ -9863,7 +9863,10 @@ static bool op_stm(DisasContext *s, arg_ldst_block *a)
list = a->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);
mem_idx = get_mem_index(s);
@@ -9896,7 +9899,8 @@ static bool op_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)
@@ -9906,10 +9910,11 @@ static bool trans_STM_t32(DisasContext *s,
arg_ldst_block *a)
unallocated_encoding(s);
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)
{
int i, j, n, list, mem_idx;
bool loaded_base;
@@ -9938,7 +9943,10 @@ static bool do_ldm(DisasContext *s, arg_ldst_block *a)
list = a->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);
mem_idx = get_mem_index(s);
@@ -10006,7 +10014,8 @@ static bool trans_LDM_a32(DisasContext *s,
arg_ldst_block *a)
unallocated_encoding(s);
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)
@@ -10016,7 +10025,8 @@ static bool trans_LDM_t32(DisasContext *s,
arg_ldst_block *a)
unallocated_encoding(s);
return true;
}
- return do_ldm(s, a);
+ /* BitCount(list) < 2 is UNPREDICTABLE */
+ return do_ldm(s, a, 2);
}
/*
--
2.17.1
- [Qemu-arm] [PATCH v4 17/69] target/arm: Convert ERET, (continued)
- [Qemu-arm] [PATCH v4 17/69] target/arm: Convert ERET, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 19/69] target/arm: Convert T32 ADDW/SUBW, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 22/69] target/arm: Diagnose UNPREDICTABLE ldrex/strex cases, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 23/69] target/arm: Convert USAD8, USADA8, SBFX, UBFX, BFC, BFI, UDF, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 21/69] target/arm: Convert Synchronization primitives, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 24/69] target/arm: Convert Parallel addition and subtraction, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 20/69] target/arm: Convert load/store (register, immediate, literal), Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 27/69] target/arm: Convert MOVW, MOVT, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 29/69] target/arm: Diagnose writeback register in list for LDM for v7, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 31/69] target/arm: Diagnose base == pc for LDM/STM, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 30/69] target/arm: Diagnose too few registers in list for LDM/STM,
Richard Henderson <=
- [Qemu-arm] [PATCH v4 33/69] target/arm: Convert SVC, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 26/69] target/arm: Convert Signed multiply, signed and unsigned divide, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 28/69] target/arm: Convert LDM, STM, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 25/69] target/arm: Convert packing, unpacking, saturation, and reversal, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 32/69] target/arm: Convert B, BL, BLX (immediate), Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 35/69] target/arm: Convert Clear-Exclusive, Barriers, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 34/69] target/arm: Convert RFE and SRS, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 39/69] target/arm: Convert Unallocated memory hint, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 37/69] target/arm: Convert SETEND, Richard Henderson, 2019/09/04
- [Qemu-arm] [PATCH v4 38/69] target/arm: Convert PLI, PLD, PLDW, Richard Henderson, 2019/09/04