2023-07-07 15:07:42

by Zhangjin Wu

[permalink] [raw]
Subject: [PATCH v6 01/15] tools/nolibc: arch-*.h: fix up code indent errors

More than 8 whitespaces of the code indent are replaced with "tab +
whitespaces" to fix up such errors reported by scripts/checkpatch.pl:

ERROR: code indent should use tabs where possible
#64: FILE: tools/include/nolibc/arch-mips.h:64:
+^I \$

ERROR: code indent should use tabs where possible
#72: FILE: tools/include/nolibc/arch-mips.h:72:
+^I "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \$

This command is used:

$ sed -i -e '/^\t* /{s/ /\t/g}' tools/include/nolibc/arch-*.h

Signed-off-by: Zhangjin Wu <[email protected]>
---
tools/include/nolibc/arch-aarch64.h | 14 +++++++-------
tools/include/nolibc/arch-arm.h | 14 +++++++-------
tools/include/nolibc/arch-i386.h | 12 ++++++------
tools/include/nolibc/arch-mips.h | 24 ++++++++++++------------
tools/include/nolibc/arch-x86_64.h | 14 +++++++-------
5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/tools/include/nolibc/arch-aarch64.h b/tools/include/nolibc/arch-aarch64.h
index 11f294a406b7..c911f61365d1 100644
--- a/tools/include/nolibc/arch-aarch64.h
+++ b/tools/include/nolibc/arch-aarch64.h
@@ -56,7 +56,7 @@ struct sys_stat_struct {
({ \
register long _num __asm__ ("x8") = (num); \
register long _arg1 __asm__ ("x0"); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r"(_arg1) \
@@ -70,7 +70,7 @@ struct sys_stat_struct {
({ \
register long _num __asm__ ("x8") = (num); \
register long _arg1 __asm__ ("x0") = (long)(arg1); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r"(_arg1) \
@@ -86,7 +86,7 @@ struct sys_stat_struct {
register long _num __asm__ ("x8") = (num); \
register long _arg1 __asm__ ("x0") = (long)(arg1); \
register long _arg2 __asm__ ("x1") = (long)(arg2); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r"(_arg1) \
@@ -103,7 +103,7 @@ struct sys_stat_struct {
register long _arg1 __asm__ ("x0") = (long)(arg1); \
register long _arg2 __asm__ ("x1") = (long)(arg2); \
register long _arg3 __asm__ ("x2") = (long)(arg3); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r"(_arg1) \
@@ -121,7 +121,7 @@ struct sys_stat_struct {
register long _arg2 __asm__ ("x1") = (long)(arg2); \
register long _arg3 __asm__ ("x2") = (long)(arg3); \
register long _arg4 __asm__ ("x3") = (long)(arg4); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r"(_arg1) \
@@ -140,7 +140,7 @@ struct sys_stat_struct {
register long _arg3 __asm__ ("x2") = (long)(arg3); \
register long _arg4 __asm__ ("x3") = (long)(arg4); \
register long _arg5 __asm__ ("x4") = (long)(arg5); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r" (_arg1) \
@@ -160,7 +160,7 @@ struct sys_stat_struct {
register long _arg4 __asm__ ("x3") = (long)(arg4); \
register long _arg5 __asm__ ("x4") = (long)(arg5); \
register long _arg6 __asm__ ("x5") = (long)(arg6); \
- \
+ \
__asm__ volatile ( \
"svc #0\n" \
: "=r" (_arg1) \
diff --git a/tools/include/nolibc/arch-arm.h b/tools/include/nolibc/arch-arm.h
index ca4c66987497..d5887fd9bc5f 100644
--- a/tools/include/nolibc/arch-arm.h
+++ b/tools/include/nolibc/arch-arm.h
@@ -90,7 +90,7 @@ struct sys_stat_struct {
({ \
register long _num __asm__(_NOLIBC_SYSCALL_REG) = (num); \
register long _arg1 __asm__ ("r0"); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
@@ -107,7 +107,7 @@ struct sys_stat_struct {
({ \
register long _num __asm__(_NOLIBC_SYSCALL_REG) = (num); \
register long _arg1 __asm__ ("r0") = (long)(arg1); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
@@ -125,7 +125,7 @@ struct sys_stat_struct {
register long _num __asm__(_NOLIBC_SYSCALL_REG) = (num); \
register long _arg1 __asm__ ("r0") = (long)(arg1); \
register long _arg2 __asm__ ("r1") = (long)(arg2); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
@@ -144,7 +144,7 @@ struct sys_stat_struct {
register long _arg1 __asm__ ("r0") = (long)(arg1); \
register long _arg2 __asm__ ("r1") = (long)(arg2); \
register long _arg3 __asm__ ("r2") = (long)(arg3); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
@@ -164,7 +164,7 @@ struct sys_stat_struct {
register long _arg2 __asm__ ("r1") = (long)(arg2); \
register long _arg3 __asm__ ("r2") = (long)(arg3); \
register long _arg4 __asm__ ("r3") = (long)(arg4); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
@@ -185,7 +185,7 @@ struct sys_stat_struct {
register long _arg3 __asm__ ("r2") = (long)(arg3); \
register long _arg4 __asm__ ("r3") = (long)(arg4); \
register long _arg5 __asm__ ("r4") = (long)(arg5); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
@@ -207,7 +207,7 @@ struct sys_stat_struct {
register long _arg4 __asm__ ("r3") = (long)(arg4); \
register long _arg5 __asm__ ("r4") = (long)(arg5); \
register long _arg6 __asm__ ("r5") = (long)(arg6); \
- \
+ \
__asm__ volatile ( \
_NOLIBC_THUMB_SET_R7 \
"svc #0\n" \
diff --git a/tools/include/nolibc/arch-i386.h b/tools/include/nolibc/arch-i386.h
index 3d672d925e9e..c11a53acf159 100644
--- a/tools/include/nolibc/arch-i386.h
+++ b/tools/include/nolibc/arch-i386.h
@@ -57,7 +57,7 @@ struct sys_stat_struct {
({ \
long _ret; \
register long _num __asm__ ("eax") = (num); \
- \
+ \
__asm__ volatile ( \
"int $0x80\n" \
: "=a" (_ret) \
@@ -72,7 +72,7 @@ struct sys_stat_struct {
long _ret; \
register long _num __asm__ ("eax") = (num); \
register long _arg1 __asm__ ("ebx") = (long)(arg1); \
- \
+ \
__asm__ volatile ( \
"int $0x80\n" \
: "=a" (_ret) \
@@ -89,7 +89,7 @@ struct sys_stat_struct {
register long _num __asm__ ("eax") = (num); \
register long _arg1 __asm__ ("ebx") = (long)(arg1); \
register long _arg2 __asm__ ("ecx") = (long)(arg2); \
- \
+ \
__asm__ volatile ( \
"int $0x80\n" \
: "=a" (_ret) \
@@ -107,7 +107,7 @@ struct sys_stat_struct {
register long _arg1 __asm__ ("ebx") = (long)(arg1); \
register long _arg2 __asm__ ("ecx") = (long)(arg2); \
register long _arg3 __asm__ ("edx") = (long)(arg3); \
- \
+ \
__asm__ volatile ( \
"int $0x80\n" \
: "=a" (_ret) \
@@ -126,7 +126,7 @@ struct sys_stat_struct {
register long _arg2 __asm__ ("ecx") = (long)(arg2); \
register long _arg3 __asm__ ("edx") = (long)(arg3); \
register long _arg4 __asm__ ("esi") = (long)(arg4); \
- \
+ \
__asm__ volatile ( \
"int $0x80\n" \
: "=a" (_ret) \
@@ -146,7 +146,7 @@ struct sys_stat_struct {
register long _arg3 __asm__ ("edx") = (long)(arg3); \
register long _arg4 __asm__ ("esi") = (long)(arg4); \
register long _arg5 __asm__ ("edi") = (long)(arg5); \
- \
+ \
__asm__ volatile ( \
"int $0x80\n" \
: "=a" (_ret) \
diff --git a/tools/include/nolibc/arch-mips.h b/tools/include/nolibc/arch-mips.h
index db24e0837a39..55cd376a98e2 100644
--- a/tools/include/nolibc/arch-mips.h
+++ b/tools/include/nolibc/arch-mips.h
@@ -61,7 +61,7 @@ struct sys_stat_struct {
({ \
register long _num __asm__ ("v0") = (num); \
register long _arg4 __asm__ ("a3"); \
- \
+ \
__asm__ volatile ( \
"addiu $sp, $sp, -32\n" \
"syscall\n" \
@@ -69,7 +69,7 @@ struct sys_stat_struct {
: "=r"(_num), "=r"(_arg4) \
: "r"(_num) \
: "memory", "cc", "at", "v1", "hi", "lo", \
- "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
); \
_arg4 ? -_num : _num; \
})
@@ -79,7 +79,7 @@ struct sys_stat_struct {
register long _num __asm__ ("v0") = (num); \
register long _arg1 __asm__ ("a0") = (long)(arg1); \
register long _arg4 __asm__ ("a3"); \
- \
+ \
__asm__ volatile ( \
"addiu $sp, $sp, -32\n" \
"syscall\n" \
@@ -88,7 +88,7 @@ struct sys_stat_struct {
: "0"(_num), \
"r"(_arg1) \
: "memory", "cc", "at", "v1", "hi", "lo", \
- "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
); \
_arg4 ? -_num : _num; \
})
@@ -99,7 +99,7 @@ struct sys_stat_struct {
register long _arg1 __asm__ ("a0") = (long)(arg1); \
register long _arg2 __asm__ ("a1") = (long)(arg2); \
register long _arg4 __asm__ ("a3"); \
- \
+ \
__asm__ volatile ( \
"addiu $sp, $sp, -32\n" \
"syscall\n" \
@@ -108,7 +108,7 @@ struct sys_stat_struct {
: "0"(_num), \
"r"(_arg1), "r"(_arg2) \
: "memory", "cc", "at", "v1", "hi", "lo", \
- "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
); \
_arg4 ? -_num : _num; \
})
@@ -120,7 +120,7 @@ struct sys_stat_struct {
register long _arg2 __asm__ ("a1") = (long)(arg2); \
register long _arg3 __asm__ ("a2") = (long)(arg3); \
register long _arg4 __asm__ ("a3"); \
- \
+ \
__asm__ volatile ( \
"addiu $sp, $sp, -32\n" \
"syscall\n" \
@@ -129,7 +129,7 @@ struct sys_stat_struct {
: "0"(_num), \
"r"(_arg1), "r"(_arg2), "r"(_arg3) \
: "memory", "cc", "at", "v1", "hi", "lo", \
- "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
); \
_arg4 ? -_num : _num; \
})
@@ -141,7 +141,7 @@ struct sys_stat_struct {
register long _arg2 __asm__ ("a1") = (long)(arg2); \
register long _arg3 __asm__ ("a2") = (long)(arg3); \
register long _arg4 __asm__ ("a3") = (long)(arg4); \
- \
+ \
__asm__ volatile ( \
"addiu $sp, $sp, -32\n" \
"syscall\n" \
@@ -150,7 +150,7 @@ struct sys_stat_struct {
: "0"(_num), \
"r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4) \
: "memory", "cc", "at", "v1", "hi", "lo", \
- "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
); \
_arg4 ? -_num : _num; \
})
@@ -163,7 +163,7 @@ struct sys_stat_struct {
register long _arg3 __asm__ ("a2") = (long)(arg3); \
register long _arg4 __asm__ ("a3") = (long)(arg4); \
register long _arg5 = (long)(arg5); \
- \
+ \
__asm__ volatile ( \
"addiu $sp, $sp, -32\n" \
"sw %7, 16($sp)\n" \
@@ -173,7 +173,7 @@ struct sys_stat_struct {
: "0"(_num), \
"r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5) \
: "memory", "cc", "at", "v1", "hi", "lo", \
- "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \
); \
_arg4 ? -_num : _num; \
})
diff --git a/tools/include/nolibc/arch-x86_64.h b/tools/include/nolibc/arch-x86_64.h
index 6fc4d8392742..1ae73d83aad1 100644
--- a/tools/include/nolibc/arch-x86_64.h
+++ b/tools/include/nolibc/arch-x86_64.h
@@ -59,7 +59,7 @@ struct sys_stat_struct {
({ \
long _ret; \
register long _num __asm__ ("rax") = (num); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
@@ -74,7 +74,7 @@ struct sys_stat_struct {
long _ret; \
register long _num __asm__ ("rax") = (num); \
register long _arg1 __asm__ ("rdi") = (long)(arg1); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
@@ -91,7 +91,7 @@ struct sys_stat_struct {
register long _num __asm__ ("rax") = (num); \
register long _arg1 __asm__ ("rdi") = (long)(arg1); \
register long _arg2 __asm__ ("rsi") = (long)(arg2); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
@@ -109,7 +109,7 @@ struct sys_stat_struct {
register long _arg1 __asm__ ("rdi") = (long)(arg1); \
register long _arg2 __asm__ ("rsi") = (long)(arg2); \
register long _arg3 __asm__ ("rdx") = (long)(arg3); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
@@ -128,7 +128,7 @@ struct sys_stat_struct {
register long _arg2 __asm__ ("rsi") = (long)(arg2); \
register long _arg3 __asm__ ("rdx") = (long)(arg3); \
register long _arg4 __asm__ ("r10") = (long)(arg4); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
@@ -148,7 +148,7 @@ struct sys_stat_struct {
register long _arg3 __asm__ ("rdx") = (long)(arg3); \
register long _arg4 __asm__ ("r10") = (long)(arg4); \
register long _arg5 __asm__ ("r8") = (long)(arg5); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
@@ -169,7 +169,7 @@ struct sys_stat_struct {
register long _arg4 __asm__ ("r10") = (long)(arg4); \
register long _arg5 __asm__ ("r8") = (long)(arg5); \
register long _arg6 __asm__ ("r9") = (long)(arg6); \
- \
+ \
__asm__ volatile ( \
"syscall\n" \
: "=a"(_ret) \
--
2.25.1



2023-07-09 09:45:51

by Willy Tarreau

[permalink] [raw]
Subject: Re: [PATCH v6 01/15] tools/nolibc: arch-*.h: fix up code indent errors

On Fri, Jul 07, 2023 at 10:50:34PM +0800, Zhangjin Wu wrote:
> More than 8 whitespaces of the code indent are replaced with "tab +
> whitespaces" to fix up such errors reported by scripts/checkpatch.pl:
>
> ERROR: code indent should use tabs where possible
> #64: FILE: tools/include/nolibc/arch-mips.h:64:
> +^I \$
>
> ERROR: code indent should use tabs where possible
> #72: FILE: tools/include/nolibc/arch-mips.h:72:
> +^I "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9" \$

Another option we could have had would have been to just delete these
lines since there were in fact empty lines containing only an aligned
backslash. But that's fine, I've queued it as-is, thanks!

Willy