[PATCH] arch: net: bpf_jit_comp: Fixed coding style issues.

Subsystems: bpf jit for x86 64-bit, bpf [general] (safe dynamic programs and tools), the rest, x86 architecture (32-bit and 64-bit)

STALE5303d

2 messages, 2 authors, 2012-02-04 · open the first message on its own page

[PATCH] arch: net: bpf_jit_comp: Fixed coding style issues.

From: Mbarek Firas <hidden>
Date: 2012-02-02 23:36:21

Fixed coding style issues.

Signed-off-by: Mbarek Firas <redacted>
---
 arch/x86/net/bpf_jit_comp.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 7b65f75..6594bd58 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -51,7 +51,7 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
 #define EMIT2(b1, b2)		EMIT((b1) + ((b2) << 8), 2)
 #define EMIT3(b1, b2, b3)	EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
 #define EMIT4(b1, b2, b3, b4)   EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
-#define EMIT1_off32(b1, off)	do { EMIT1(b1); EMIT(off, 4);} while (0)
+#define EMIT1_off32(b1, off)	do { EMIT1(b1); EMIT(off, 4); } while (0)
 
 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
@@ -513,14 +513,14 @@ common_load_ind:		seen |= SEEN_DATAREF | SEEN_XREG;
 				t_offset = addrs[i + K] - addrs[i];
 				EMIT_JMP(t_offset);
 				break;
-			COND_SEL(BPF_S_JMP_JGT_K, X86_JA, X86_JBE);
-			COND_SEL(BPF_S_JMP_JGE_K, X86_JAE, X86_JB);
-			COND_SEL(BPF_S_JMP_JEQ_K, X86_JE, X86_JNE);
-			COND_SEL(BPF_S_JMP_JSET_K,X86_JNE, X86_JE);
-			COND_SEL(BPF_S_JMP_JGT_X, X86_JA, X86_JBE);
-			COND_SEL(BPF_S_JMP_JGE_X, X86_JAE, X86_JB);
-			COND_SEL(BPF_S_JMP_JEQ_X, X86_JE, X86_JNE);
-			COND_SEL(BPF_S_JMP_JSET_X,X86_JNE, X86_JE);
+			COND_SEL(BPF_S_JMP_JGT_K,  X86_JA,  X86_JBE);
+			COND_SEL(BPF_S_JMP_JGE_K,  X86_JAE, X86_JB);
+			COND_SEL(BPF_S_JMP_JEQ_K,  X86_JE,  X86_JNE);
+			COND_SEL(BPF_S_JMP_JSET_K, X86_JNE, X86_JE);
+			COND_SEL(BPF_S_JMP_JGT_X,  X86_JA,  X86_JBE);
+			COND_SEL(BPF_S_JMP_JGE_X,  X86_JAE, X86_JB);
+			COND_SEL(BPF_S_JMP_JEQ_X,  X86_JE,  X86_JNE);
+			COND_SEL(BPF_S_JMP_JSET_X, X86_JNE, X86_JE);
 
 cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
 				t_offset = addrs[i + filter[i].jt] - addrs[i];
-- 
1.7.5.4

Re: [PATCH] arch: net: bpf_jit_comp: Fixed coding style issues.

From: David Miller <davem@davemloft.net>
Date: 2012-02-04 21:55:25

From: Mbarek Firas <redacted>
Date: Fri,  3 Feb 2012 01:38:15 +0100
-			COND_SEL(BPF_S_JMP_JGT_K, X86_JA, X86_JBE);
-			COND_SEL(BPF_S_JMP_JGE_K, X86_JAE, X86_JB);
-			COND_SEL(BPF_S_JMP_JEQ_K, X86_JE, X86_JNE);
-			COND_SEL(BPF_S_JMP_JSET_K,X86_JNE, X86_JE);
-			COND_SEL(BPF_S_JMP_JGT_X, X86_JA, X86_JBE);
-			COND_SEL(BPF_S_JMP_JGE_X, X86_JAE, X86_JB);
-			COND_SEL(BPF_S_JMP_JEQ_X, X86_JE, X86_JNE);
-			COND_SEL(BPF_S_JMP_JSET_X,X86_JNE, X86_JE);
+			COND_SEL(BPF_S_JMP_JGT_K,  X86_JA,  X86_JBE);
+			COND_SEL(BPF_S_JMP_JGE_K,  X86_JAE, X86_JB);
+			COND_SEL(BPF_S_JMP_JEQ_K,  X86_JE,  X86_JNE);
+			COND_SEL(BPF_S_JMP_JSET_K, X86_JNE, X86_JE);
This is rediculious, it's not fixing anything.

There is no requirement that all the arguments have to line up
to the same column on every line.

I'm not applying this patch.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help