Module Name: src Committed By: nakayama Date: Sat Jul 10 10:12:07 UTC 2010
Modified Files: src/sys/arch/sparc64/sparc64: copy.S Log Message: ucas_64: reorder 64-bit args on 32-bit kernels. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/sparc64/copy.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/copy.S diff -u src/sys/arch/sparc64/sparc64/copy.S:1.3 src/sys/arch/sparc64/sparc64/copy.S:1.4 --- src/sys/arch/sparc64/sparc64/copy.S:1.3 Mon May 24 02:19:10 2010 +++ src/sys/arch/sparc64/sparc64/copy.S Sat Jul 10 10:12:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.3 2010/05/24 02:19:10 mrg Exp $ */ +/* $NetBSD: copy.S,v 1.4 2010/07/10 10:12:07 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -652,6 +652,11 @@ * int ucas_64(volatile int64_t *uptr, int64_t old, int64_t new, int64_t *ret); */ ENTRY(ucas_64) +#ifndef _LP64 + COMBINE(%o1, %o2, %o1) + COMBINE(%o3, %o4, %o2) + mov %o5, %o3 +#endif sethi %hi(CPCB), %o4 wr %g0, ASI_AIUS, %asi LDPTR [%o4 + %lo(CPCB)], %o4