From owner-p4-projects@FreeBSD.ORG Thu Jan 31 07:05:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F189C16A41A; Thu, 31 Jan 2008 07:05:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EE0F16A418 for ; Thu, 31 Jan 2008 07:05:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8769D13C465 for ; Thu, 31 Jan 2008 07:05:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0V75Pn5077528 for ; Thu, 31 Jan 2008 07:05:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0V75P3v077525 for perforce@freebsd.org; Thu, 31 Jan 2008 07:05:25 GMT (envelope-from imp@freebsd.org) Date: Thu, 31 Jan 2008 07:05:25 GMT Message-Id: <200801310705.m0V75P3v077525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 134532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2008 07:05:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=134532 Change 134532 by imp@imp_lighthouse on 2008/01/31 07:04:55 Save 32-bits only on ISA_MIPS32. Save 64 on MIPS64. Even if you are running a 32-bit kernel, you'll need to save 64-bits of registers because the kernel dereferences 64-bit addresses when it is writing to the octeon hardware. This is likely to be typical of all 64-bit machines, so base it off of ISA_MIPS64. There's a hack in types.h that uses ISA_MIPS64 to define a few things, but I'm not sure that's right since this file is exported to userland. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#9 (text+ko) ==== @@ -243,14 +243,16 @@ * *---------------------------------------------------------------------------- */ -#ifndef MIPS_ISAIII +#if defined(ISA_MIPS32) #define STORE sw /* 32 bit mode regsave instruction */ #define LOAD lw /* 32 bit mode regload instruction */ #define RSIZE 4 /* 32 bit mode register size */ -#else +#elif defined(ISA_MIPS64) #define STORE sd /* 64 bit mode regsave instruction */ #define LOAD ld /* 64 bit mode regload instruction */ #define RSIZE 8 /* 64 bit mode register size */ +#else +#error "Please write code for this isa." #endif #define SAVE_REG(reg, offs, base) \