Basic disk test code.

[pintos-anon] / src / threads / init.c

diff --git a/src/threads/init.c b/src/threads/init.c
index 234c41eb249c64def96f49d22d6775c3d3ee52ba..8702da418738fe8df411906289bd0a6e9ca45b12 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -18,6 +18,7 @@
 #include "vga.h"
 #ifdef FILESYS
 #include "filesys.h"
+#include "disk.h"
 #endif
 
 /* Size of kernel static code and data, in 4 kB pages. */
@@ -32,7 +33,18 @@ void power_off (void);
 static void
 main_thread (void *aux UNUSED) 
 {
-  printk ("execute=%d\n", (int) thread_execute ("a.out"));
+  struct disk *hda;
+  disk_init ();
+  hda = disk_get (0);
+  if (hda != NULL) 
+    {
+      char buf[DISK_SECTOR_SIZE];
+      disk_read (hda, 0, buf);
+      hex_dump (buf, sizeof buf);
+    }
+  else
+    printk ("no hda\n");
+  thread_execute ("a.out");
 }
 
 int
@@ -44,16 +56,16 @@ main (void)
   /* Clear out the BSS segment. */
   memset (&__bss_start, 0, &_end - &__bss_start);
 
+  /* Initialize components needed by printk() very early. */
   vga_init ();
   serial_init ();
+  printk ("Booting cnachos86...\n");
 
   /* Calculate how much RAM the kernel uses, and find out from
      the bootloader how much RAM this machine has. */
   kernel_pages = (&_end - &_text + 4095) / 4096;
-  ram_pages = *(uint32_t *) (0x7e00 - 8);
-
-  printk ("Initializing nachos-x86, %d kB RAM detected.\n",
-          ram_pages * 4);
+  ram_pages = *(uint32_t *) (0x7e00 - 6);
+  printk ("ram: detected %'d kB.\n", ram_pages * 4);
 
   /* Memory from the end of the kernel through the end of memory
      is free.  Give it to the page allocator. */
@@ -71,7 +83,6 @@ main (void)
 
 #ifdef FILESYS
   filesys_init (false);
-  filesys_self_test ();
 #endif
 
   thread_init ();