Module Name: src
Committed By: nakayama
Date: Sat Dec 22 20:08:08 UTC 2012
Modified Files:
src/sys/arch/sparc64/sparc64: cpu_in_cksum.S
Log Message:
Use LDPTR macro.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/cpu_in_cksum.S
diff -u src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.2 src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.3
--- src/sys/arch/sparc64/sparc64/cpu_in_cksum.S:1.2 Mon Oct 19 18:12:37 2009
+++ src/sys/arch/sparc64/sparc64/cpu_in_cksum.S Sat Dec 22 20:08:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_in_cksum.S,v 1.2 2009/10/19 18:12:37 snj Exp $ */
+/* $NetBSD: cpu_in_cksum.S,v 1.3 2012/12/22 20:08:08 nakayama Exp $ */
/*
* Copyright (c) 2001 Eduardo Horvath
@@ -95,11 +95,7 @@ ENTRY(cpu_in_cksum)
lduw [%o0 + M_LEN], %o2 ! Code duplicated at Lloop
srlx %o3, 32, %g4 ! REDUCE bigtime
sethi %hi(0xffff), %g5
-#ifdef __arch64__
- ldx [%o0 + M_DATA], %o5
-#else
- lduw [%o0 + M_DATA], %o5
-#endif
+ LDPTR [%o0 + M_DATA], %o5
srl %o3, 0, %o3
or %g5, %lo(0xffff), %g5
@@ -112,11 +108,7 @@ Lloop:
lduw [%o0 + M_LEN], %o2
srlx %o3, 32, %g4 ! REDUCE bigtime
sethi %hi(0xffff), %g5
-#ifdef __arch64__
- ldx [%o0 + M_DATA], %o5
-#else
- lduw [%o0 + M_DATA], %o5
-#endif
+ LDPTR [%o0 + M_DATA], %o5
srl %o3, 0, %o3
or %g5, %lo(0xffff), %g5
0:
@@ -210,11 +202,7 @@ Lfinish_byte:
add %o3, %o4, %o3
Lnext:
-#ifdef __arch64__
- ldx [%o0 + M_NEXT], %o0
-#else
- lduw [%o0 + M_NEXT], %o0
-#endif
+ LDPTR [%o0 + M_NEXT], %o0
Lfinish:
srlx %o3, 32, %o4 ! Reduce to 32-bits
srl %o3, 0, %o3
