diff options
| author | Jon Medhurst (Tixy) <tixy@linaro.org> | 2015-01-05 11:29:40 (GMT) |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-01-13 16:10:17 (GMT) |
| commit | 4cd872d973c7e1ce6a41e36db9d9352152da32d4 (patch) | |
| tree | 9418dd882418266bcbd60e0d7d757615b02ac6d0 /arch/arm/probes/kprobes/test-thumb.c | |
| parent | 0dc016dbd820260b8ea74337980735b8c88d4ef2 (diff) | |
| download | linux-4cd872d973c7e1ce6a41e36db9d9352152da32d4.tar.xz | |
ARM: kprobes: Fix unreliable MRS instruction tests
For the instruction 'mrs Rn, cpsr' the resulting value of Rn can vary due to
external factors we can't control. So get the test code to mask out these
indeterminate bits.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/probes/kprobes/test-thumb.c')
| -rw-r--r-- | arch/arm/probes/kprobes/test-thumb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/probes/kprobes/test-thumb.c b/arch/arm/probes/kprobes/test-thumb.c index e8cf193..b683b45 100644 --- a/arch/arm/probes/kprobes/test-thumb.c +++ b/arch/arm/probes/kprobes/test-thumb.c @@ -778,8 +778,8 @@ CONDITION_INSTRUCTIONS(22, TEST_UNSUPPORTED("subs pc, lr, #4") - TEST("mrs r0, cpsr") - TEST("mrs r14, cpsr") + TEST_RMASKED("mrs r",0,~PSR_IGNORE_BITS,", cpsr") + TEST_RMASKED("mrs r",14,~PSR_IGNORE_BITS,", cpsr") TEST_UNSUPPORTED(__inst_thumb32(0xf3ef8d00) " @ mrs sp, spsr") TEST_UNSUPPORTED(__inst_thumb32(0xf3ef8f00) " @ mrs pc, spsr") TEST_UNSUPPORTED("mrs r0, spsr") |