Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke MIPS64; we'll use MIPS3 to indicate the presence of MIPS3 instructions

Browse Source 
and _LP64 to indicate that 64-bit is desired.

Pointed out by simonb@
This commit is contained in:
sekiya 2004-12-17 22:59:49 +00:00
parent 60fb5c0ece
commit 523a6664f4
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/sgimips/sgimips/bus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.c,v 1.36 2004/12/13 08:31:54 sekiya Exp $ */
/* $NetBSD: bus.c,v 1.37 2004/12/17 22:59:49 sekiya Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.36 2004/12/13 08:31:54 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.37 2004/12/17 22:59:49 sekiya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -232,7 +232,7 @@ bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t o, u_i
}
}
#if defined(MIPS3) || defined(MIPS64)
#if defined(MIPS3)
u_int64_t
bus_space_read_8(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t o)
{
@ -272,7 +272,7 @@ bus_space_write_8(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t o, u_i
break;
}
}
#endif /* MIPS3 || MIPS64 */
#endif /* MIPS3 */
int
bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,

12
sys/arch/sgimips/sgimips/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.14 2004/10/01 07:16:57 sekiya Exp $ */
/* $NetBSD: clock.c,v 1.15 2004/12/17 22:59:49 sekiya Exp $ */
/*
* Copyright (c) 1992, 1993
@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.14 2004/10/01 07:16:57 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.15 2004/12/17 22:59:49 sekiya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -155,7 +155,7 @@ cpu_initclocks()
if (clockfns == NULL)
panic("cpu_initclocks: clock device not attached");
#if defined(MIPS3) || defined(MIPS64)
#if defined(MIPS3)
if (mach_type != MACH_SGI_IP12) {
next_clk_intr = mips3_cp0_count_read()
+ curcpu()->ci_cycles_per_hz;
@ -172,7 +172,7 @@ cpu_initclocks()
tickfixinterval = hz >> (ftp - 1);
}
}
#endif /* MIPS3 || MIPS64 */
#endif /* MIPS3 */
(*clockfns->cf_init)(clockdev);
}
@ -285,7 +285,7 @@ mips1_clkread()
return 0;
}
#if defined(MIPS3) || defined(MIPS64)
#if defined(MIPS3)
void
mips3_clock_intr(u_int32_t status, u_int32_t cause, u_int32_t pc,
u_int32_t ipending)
@ -325,4 +325,4 @@ mips3_clkread()
MIPS_COUNT_TO_MHZ(curcpu(), count, res);
return (res);
}
#endif /* MIPS3 || MIPS64 */
#endif /* MIPS3 */

8
sys/arch/sgimips/sgimips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.88 2004/12/13 08:30:58 sekiya Exp $ */
/* $NetBSD: machdep.c,v 1.89 2004/12/17 22:59:49 sekiya Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.88 2004/12/13 08:30:58 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.89 2004/12/17 22:59:49 sekiya Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -425,7 +425,7 @@ mach_init(int argc, char **argv, int magic, struct btinfo_common *btinfo)
break;
#endif /* MIPS1 */
#if defined(MIPS3) || defined(MIPS64)
#if defined(MIPS3)
case MACH_SGI_IP20:
i = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd0000);
mach_boardrev = (i & 0x7000) >> 12;
@ -461,7 +461,7 @@ mach_init(int argc, char **argv, int magic, struct btinfo_common *btinfo)
platform.intr5 = mips3_clock_intr;
platform.clkread = mips3_clkread;
break;
#endif /* MIPS3 || MIPS64 */
#endif /* MIPS3 */
default:
panic("IP%d architecture not supported", mach_type);
break;