Module Name: src
Committed By: skrll
Date: Sat Dec 5 11:18:21 UTC 2020
Modified Files:
src/lib/libc/arch/arm/gen: _setjmp.S
src/lib/libc/compat/arch/arm/gen: compat_setjmp.S
Log Message:
spaces to tab
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/arm/gen/_setjmp.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/arm/gen/_setjmp.S
diff -u src/lib/libc/arch/arm/gen/_setjmp.S:1.16 src/lib/libc/arch/arm/gen/_setjmp.S:1.17
--- src/lib/libc/arch/arm/gen/_setjmp.S:1.16 Sat Nov 30 20:20:42 2013
+++ src/lib/libc/arch/arm/gen/_setjmp.S Sat Dec 5 11:18:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.16 2013/11/30 20:20:42 joerg Exp $ */
+/* $NetBSD: _setjmp.S,v 1.17 2020/12/05 11:18:21 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -87,9 +87,9 @@ ENTRY(_setjmp)
adds r0, r0, #(_JB_REG_R4 * 4)
/* Store integer registers */
#if !defined(__thumb__) || defined(_ARCH_ARCH_T2)
- stmia r0, {r4-r14}
+ stmia r0, {r4-r14}
#else
- stmia r0!, {r4-r7}
+ stmia r0!, {r4-r7}
mov r1, r8
mov r2, r9
mov r3, r10
@@ -102,8 +102,8 @@ ENTRY(_setjmp)
stmia r0!, {r2-r3}
#endif
- movs r0, #0
- RET
+ movs r0, #0
+ RET
#if defined(__ARM_EABI__) && (!defined(__thumb__) || defined(_ARM_ARCH_T2))
.align 0
@@ -139,9 +139,9 @@ ENTRY(_longjmp)
#endif /* __ARM_EABI__ && (_ARM_ARCH_T2 || !__thumb__) */
adds r0, r0, #(_JB_REG_R4 * 4)
- /* Restore integer registers */
+ /* Restore integer registers */
#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
- ldmia r0!, {r4-r12}
+ ldmia r0!, {r4-r12}
#else
ldmia r0!, {r4-r7}
ldmia r0!, {r2-r3}
Index: src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.4 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.5
--- src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.4 Sat Nov 30 20:54:14 2013
+++ src/lib/libc/compat/arch/arm/gen/compat_setjmp.S Sat Dec 5 11:18:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.4 2013/11/30 20:54:14 joerg Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.5 2020/12/05 11:18:21 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -63,11 +63,11 @@ ENTRY(setjmp)
adds r0, r0, #(_JB_REG_R4 * 4)
#ifdef __thumb__
#ifdef _ARM_ARCH_7
- stmia r0!, {r4-r12}
+ stmia r0!, {r4-r12}
str sp, [r0, #0]
str lr, [r0, #4]
#else
- stmia r0!, {r4-r7}
+ stmia r0!, {r4-r7}
mov r2, r8
mov r3, r9
stmia r0!, {r2-r3}
@@ -80,9 +80,9 @@ ENTRY(setjmp)
stmia r0!, {r2-r3}
#endif
#else
- stmia r0, {r4-lr}
+ stmia r0, {r4-lr}
#endif
- movs r0, #0
+ movs r0, #0
pop {r3, pc}
END(setjmp)
@@ -101,21 +101,21 @@ ENTRY(longjmp)
mov r0, r2
bl PLT_SYM(_C_LABEL(sigsetmask))
- pop {r0, r1}
+ pop {r0, r1}
/* Restore integer registers */
adds r0, r0, #(_JB_REG_R4 * 4)
#if !defined(__thumb__) || defined(_ARM_ARCH_7)
- ldmia r0!, {r4-r12}
+ ldmia r0!, {r4-r12}
#else
- ldmia r0!, {r4-r7}
- ldmia r0!, {r2-r3}
+ ldmia r0!, {r4-r7}
+ ldmia r0!, {r2-r3}
mov r8, r2
mov r9, r3
- ldmia r0!, {r1-r3}
+ ldmia r0!, {r1-r3}
mov r10, r2
mov r11, r3
- ldmia r0!, {r2}
+ ldmia r0!, {r2}
mov r12, r2
#endif
