--- xinu/sys/mdump.c	2018/04/24 17:39:03	1.1.1.1
+++ xinu/sys/mdump.c	2018/04/24 17:39:32	1.1.1.2
@@ -1,8 +1,6 @@
-/* mdump.c - mdump */
+/* mdump.c - mdump, mdumph */
 
-#include <conf.h>
 #include <kernel.h>
-#include <proc.h>
 #include <mem.h>
 
 /*------------------------------------------------------------------------
@@ -11,36 +9,29 @@
  */
 mdump()
 {
-	PStype	ps;
-	int	i;
 	struct	mblock	*mptr;
-	unsigned free;
-	unsigned avail;
-	unsigned stkmem;
 
-	disable(ps);
+	disable();
+	kprintf("Dump of free memory block list:\n");
+	for( mptr=memlist.mnext ; mptr!=NULL ; mptr=mptr->mnext)
+		kprintf("  block at %x, length %u (0x%x)\n",
+			mptr,mptr->mlen, mptr->mlen);
+	restore();
+}
 
-	/* calculate current size of free memory and stack memory */
+/*------------------------------------------------------------------------
+ *  mdumph  --  dump free memory list and halt
+ *------------------------------------------------------------------------
+ */
+mdumph()
+{
+	struct	mblock	*mptr;
 
-	for( free=0,mptr=memlist.mnext ; mptr!=(struct mblock*)NULL ;
-	    mptr=mptr->mnext)
-		free += mptr->mlen;
-	for (stkmem=0,i=0 ; i<NPROC ; i++) {
-		if (proctab[i].pstate != PRFREE)
-			stkmem += (unsigned)proctab[i].pstklen;
-	}
-	kprintf("Memory: %u bytes real memory, %u text, %u data, %u bss\n",
-		(unsigned)(sizeof(int)) + (unsigned)maxaddr, (unsigned) &etext,
-		(unsigned) &edata - (unsigned) &etext,
-		(unsigned) &end - (unsigned) &edata);
-	avail = (unsigned)maxaddr - (unsigned) &end + (unsigned)(sizeof(int));
-	kprintf(" initially: %5u avail\n", avail);
-	kprintf(" presently: %5u avail, %5u stack, %5u heap\n",
-		free, stkmem, avail - stkmem - free);
-	kprintf(" free list:\n");
-	for( mptr=memlist.mnext ; mptr!=(struct mblock *)NULL ;
-	     mptr=mptr->mnext)
-		kprintf("   block at %6o, length %5u (0%o)\n",
-			mptr, mptr->mlen, mptr->mlen);
-	restore(ps);
+	disable();
+	kprintf("Dump of free memory block list:\n");
+	for( mptr=memlist.mnext ; mptr!=NULL ; mptr=mptr->mnext)
+		kprintf("  block at %o, length %u (0%o)\n",
+			mptr,mptr->mlen, mptr->mlen);
+	halt();
+	restore();
 }