changes to make libkvm.old build again on the pmax

diff --git a/sys/arch/pmax/include/cpuregs.h b/sys/arch/pmax/include/cpuregs.h
index 2ac0b98..f446b79 100644 (file)
--- a/sys/arch/pmax/include/cpuregs.h
+++ b/sys/arch/pmax/include/cpuregs.h
@@ -67,6 +67,12 @@
 #define MACH_MAX_MEM_ADDR              0xbe000000
 #define        MACH_RESERVED_ADDR              0xbfc80000
 
+/* XXX - this is just to make libkvm happy - all MACH_CAHED...
+         should be changed to CAHED etc. to be in sync with 
+         the arc
+*/
+#define        CACHED_TO_PHYS(x)       ((unsigned)(x) & 0x1fffffff)
+
 #define        MACH_CACHED_TO_PHYS(x)  ((unsigned)(x) & 0x1fffffff)
 #define        MACH_PHYS_TO_CACHED(x)  ((unsigned)(x) | MACH_CACHED_MEMORY_ADDR)
 #define        MACH_UNCACHED_TO_PHYS(x) ((unsigned)(x) & 0x1fffffff)

diff --git a/sys/arch/pmax/include/pte.h b/sys/arch/pmax/include/pte.h
index c5dbb36..7565622 100644 (file)
--- a/sys/arch/pmax/include/pte.h
+++ b/sys/arch/pmax/include/pte.h
@@ -16,6 +16,14 @@
 #ifndef  __MIPS_PTE_H__
 #define  __MIPS_PTE_H__
 
+/* XXX hack to make libkvm.old happy - MIPS1 is only defined if we are
+       building a kernel - but not for libkvm.old - so we define MIPS1
+       here - which is no problem at the moment - because the pmax port
+       at the moment only supports MIPS1 cpu based machines
+*/
+#if !defined(MIPS1) && !defined(MIPS3)
+#define MIPS1
+#endif
 
 #if defined(MIPS1) && defined(MIPS3)
 #error  Cannot yet support both  "MIPS1" (r2000 family) and "MIPS3" (r4000 family) in the same kernel.