diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-12-01 12:42:32 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-12-03 10:44:05 -0500 |
| commit | 916908df244fe53cc81d560ebaa9e2d11f1cee43 (patch) | |
| tree | aabefdedd2c2f1acc87fdc43463eb05bbf889c16 /arch | |
| parent | 3247274536729b6cc23208cc087e50fdef3de6ba (diff) | |
| download | op-kernel-dev-916908df244fe53cc81d560ebaa9e2d11f1cee43.zip op-kernel-dev-916908df244fe53cc81d560ebaa9e2d11f1cee43.tar.gz | |
s390/bpf,jit: add support for XOR instruction
Add support for XOR instruction for use with X/K.
s390 JIT support for the new BPF_S_ALU_XOR_* instructions introduced
with 9e49e889 "filter: add XOR instruction for use with X/K".
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 1ff9301..bb28441 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -389,10 +389,17 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter, EMIT4_DISP(0x5650d000, EMIT_CONST(K)); break; case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */ + case BPF_S_ALU_XOR_X: jit->seen |= SEEN_XREG; /* xr %r5,%r12 */ EMIT2(0x175c); break; + case BPF_S_ALU_XOR_K: /* A ^= K */ + if (!K) + break; + /* x %r5,<d(K)>(%r13) */ + EMIT4_DISP(0x5750d000, EMIT_CONST(K)); + break; case BPF_S_ALU_LSH_X: /* A <<= X; */ jit->seen |= SEEN_XREG; /* sll %r5,0(%r12) */ |
