From owner-svn-src-user@FreeBSD.ORG Sat Feb 27 03:35:35 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28CFB106566C; Sat, 27 Feb 2010 03:35:35 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F25498FC0A; Sat, 27 Feb 2010 03:35:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1R3ZYLt040213; Sat, 27 Feb 2010 03:35:34 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1R3ZYFV040211; Sat, 27 Feb 2010 03:35:34 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201002270335.o1R3ZYFV040211@svn.freebsd.org> From: Juli Mallett Date: Sat, 27 Feb 2010 03:35:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204390 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Feb 2010 03:35:35 -0000 Author: jmallett Date: Sat Feb 27 03:35:34 2010 New Revision: 204390 URL: http://svn.freebsd.org/changeset/base/204390 Log: Fix casts for n32 and add a comment as to why this code can't really work as intended with a true o32 kernel. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Sat Feb 27 03:33:31 2010 (r204389) +++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Sat Feb 27 03:35:34 2010 (r204390) @@ -94,19 +94,19 @@ extern struct pcpu *cpuid_to_pcpu[]; static inline void oct_write64 (uint64_t csr_addr, uint64_t val64) { - uint64_t *ptr = (uint64_t *) csr_addr; + uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr; *ptr = val64; } static inline void oct_write64_int64 (uint64_t csr_addr, int64_t val64i) { - int64_t *ptr = (int64_t *) csr_addr; + int64_t *ptr = (int64_t *)(intptr_t)csr_addr; *ptr = val64i; } static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8) { - uint64_t *ptr = (uint64_t *) csr_addr; + uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr; *ptr = (uint64_t) val8; } @@ -127,32 +127,32 @@ static inline void oct_write32 (uint64_t static inline uint8_t oct_read8 (uint64_t csr_addr) { - uint8_t *ptr = (uint8_t *) csr_addr; + uint8_t *ptr = (uint8_t *)(intptr_t)csr_addr; return (*ptr); } static inline uint8_t oct_read16 (uint64_t csr_addr) { - uint16_t *ptr = (uint16_t *) csr_addr; + uint16_t *ptr = (uint16_t *)(intptr_t)csr_addr; return (*ptr); } static inline uint32_t oct_read32 (uint64_t csr_addr) { - uint32_t *ptr = (uint32_t *) csr_addr; + uint32_t *ptr = (uint32_t *)(intptr_t)csr_addr; return (*ptr); } static inline uint64_t oct_read64 (uint64_t csr_addr) { - uint64_t *ptr = (uint64_t *) csr_addr; + uint64_t *ptr = (uint64_t *)(intptr_t)csr_addr; return (*ptr); } static inline int32_t oct_readint32 (uint64_t csr_addr) { - int32_t *ptr = (int32_t *) csr_addr; + int32_t *ptr = (int32_t *)(intptr_t)csr_addr; return (*ptr); } @@ -161,6 +161,14 @@ static inline int32_t oct_readint32 (uin #else +/* + * XXX + * These cannot possibly work unless the exception handlers in an o32 kernel + * are careful to not trash the upper 32 bits of saved/restored registers, or + * actually save and restore them as 64-bit quantities, which seems possible + * but is quite ugly. + */ + /* ABI o32 */