Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm Use arm_cksumdata instead of .L_cksumdata



details:   https://anonhg.NetBSD.org/src/rev/0f0dcab9f52c
branches:  trunk
changeset: 325393:0f0dcab9f52c
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Dec 22 16:29:42 2013 +0000

description:
Use arm_cksumdata instead of .L_cksumdata
pop {..., pc} instead of pop {..., lr}; RET

diffstat:

 sys/arch/arm/arm/cpu_in_cksum.S |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r a54646f7b5ac -r 0f0dcab9f52c sys/arch/arm/arm/cpu_in_cksum.S
--- a/sys/arch/arm/arm/cpu_in_cksum.S   Sun Dec 22 14:31:51 2013 +0000
+++ b/sys/arch/arm/arm/cpu_in_cksum.S   Sun Dec 22 16:29:42 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_in_cksum.S,v 1.7 2013/12/19 23:48:44 joerg Exp $   */
+/*     $NetBSD: cpu_in_cksum.S,v 1.8 2013/12/22 16:29:42 matt Exp $    */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum.S,v 1.7 2013/12/19 23:48:44 joerg Exp $")
+RCSID("$NetBSD: cpu_in_cksum.S,v 1.8 2013/12/22 16:29:42 matt Exp $")
        
 #include "assym.h"
 
@@ -104,7 +104,7 @@
 #ifdef __thumb__
        it      ne
 #endif
-       blne    _ASM_LABEL(.L_cksumdata)
+       blne    _ASM_LABEL(arm_cksumdata)
        tst     r11, #0x01
 #ifdef __thumb__
        it      ne
@@ -129,15 +129,14 @@
        mvn     r0, r8
        lsr     r0, r0, #16
 #endif
-       pop     {r4-r11, lr}
-       RET
+       pop     {r4-r11, pc}
 
 .Lin_cksum_whoops:
        adr     r0, .Lin_cksum_whoops_str
        bl      _C_LABEL(panic)
 .Lin_cksum_whoops_str:
        .asciz  "in_cksum: out of mbufs\n"
-       .align  5
+       .p2align        5
 END(cpu_in_cksum)
 
 
@@ -156,7 +155,7 @@
  *     r0-r7
  */
 /* LINTSTUB: Ignore */
-ASENTRY_NP(.L_cksumdata)
+ASENTRY_NP(arm_cksumdata)
 #ifdef __PROG26
        str     lr, [sp, #-4]!          /* for SVC26 mode */
 #endif
@@ -410,4 +409,4 @@
 #else
        RET
 #endif
-ASEND(.L_cksumdata)
+ASEND(arm_cksumdata)



Home | Main Index | Thread Index | Old Index