Module Name: src
Committed By: matt
Date: Fri Dec 23 18:52:33 UTC 2011
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h
Log Message:
Make CPUISMIPS3 deal with MIPS32R2 and MIPS64R2
Add mips_num_tlb_asids.
Allow a caller to cpu_identify to supply a cpuname (or NULL).
To generate a diff of this commit:
cvs rdiff -u -r1.90.16.38 -r1.90.16.39 src/sys/arch/mips/include/cpu.h
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/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.90.16.38 src/sys/arch/mips/include/cpu.h:1.90.16.39
--- src/sys/arch/mips/include/cpu.h:1.90.16.38 Sat Dec 3 01:56:55 2011
+++ src/sys/arch/mips/include/cpu.h Fri Dec 23 18:52:32 2011
@@ -260,6 +260,7 @@ struct mips_options {
u_int mips_cpu_mhz; /* CPU speed in MHz, estimated by mc_cpuspeed(). */
u_int mips_cpu_flags;
u_int mips_num_tlb_entries;
+ u_int mips_num_tlb_asids;
mips_prid_t mips_cpu_id;
mips_prid_t mips_fpu_id;
bool mips_has_r4k_mmu;
@@ -399,8 +400,7 @@ extern struct mips_options mips_options;
#define MIPS_HAS_LLADDR ((mips_options.mips_cpu_flags & CPU_MIPS_NO_LLADDR) == 0)
/* This test is ... rather bogus */
-#define CPUISMIPS3 ((mips_options.mips_cpu_arch & \
- (CPU_ARCH_MIPS3 | CPU_ARCH_MIPS4 | CPU_ARCH_MIPS32 | CPU_ARCH_MIPS64)) != 0)
+#define CPUISMIPS3 ((mips_options.mips_cpu_arch & (CPU_ARCH_MIPS3 | CPU_ARCH_MIPS4 | CPU_ARCH_MIPS32 | CPU_ARCH_MIPS64 | CPU_ARCH_MIPS32R2 | CPU_ARCH_MIPS64R2 )) != 0)
/* And these aren't much better while the previous test exists as is... */
#define CPUISMIPS4 ((mips_options.mips_cpu_arch & CPU_ARCH_MIPS4) != 0)
@@ -641,7 +641,7 @@ void fpusave_cpu(struct cpu_info *);
/* mips_machdep.c */
void dumpsys(void);
int savectx(struct pcb *);
-void cpu_identify(device_t);
+void cpu_identify(device_t, const char *);
/* locore*.S */
int badaddr(void *, size_t);
