Add generic ARM instruction set condition code checks.
RFC PATCH 1/4 Add generic ARM instruction set condition code checks.
This patch breaks the ARM condition checking code out of nwfpe/fpopcode.{ch} into a standalone file for opcode operations. It also modifies the code somwhat for coding style adherence, and adds some temporary variables for increased readability.
--- arch/arm/include/asm/opcodes.h | 14 +++++++++ arch/arm/kernel/Makefile | 2 + arch/arm/kernel/opcodes.c | 61 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletions(-) create mode 100644 arch/arm/include/asm/opcodes.h create mode 100644 arch/arm/kernel/opcodes.c
arch/arm/include/asm/opcodes.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* arch/arm/include/asm/opcodes.h +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARM_OPCODES_H +#define __ASM_ARM_OPCODES_H + +extern unsigned int arm_check_condition (unsigned int opcode,unsigned int psr); + +#endif /* __ASM_ARM_OPCODES_H */
arch/arm/kernel/Makefile +1 -1
@@ -13,7 +13,7 @@ CFLAGS_REMOVE_return_address.o = -pg # Object file lists. -obj-y := elf.o entry-armv.o entry-common.o irq.o \ +obj-y := elf.o entry-armv.o entry-common.o irq.o opcodes.o \ process.o ptrace.o return_address.o setup.o signal.o \ sys_arm.o stacktrace.o time.o traps.o
arch/arm/kernel/opcodes.c new file +61 -0
61 lines not on this page · raw message
RFC PATCH 2/4 Use generic ARM instruction set condition code checks for nwfpe.
This patch changes the nwfpe implementation to use the new generic ARM instruction set condition code checks, rather than a local implementation. It also removes the existing condition code checking, which has been used for the generic support (in kernel/opcodes.{ch}).
This code has not been tested beyond building, linking and booting.
--- arch/arm/nwfpe/entry.S | 6 +++--- arch/arm/nwfpe/fpopcode.c | 26 -------------------------- arch/arm/nwfpe/fpopcode.h | 3 --- 3 files changed, 3 insertions(+), 32 deletions(-)
arch/arm/nwfpe/entry.S +3 -3
@@ -81,11 +81,11 @@ nwfpe_enter: mov r6, r0 @ save the opcode emulate: ldr r1, [sp, #S_PSR] @ fetch the PSR - bl checkCondition @ check the condition - cmp r0, #0 @ r0 = 0 ==> condition failed + bl arm_check_condition @ check the condition + cmp r0, #1 @ r0 = 1 ==> condition passed @ if condition code failed to match, next insn - beq next @ get the next instruction; + bne next @ get the next instruction; mov r0, r6 @ prepare for EmulateAll() bl EmulateAll @ emulate the instruction
arch/arm/nwfpe/fpopcode.c +0 -26
@@ -61,29 +61,3 @@ const float32 float32Constant[] = { 0x41200000 /* single 10.0 */ }; -/* condition code lookup table -index into the table is test code: EQ, NE, ... LT, GT, AL, NV -bit position in short is condition code: NZCV */ -static const unsigned short aCC[16 ] = { -0xF0F0 ,// EQ == Z set -0x0F0F ,// NE -0xCCCC ,// CS == C set -0x3333 ,// CC -0xFF00 ,// MI == N set -0x00FF ,// PL -0xAAAA ,// VS == V set -0x5555 ,// VC -0x0C0C ,// HI == C set && Z clear -0xF3F3 ,// LS == C clear || Z set -0xAA55 ,// GE == (N==V) -0x55AA ,// LT == (N!=V) -0x0A05 ,// GT == (!Z && (N==V)) -0xF5FA ,// LE == (Z || (N!=V)) -0xFFFF ,// AL always -0 // NV -}; - -unsigned int checkCondition (const unsigned int opcode,const unsigned int ccodes) -{ -return (aCC[opcode >>28 ] >> (ccodes >>28 )) &1 ; -}
arch/arm/nwfpe/fpopcode.h +0 -3
@@ -475,9 +475,6 @@ static inline unsigned int getDestinationSize(const unsigned int opcode)return (nRc); } -extern unsigned int checkCondition (const unsigned int opcode, -const unsigned int ccodes); -extern const float64 float64Constant[];extern const float32 float32Constant[];
RFC PATCH 3/4 Add condition code checking to SWP emulation handler.
In reply to Leif LindholmThis patch fixes two separate issues with the SWP emulation handler:
1: Certain processors implementing the ARMv7-A can (legally) take an
undef exception even when the condition code would have meant that the instruction should not have been executed.
2: Opcodes with all flags set (condition code = 0xf) have been reused
in recent, and not-so-recent, versions of the ARM architecture to implement unconditional extensions to the instruction set. The existing code would still have processed any undefs triggered by executing an opcode with such a value.
This patch uses the new generic ARM instruction set condition code checks to implement proper handling of these situations.
--- arch/arm/kernel/swp_emulate.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/kernel/swp_emulate.c +11 -0
@@ -25,6 +25,7 @@#include <linux/syscalls.h> #include <linux/perf_event.h> +#include <asm/opcodes.h> #include <asm/traps.h> #include <asm/uaccess.h>
@@ -183,6 +184,16 @@ static int swp_handler(struct pt_regs *regs, unsigned int instr)unsigned int address, destreg, data, type;unsigned int res =0 ; + res =arm_check_condition (instr, regs->ARM_cpsr); +if (!res) { +/* Condition failed - return to next instruction */ + regs->ARM_pc +=4 ; +return 0 ; + }else if (res !=1 ) { +/* If unconditional encoding - not a SWP, undef */ +return -EFAULT ; + } +perf_sw_event (PERF_COUNT_SW_EMULATION_FAULTS ,1 , regs, regs->ARM_pc);if (current->pid != previous_pid) {
RFC PATCH 3/4 Add condition code checking to SWP emulation handler.
Quoted 17 lines · Leif Lindholm
arch/arm/kernel/swp_emulate.c +2
-0@@ -25,6 +25,7 @@#include <linux/syscalls.h> #include <linux/perf_event.h> +#include <asm/opcodes.h> #include <asm/traps.h> #include <asm/uaccess.h> @@ -183,6 +184,16 @@ static int swp_handler(struct pt_regs *regs, unsigned int instr)unsigned int address, destreg, data, type;unsigned int res =0 ; + res =arm_check_condition (instr, regs->ARM_cpsr);
arch/arm/kernel/swp_emulate.c static int swp_handler(struct pt_regs *regs, unsigned int instr) · line 197
Quoted 10 lines
arch/arm/kernel/swp_emulate.c +9
-0+if (!res) { +/* Condition failed - return to next instruction */ + regs->ARM_pc +=4 ; +return 0 ; + }else if (res !=1 ) { +/* If unconditional encoding - not a SWP, undef */ +return -EFAULT ; + } +perf_sw_event (PERF_COUNT_SW_EMULATION_FAULTS ,1 , regs, regs->ARM_pc);
Although the definition of this perf event is by no means well defined, I think I'd like it to increment even if the opcode condigion isn't satisfied. After all, we *have* faulted by this point, we just haven't needed to do anything much in the handler.
Will
RFC PATCH 4/4 Use generic ARM instruction set condition code checks for kprobes.
In reply to Leif LindholmThis patch changes the kprobes implementation to use the generic ARM instruction set condition code checks, rather than a dedicated implementation.
Note, this is a direct interface change, and the resulting code is not the prettiest, but this is an RFC only.
This code builds and links, but current 3.2-rc2 does not boot on my Versatile Express board with CONFIG_ARM_KPROBES_TEST enabled either with or without this patch.
--- arch/arm/kernel/kprobes-test.c | 71 +++------------------------------------- 1 files changed, 5 insertions(+), 66 deletions(-)
arch/arm/kernel/kprobes-test.c +5 -66
@@ -202,6 +202,8 @@#include <linux/slab.h> #include <linux/kprobes.h> +#include <asm/opcodes.h> +#include "kprobes.h" #include "kprobes-test.h"
@@ -1048,69 +1050,6 @@ static int test_instance;*/ #define PSR_IGNORE_BITS (PSR_A_BIT | PSR_F_BIT) -static unsigned long test_check_cc (int cc,unsigned long cpsr) -{ -unsigned long temp; - -switch (cc) { -case 0x0 :/* eq */ -return cpsr &PSR_Z_BIT ; - -case 0x1 :/* ne */ -return (~cpsr) &PSR_Z_BIT ; - -case 0x2 :/* cs */ -return cpsr &PSR_C_BIT ; - -case 0x3 :/* cc */ -return (~cpsr) &PSR_C_BIT ; - -case 0x4 :/* mi */ -return cpsr &PSR_N_BIT ; - -case 0x5 :/* pl */ -return (~cpsr) &PSR_N_BIT ; - -case 0x6 :/* vs */ -return cpsr &PSR_V_BIT ; - -case 0x7 :/* vc */ -return (~cpsr) &PSR_V_BIT ; - -case 0x8 :/* hi */ - cpsr &= ~(cpsr >>1 );/* PSR_C_BIT &= ~PSR_Z_BIT */ -return cpsr &PSR_C_BIT ; - -case 0x9 :/* ls */ - cpsr &= ~(cpsr >>1 );/* PSR_C_BIT &= ~PSR_Z_BIT */ -return (~cpsr) &PSR_C_BIT ; - -case 0xa :/* ge */ - cpsr ^= (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ -return (~cpsr) &PSR_N_BIT ; - -case 0xb :/* lt */ - cpsr ^= (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ -return cpsr &PSR_N_BIT ; - -case 0xc :/* gt */ - temp = cpsr ^ (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ - temp |= (cpsr <<1 );/* PSR_N_BIT |= PSR_Z_BIT */ -return (~temp) &PSR_N_BIT ; - -case 0xd :/* le */ - temp = cpsr ^ (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ - temp |= (cpsr <<1 );/* PSR_N_BIT |= PSR_Z_BIT */ -return temp &PSR_N_BIT ; - -case 0xe :/* al */ -case 0xf :/* unconditional */ -return true; - } -BUG (); -return false; -} -static int is_last_scenario;static int probe_should_run;/* 0 = no, 1 = yes, -1 = unknown */ static int memory_needs_checking;
@@ -1128,7 +1067,7 @@ static unsigned long test_context_cpsr(int scenario)if (!test_case_is_thumb) {/* Testing ARM code */ - probe_should_run =test_check_cc (current_instruction >>28 , cpsr) !=0 ; + probe_should_run =arm_check_condition (current_instruction, cpsr) !=0 ;if (scenario ==15 ) is_last_scenario = true;
@@ -1136,7 +1075,7 @@ static unsigned long test_context_cpsr(int scenario)/* Testing Thumb code without setting ITSTATE */ if (kprobe_test_cc_position) {int cc = (current_instruction >> kprobe_test_cc_position) &0xf ; - probe_should_run =test_check_cc (cc, cpsr) !=0 ; + probe_should_run =arm_check_condition (cc <<28 , cpsr) !=0 ; }if (scenario ==15 )
@@ -1163,7 +1102,7 @@ static unsigned long test_context_cpsr(int scenario) cpsr |= (mask &0x8 ) <<23 ;/* ITSTATE<1> */ cpsr |= (mask &0x10 ) <<21 ;/* ITSTATE<0> */ - probe_should_run =test_check_cc ((cpsr >>12 ) &0xf , cpsr) !=0 ; + probe_should_run =arm_check_condition (((cpsr >>12 ) &0xf ) <<28 , cpsr) !=0 ; }else {/* Testing Thumb code with several combinations of ITSTATE */
RFC PATCH 4/4 Use generic ARM instruction set condition code checks for kprobes.
Quoted 6 lines · Leif Lindholm
This patch changes the kprobes implementation to use the generic ARM instruction set condition code checks, rather than a dedicated implementation.
Note, this is a direct interface change, and the resulting code is not the prettiest, but this is an RFC only.
It might be prettier to keep test_check_cc() but defined like:
inline unsigned long test_check_cc(int cc, unsigned long cpsr)
{
return arm_check_condition(cc << 28, cpsr);
}But still change to directly calling arm_check_condition() in the case of checking ARM instructions.
Quoted 3 lines
This code builds and links, but current 3.2-rc2 does not boot on my Versatile Express board with
CONFIG_ARM_KPROBES_TESTenabled either with or without this patch.
What are the symptoms? Have you tried setting VERBOSE to '1' at the top of kprobes-test.h?
Currently the test code has problems building for Thumb, there's a patch:
http://www.mail-archive.com/linaro-dev at lists.linaro.org/msg07925.html
Also, when the test module is built-in, the tests fail near the beginning due to an issue with Thumb symbol handling in the kernel, see
http://www.spinics.net/lists/arm-kernel/msg138283.html
But building it as a module and insmod'ing should work.
Signature · 1 line
Tixy
Quoted 118 lines
Cc Tixy <[email protected]>Signed-off-by Leif Lindholm <[email protected]>--- arch/arm/kernel/kprobes-test.c | 71 +++------------------------------------- 1 files changed, 5 insertions(+), 66 deletions(-)arch/arm/kernel/kprobes-test.c +5
-66@@ -202,6 +202,8 @@#include <linux/slab.h> #include <linux/kprobes.h> +#include <asm/opcodes.h> +#include "kprobes.h" #include "kprobes-test.h" @@ -1048,69 +1050,6 @@ static int test_instance;*/ #define PSR_IGNORE_BITS (PSR_A_BIT | PSR_F_BIT) -static unsigned long test_check_cc (int cc,unsigned long cpsr) -{ -unsigned long temp; - -switch (cc) { -case 0x0 :/* eq */ -return cpsr &PSR_Z_BIT ; - -case 0x1 :/* ne */ -return (~cpsr) &PSR_Z_BIT ; - -case 0x2 :/* cs */ -return cpsr &PSR_C_BIT ; - -case 0x3 :/* cc */ -return (~cpsr) &PSR_C_BIT ; - -case 0x4 :/* mi */ -return cpsr &PSR_N_BIT ; - -case 0x5 :/* pl */ -return (~cpsr) &PSR_N_BIT ; - -case 0x6 :/* vs */ -return cpsr &PSR_V_BIT ; - -case 0x7 :/* vc */ -return (~cpsr) &PSR_V_BIT ; - -case 0x8 :/* hi */ - cpsr &= ~(cpsr >>1 );/* PSR_C_BIT &= ~PSR_Z_BIT */ -return cpsr &PSR_C_BIT ; - -case 0x9 :/* ls */ - cpsr &= ~(cpsr >>1 );/* PSR_C_BIT &= ~PSR_Z_BIT */ -return (~cpsr) &PSR_C_BIT ; - -case 0xa :/* ge */ - cpsr ^= (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ -return (~cpsr) &PSR_N_BIT ; - -case 0xb :/* lt */ - cpsr ^= (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ -return cpsr &PSR_N_BIT ; - -case 0xc :/* gt */ - temp = cpsr ^ (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ - temp |= (cpsr <<1 );/* PSR_N_BIT |= PSR_Z_BIT */ -return (~temp) &PSR_N_BIT ; - -case 0xd :/* le */ - temp = cpsr ^ (cpsr <<3 );/* PSR_N_BIT ^= PSR_V_BIT */ - temp |= (cpsr <<1 );/* PSR_N_BIT |= PSR_Z_BIT */ -return temp &PSR_N_BIT ; - -case 0xe :/* al */ -case 0xf :/* unconditional */ -return true; - } -BUG (); -return false; -} -static int is_last_scenario;static int probe_should_run;/* 0 = no, 1 = yes, -1 = unknown */ static int memory_needs_checking;@@ -1128,7 +1067,7 @@ static unsigned long test_context_cpsr(int scenario)if (!test_case_is_thumb) {/* Testing ARM code */ - probe_should_run =test_check_cc (current_instruction >>28 , cpsr) !=0 ; + probe_should_run =arm_check_condition (current_instruction, cpsr) !=0 ;if (scenario ==15 ) is_last_scenario = true;@@ -1136,7 +1075,7 @@ static unsigned long test_context_cpsr(int scenario)/* Testing Thumb code without setting ITSTATE */ if (kprobe_test_cc_position) {int cc = (current_instruction >> kprobe_test_cc_position) &0xf ; - probe_should_run =test_check_cc (cc, cpsr) !=0 ; + probe_should_run =arm_check_condition (cc <<28 , cpsr) !=0 ; }if (scenario ==15 )@@ -1163,7 +1102,7 @@ static unsigned long test_context_cpsr(int scenario) cpsr |= (mask &0x8 ) <<23 ;/* ITSTATE<1> */ cpsr |= (mask &0x10 ) <<21 ;/* ITSTATE<0> */ - probe_should_run =test_check_cc ((cpsr >>12 ) &0xf , cpsr) !=0 ; + probe_should_run =arm_check_condition (((cpsr >>12 ) &0xf ) <<28 , cpsr) !=0 ; }else {/* Testing Thumb code with several combinations of ITSTATE */
A message that is not in the archive (sent off-list or not yet received): [email protected]
RFC PATCH 4/4 Use generic ARM instruction set condition code checks for kprobes.
On Thu, 2011-11-24 at 17:02 +0000, Leif Lindholm wrote of kprobes test failures...
Quoted 8 lines
Actually, it seems it fails explicitly because the SWP emulation is enabled (making the Cortex-A9 take an undef on SWP{B}):
<<<
.word0xe0ff1392@ smlals pc, r1, r2, r3
.word0xe0f0f392@ smlals r0, pc, r2, r3
.word0xe0f0139f@ smlals r0, r1, pc, r3
.word0xe0f01f92@ smlals r0, r1, r2, pc
Quoted 8 lines
Synchronization primitives
---------------------------------------------------------
.word0xe108e097@ swp lr, r7, [r8]Internal error: Oops - undefined instruction: 0 [#1] SMP Modules linked in: test_kprobes(+) CPU: 0 Not tainted (3.2.0-rc3+ #9) PC is at kprobe_arm_test_cases+0xe1d0/0x18db9 [test_kprobes] >>>
That would explain things, taking an undef abort in the kprobes handler (which itself is running in an undef hook) will OOPS. I think that the test code should not try to test the SWP instruction on ARMv7. It's deprecated and the GCC compiler won't generate it - hence my need to encode the instruction as ".word 0xe108e097" rather than get use assembler syntax. I'll create a patch to update the test code.
Quoted 54 lines
Now, disabling the SWP emulation, it still fails - but at least not as an oops this time:
<<<
FAIL: test memory differs
FAIL: Test strd r2, [r3], r4
FAIL: Scenario 0initial_regs:r0 21522152 | r1 21522052 | r2 12345678 | r3 b6521d78 r4 00000030 | r5 21522452 | r6 21522752 | r7 21522652 r8 21522952 | r9 21522852 | r10 21522b52 | r11 21522a52 r12 21522d52 | sp b6521d60 | lr 21522f52 | pc 7f010c34 cpsr 00000013 expected_regs: r0 21522152 | r1 21522052 | r2 12345678 | r3 b6521da8 r4 00000030 | r5 21522452 | r6 21522752 | r7 21522652 r8 21522952 | r9 21522852 | r10 21522b52 | r11 21522a52 r12 21522d52 | sp b6521d60 | lr 21522f52 | pc 7f010c38 cpsr 00000013 result_regs: r0 21522152 | r1 21522052 | r2 12345678 | r3 b6521da8 r4 00000030 | r5 21522452 | r6 21522752 | r7 21522652 r8 21522952 | r9 21522852 | r10 21522b52 | r11 21522a52r12
21522d52| spb6521d60| lr21522f52| pc7f010c38cpsr 00000013
current_stack=b6521d60expected_memory:ba987654ba987754ba987854ba987954ba987a54ba987b5412345678b6521da8ba987e54ba987f54ba988054ba988154ba988254b6521dd8ba988454ba988554ba988654ba988754ba988854ba988954ba988a54ba988b54ba988c54ba988d54ba988e54ba988f54ba989054ba989154ba989254ba989354ba989454ba989554ba989654ba989754ba989854ba989954ba989a54ba989b54ba989c54ba989d54ba989e54ba989f54ba98a054ba98a154ba98a254ba98a354ba98a454ba98a554ba98a654ba98a754ba98a854ba98a954ba98aa54ba98ab54ba98ac54ba98ad54ba98ae54ba98af54ba98b054ba98b154ba98b254ba98b354ba98b454ba98b554result_memory:ba987654ba987754ba987854ba987954ba987a54ba987b5412345678b6521d78ba987e54ba987f54ba988054ba988154ba988254b6521dd8ba988454ba988554ba988654ba988754ba988854ba988954ba988a54ba988b54ba988c54ba988d54ba988e54ba988f54ba989054ba989154ba989254ba989354ba989454ba989554ba989654ba989754ba989854ba989954ba989a54ba989b54ba989c54ba989d54
Quoted 9 lines
ba989e54ba989f54ba98a054ba98a154ba98a254ba98a354ba98a454ba98a554ba98a654ba98a754ba98a854ba98a954ba98aa54ba98ab54ba98ac54ba98ad54ba98ae54ba98af54ba98b054ba98b154ba98b254ba98b354ba98b454ba98b554
kprobe tests failed
FATAL: Error insertingtest_kprobes
The kprobes instruction emulation has stored the original value of r3 into memory, whereas the real instruction has store the updated value of r3. Either this instruction form is UNPREDICTABLE, in which case the test code should not be trying to test it, otherwise the instruction emulation code needs fixing. Either way, a patch is needed. I'll look into this.
Quoted 1 line
Should I go back on-list with this?
I've cc'd the list so the problem is archived.
Signature · 1 line
Tixy
RFC PATCH 4/4 Use generic ARM instruction set condition code checks for kprobes.
Quoted 6 lines · Tixy
Quoted 6 lines
Now, disabling the SWP emulation, it still fails - but at least not as an oops this time:
<<<
FAIL: test memory differs
FAIL: Test strd r2, [r3], r4
FAIL: Scenario 0
...
Quoted 8 lines
Quoted 2 lines
FATAL: Error inserting
test_kprobesThe kprobes instruction emulation has stored the original value of r3 into memory, whereas the real instruction has store the updated value of r3. Either this instruction form is UNPREDICTABLE, in which case the test code should not be trying to test it, otherwise the instruction emulation code needs fixing. Either way, a patch is needed. I'll look into this.
Yes, this instruction form is UNPREDICTABLE, and some quick experiments show that it behaves differently on for example Cortex-A8 and Cortex-A9.
/
Leif
RFC PATCH 1/4 Add generic ARM instruction set condition code checks.
In reply to Leif LindholmHi Leif,
Quoted 4 lines · Leif Lindholm
This patch breaks the ARM condition checking code out of nwfpe/fpopcode.{ch} into a standalone file for opcode operations. It also modifies the code somwhat for coding style adherence, and adds some temporary variables for increased readability.
s/somwhat/somewhat/
Quoted 9 lines
arch/arm/kernel/opcodes.c new file +3
-0@@ -0,0 +1,61 @@ +/* +* linux/arch/arm/kernel/opcodes.c +*
arch/arm/kernel/opcodes.c line 13
Quoted 10 lines
arch/arm/kernel/opcodes.c new file +10
-0+* A32 condition code lookup feature moved from nwfpe/fpopcode.c +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <asm/opcodes.h> + +#define ARM_OPCODE_UNCONDITIONAL 0xf
Maybe ARM_OPCODE_CONDITION_UNCOND or something (in case we decide to put more opcodes in here).
Quoted 20 lines
arch/arm/kernel/opcodes.c new file +20
-0+/* +* condition code lookup table +* index into the table is test code: EQ, NE, ... LT, GT, AL, NV +* +* bit position in short is condition code: NZCV +*/ +static const unsigned short cc_map[16 ] = { +0xF0F0 ,/* EQ == Z set */ +0x0F0F ,/* NE */ +0xCCCC ,/* CS == C set */ +0x3333 ,/* CC */ +0xFF00 ,/* MI == N set */ +0x00FF ,/* PL */ +0xAAAA ,/* VS == V set */ +0x5555 ,/* VC */ +0x0C0C ,/* HI == C set && Z clear */ +0xF3F3 ,/* LS == C clear || Z set */ +0xAA55 ,/* GE == (N==V) */ +0x55AA ,/* LT == (N!=V) */ +0x0A05 ,/* GT == (!Z && (N==V)) */
arch/arm/kernel/opcodes.c line 44
Quoted 10 lines
arch/arm/kernel/opcodes.c new file +10
-0+0xF5FA ,/* LE == (Z || (N!=V)) */ +0xFFFF ,/* AL always */ + 0 /* NV */ +}; + +/* +* Returns: +* 0 - if condition fails +* 1 - if condition passes (including AL) +* 2 - if unconditional encoding (or before ARMv3, NV condition)
Can you #define these in the header file please? You'll need to make sure they're available to assembly code too.
arch/arm/kernel/opcodes.c line 51
Quoted 6 lines
arch/arm/kernel/opcodes.c new file +6
-0+* Code that needs to check whether a condition has explicitly passed, +* should compare the return value to 1. +* Code that wants to check if a condition means that the instruction +* should be executed, should compare the return value to !0. +*/ +unsigned int arm_check_condition (unsigned int opcode,unsigned int psr)
Why not just return int?
arch/arm/kernel/opcodes.c line 61
Quoted 10 lines
arch/arm/kernel/opcodes.c new file +10
-0+{ +unsigned int cc_bits = opcode >>28 ; +unsigned int psr_cond = psr >>28 ; + +/* NV condition or unconditional */ +if (cc_bits ==ARM_OPCODE_UNCONDITIONAL ) +return 2 ; + +return (cc_map[cc_bits] >> (psr_cond)) &1 ; +}
Then you can use the new defines here.
Will
RFC PATCH 1/4 Add generic ARM instruction set condition code checks.
In reply to Leif LindholmQuoted 5 lines · Leif Lindholm
+/*
+ * Returns:
+ * 0 - if condition fails
+ * 1 - if condition passes (including AL)
+ * 2 - if unconditional encoding (or before ARMv3, NV condition)
The comment is wrong. NV always meant 'never execute' including v3, v4 and v5 architectures.
RFC PATCH 1/4 Add generic ARM instruction set condition code checks.
Quoted 9 lines · Russell King - ARM Linux
Quoted 5 lines · Leif Lindholm
+/*
+ * Returns:
+ * 0 - if condition fails
+ * 1 - if condition passes (including AL)
+ * 2 - if unconditional encoding (or before ARMv3, NV condition)The comment is wrong. NV always meant 'never execute' including v3, v4 and v5 architectures.
Actually, if the v5 ARM ARM is to believed this was only true prior to ARMv3.
Apparently the behaviour of instructions encoded with the NV condition code is UNPREDICTABLE in v3 and v4. With the exception of the ARMv5 BLX <label> and v5E PLD instructions, I've no idea whether any actual implementation did anything crazy with these opcodes though, prior to ARMv6.
Perhaps someone implemented some v4/v3 parts with custom instructions in this space, or dealt with the NV condition in a unexpected way -- I'm not aware of any such implementation, though.
Maybe the comment can be reworded more conservatively, such as
"2 - NV condition, or separate unconditional opcode space from v5 onwards"
That wording judiciously doesn't say anything about v3/v4.
Cheers
---Dave