pc, pc64: new memory map code

[plan9front.git] / sys / src / 9 / pc64 / fns.h

diff --git a/sys/src/9/pc64/fns.h b/sys/src/9/pc64/fns.h
index f4da48240b1cfeb2908b6109e21ae02d924d7d62..1fb982c6497057632d60c79b10d82aaa8b4a06eb 100644 (file)
--- a/sys/src/9/pc64/fns.h
+++ b/sys/src/9/pc64/fns.h
@@ -103,7 +103,8 @@ void        mathinit(void);
 void   mb386(void);
 void   mb586(void);
 void   meminit(void);
-void   memorysummary(void);
+void   meminit0(void);
+void   memreserve(uintptr, uintptr);
 void   mfence(void);
 #define mmuflushtlb() putcr3(getcr3())
 void   mmuinit(void);
@@ -157,7 +158,8 @@ int (*_pcmspecial)(char *, ISAConf *);
 void   pcmspecialclose(int);
 void   (*_pcmspecialclose)(int);
 void   pcmunmap(int, PCMmap*);
-void   pmap(uintptr *, uintptr, uintptr, vlong);
+void   pmap(uintptr, uintptr, vlong);
+void   punmap(uintptr, vlong);
 void   preallocpages(void);
 void   procrestore(Proc*);
 void   procsave(Proc*);
@@ -187,13 +189,10 @@ void      trapinit(void);
 void   trapinit0(void);
 int    tas(void*);
 uvlong tscticks(uvlong*);
-uintptr        umbmalloc(uintptr, int, int);
-void   umbfree(uintptr, int);
-uintptr        umbrwmalloc(uintptr, int, int);
-void   umbrwfree(uintptr, int);
-uintptr        upaalloc(int, int);
-void   upafree(uintptr, int);
-void   upareserve(uintptr, int);
+ulong  umballoc(ulong, ulong, ulong);
+void   umbfree(ulong, ulong);
+ulong  upaalloc(ulong, ulong, ulong);
+void   upafree(ulong, ulong);
 void   vectortable(void);
 void   vmxprocrestore(Proc *);
 void   vmxshutdown(void);