From owner-svn-src-projects@FreeBSD.ORG Tue May 26 22:40:12 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC980106564A; Tue, 26 May 2009 22:40:12 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CA50F8FC1E; Tue, 26 May 2009 22:40:12 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QMeCPZ076144; Tue, 26 May 2009 22:40:12 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QMeC47076137; Tue, 26 May 2009 22:40:12 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200905262240.n4QMeC47076137@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 26 May 2009 22:40:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192864 - in projects/mips/sys: conf mips/conf mips/include mips/malta mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 22:40:13 -0000 Author: gonzo Date: Tue May 26 22:40:12 2009 New Revision: 192864 URL: http://svn.freebsd.org/changeset/base/192864 Log: - Replace CPU_NOFPU and SOFTFLOAT options with CPU_FPU. By default we assume that there is no FPU, because majority of SoC does not have it. Modified: projects/mips/sys/conf/options.mips projects/mips/sys/mips/conf/AR71XX projects/mips/sys/mips/conf/SENTRY5 projects/mips/sys/mips/include/float.h projects/mips/sys/mips/malta/std.malta projects/mips/sys/mips/mips/locore.S projects/mips/sys/mips/mips/trap.c Modified: projects/mips/sys/conf/options.mips ============================================================================== --- projects/mips/sys/conf/options.mips Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/conf/options.mips Tue May 26 22:40:12 2009 (r192864) @@ -31,8 +31,8 @@ CPU_MIPS4KC opt_global.h CPU_MIPS32 opt_global.h CPU_MIPS64 opt_global.h -CPU_NOFPU opt_global.h CPU_SENTRY5 opt_global.h +CPU_HAVEFPU opt_global.h ISA_MIPS1 opt_cputype.h ISA_MIPS3 opt_cputype.h @@ -48,7 +48,6 @@ CFE_CONSOLE opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h PHYSADDR opt_global.h -SOFTFLOAT opt_global.h TARGET_OCTEON opt_global.h TARGET_EMULATOR opt_ddb.h Modified: projects/mips/sys/mips/conf/AR71XX ============================================================================== --- projects/mips/sys/mips/conf/AR71XX Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/mips/conf/AR71XX Tue May 26 22:40:12 2009 (r192864) @@ -4,7 +4,6 @@ ident AR71XX cpu CPU_MIPS4KC -options CPU_NOFPU options ISA_MIPS32 makeoptions TARGET_BIG_ENDIAN makeoptions KERNLOADADDR=0x80050000 Modified: projects/mips/sys/mips/conf/SENTRY5 ============================================================================== --- projects/mips/sys/mips/conf/SENTRY5 Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/mips/conf/SENTRY5 Tue May 26 22:40:12 2009 (r192864) @@ -26,7 +26,6 @@ ident SENTRY5 cpu CPU_MIPS4KC -options CPU_NOFPU options ISA_MIPS32 options CPU_SENTRY5 # XXX should this be a # sub-cpu option? Modified: projects/mips/sys/mips/include/float.h ============================================================================== --- projects/mips/sys/mips/include/float.h Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/mips/include/float.h Tue May 26 22:40:12 2009 (r192864) @@ -42,10 +42,10 @@ extern int __flt_rounds(void); __END_DECLS #define FLT_RADIX 2 /* b */ -#ifdef SOFTFLOAT -#define FLT_ROUNDS -1 -#else +#ifdef CPU_HAVEFPU #define FLT_ROUNDS __flt_rounds() /* FP addition rounds to nearest */ +#else +#define FLT_ROUNDS -1 #endif /* * XXXMIPS: MIPS32 has both float and double type, so set FLT_EVAL_METHOD Modified: projects/mips/sys/mips/malta/std.malta ============================================================================== --- projects/mips/sys/mips/malta/std.malta Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/mips/malta/std.malta Tue May 26 22:40:12 2009 (r192864) @@ -3,7 +3,6 @@ files "../malta/files.malta" cpu CPU_MIPS4KC options ISA_MIPS32 -options SOFTFLOAT device pci device ata device atadisk Modified: projects/mips/sys/mips/mips/locore.S ============================================================================== --- projects/mips/sys/mips/mips/locore.S Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/mips/mips/locore.S Tue May 26 22:40:12 2009 (r192864) @@ -145,7 +145,7 @@ VECTOR(_locore, unknown) /* Read and store the PrID FPU ID for CPU identification, if any. */ mfc0 t2, COP_0_STATUS_REG mfc0 t0, MIPS_COP_0_PRID -#ifndef CPU_NOFPU +#ifdef CPU_HAVEFPU and t2, MIPS_SR_COP_1_BIT beqz t2, 1f move t1, zero Modified: projects/mips/sys/mips/mips/trap.c ============================================================================== --- projects/mips/sys/mips/mips/trap.c Tue May 26 22:34:13 2009 (r192863) +++ projects/mips/sys/mips/mips/trap.c Tue May 26 22:40:12 2009 (r192864) @@ -928,7 +928,7 @@ dofault: goto err; break; case T_COP_UNUSABLE + T_USER: -#if defined(SOFTFLOAT) +#if !defined(CPU_HAVEFPU) /* FP (COP1) instruction */ if ((trapframe->cause & CR_COP_ERR) == 0x10000000) { i = SIGILL;