Be explicit in order of evaluation in the reiserfs code

[yaboot.git] / second / yaboot.c

diff --git a/second/yaboot.c b/second/yaboot.c
index ec8a998ed7ee5a84677033d6b8479bb70eda10be..1f3f1518845aa67b0a81847f226a775a2ea9c34d 100644 (file)
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -58,6 +58,8 @@
 #define CONFIG_FILE_NAME       "yaboot.conf"
 #define CONFIG_FILE_MAX                0x8000          /* 32k */
 
 #define CONFIG_FILE_NAME       "yaboot.conf"
 #define CONFIG_FILE_MAX                0x8000          /* 32k */
 

+#define MESSAGE_FILE_MAX       2048
+

 #ifdef USE_MD5_PASSWORDS
 #include "md5.h"
 #endif /* USE_MD5_PASSWORDS */
 #ifdef USE_MD5_PASSWORDS
 #include "md5.h"
 #endif /* USE_MD5_PASSWORDS */


@@ -154,10 +156,6 @@ int fgcolor = 15;
 int bgcolor = 0;
 #endif /* CONFIG_COLOR_TEXT */
 
 int bgcolor = 0;
 #endif /* CONFIG_COLOR_TEXT */
 

-#if DEBUG
-static int test_bss;
-static int test_data = 0;
-#endif

 static int pause_after;
 static char *pause_message = "Type go<return> to continue.\n";
 static char given_bootargs[1024];
 static int pause_after;
 static char *pause_message = "Type go<return> to continue.\n";
 static char given_bootargs[1024];


@@ -169,33 +167,23 @@ extern unsigned char linux_logo_blue[];
 
 #define DEFAULT_TIMEOUT                -1
 
 
 #define DEFAULT_TIMEOUT                -1
 

-/* Entry, currently called directly by crt0 (bss not inited) */
-
-extern char* __bss_start;
-extern char* _end;
-

 int
 yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 {
      int result;
      void* malloc_base = NULL;
 int
 yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 {
      int result;
      void* malloc_base = NULL;

-     unsigned long addr;

      prom_handle root;
 
      prom_handle root;
 

-     /* OF seems to do it, but I'm not very confident */
-     memset(&__bss_start, 0, &_end - &__bss_start);
-

      /* Initialize OF interface */
      prom_init ((prom_entry) r5);
 
      /* Initialize OF interface */
      prom_init ((prom_entry) r5);
 

+     prom_print_available();
+

      /* Allocate some memory for malloc'ator */
      /* Allocate some memory for malloc'ator */

-     for (addr = MALLOCADDR; addr <= MALLOCADDR * 16 ;addr+=0x100000) {
-         malloc_base = prom_claim((void *)addr, MALLOCSIZE, 0);
-         if (malloc_base != (void *)-1) break;
-     }
+     malloc_base = prom_claim_chunk_top(MALLOCSIZE, 0);

      if (malloc_base == (void *)-1) {
      if (malloc_base == (void *)-1) {

-         prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n",
-                     MALLOCSIZE, MALLOCADDR);
+         prom_printf("Can't claim malloc buffer of %d bytes\n",
+                     MALLOCSIZE);

          return -1;
      }
      malloc_init(malloc_base, MALLOCSIZE);
          return -1;
      }
      malloc_init(malloc_base, MALLOCSIZE);


@@ -204,10 +192,6 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 
      /* A few useless DEBUG_F's */
      DEBUG_F("reloc_offset :  %ld         (should be 0)\n", reloc_offset());
 
      /* A few useless DEBUG_F's */
      DEBUG_F("reloc_offset :  %ld         (should be 0)\n", reloc_offset());

-     DEBUG_F("test_bss     :  %d         (should be 0)\n", test_bss);
-     DEBUG_F("test_data    :  %d         (should be 0)\n", test_data);
-     DEBUG_F("&test_data   :  %p\n", &test_data);
-     DEBUG_F("&test_bss    :  %p\n", &test_bss);

      DEBUG_F("linked at    :  0x%08x\n", TEXTADDR);
 
      /* ask the OF info if we're a chrp or pmac */
      DEBUG_F("linked at    :  0x%08x\n", TEXTADDR);
 
      /* ask the OF info if we're a chrp or pmac */


@@ -303,13 +287,13 @@ void print_message_file(char *filename)
      } else
          opened = 1;
 
      } else
          opened = 1;
 

-     msg = malloc(2001);
+     msg = malloc(MESSAGE_FILE_MAX + 1);

      if (!msg)
          goto done;
      else
      if (!msg)
          goto done;
      else

-         memset(msg, 0, 2001);
+         memset(msg, 0, MESSAGE_FILE_MAX + 1);

 
 

-     if (file.fs->read(&file, 2000, msg) <= 0)
+     if (file.fs->read(&file, MESSAGE_FILE_MAX, msg) <= 0)

          goto done;
      else
          prom_printf("%s", msg);
          goto done;
      else
          prom_printf("%s", msg);


@@ -725,9 +709,10 @@ int get_params(struct boot_param_t* params)
          if (!imagename) {
               if (bootoncelabel[0] != 0)
                    imagename = bootoncelabel;
          if (!imagename) {
               if (bootoncelabel[0] != 0)
                    imagename = bootoncelabel;

-              else if (bootlastlabel[0] != 0)
-                         imagename = bootlastlabel;
-               else
+              else if (bootlastlabel[0] != 0) {
+                   imagename = bootlastlabel;
+                   word_split(&imagename, &params->args);
+              } else

                    imagename = cfg_get_default();
          }
          if (imagename)
                    imagename = cfg_get_default();
          }
          if (imagename)


@@ -789,7 +774,13 @@ int get_params(struct boot_param_t* params)
          imagename = cfg_get_default();
 
      /* write the imagename out so it can be reused on reboot if necessary */
          imagename = cfg_get_default();
 
      /* write the imagename out so it can be reused on reboot if necessary */

-     prom_set_options("boot-last-label", imagename, strlen(imagename));
+     strcpy(bootlastlabel, imagename);
+     if (params->args && params->args[0]) {
+         strcat(bootlastlabel, " ");
+         strcat(bootlastlabel, params->args);
+     }
+     prom_set_options("boot-last-label", bootlastlabel,
+                     strlen(bootlastlabel) + 1);

 
      label = 0;
      defdevice = boot.dev;
 
      label = 0;
      defdevice = boot.dev;


@@ -991,7 +982,7 @@ int get_params(struct boot_param_t* params)
 
            /* check if user seted to use a initrd file from boot console */
            if (!definitrd && p != manualinitrd) {
 
            /* check if user seted to use a initrd file from boot console */
            if (!definitrd && p != manualinitrd) {

-               if (manualinitrd[0] != "/" && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) {
+               if (manualinitrd[0] != '/' && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) {

                    strcpy(initrdpath, "/");
                    strcat(initrdpath, manualinitrd);
                } else
                    strcpy(initrdpath, "/");
                    strcat(initrdpath, manualinitrd);
                } else


@@ -1019,8 +1010,6 @@ int get_params(struct boot_param_t* params)
 void
 yaboot_text_ui(void)
 {
 void
 yaboot_text_ui(void)
 {

-#define MAX_HEADERS    32
-

      struct boot_file_t        file;
      int                       result;
      static struct boot_param_t        params;
      struct boot_file_t        file;
      int                       result;
      static struct boot_param_t        params;


@@ -1126,25 +1115,33 @@ yaboot_text_ui(void)
               }
               else {
 #define INITRD_CHUNKSIZE 0x100000
               }
               else {
 #define INITRD_CHUNKSIZE 0x100000

-                   initrd_base = prom_claim(loadinfo.base+loadinfo.memsize, INITRD_CHUNKSIZE, 0);
+                   unsigned int len = INITRD_CHUNKSIZE;
+
+                   /* We add a bit to the actual size so the loop below doesn't think
+                    * there is more to load.
+                    */
+                   if (file.fs->ino_size && file.fs->ino_size(&file) > 0)
+                        len = file.fs->ino_size(&file) + 0x1000;
+
+                   initrd_base = prom_claim_chunk(loadinfo.base+loadinfo.memsize, len, 0);

                    if (initrd_base == (void *)-1) {
                         prom_printf("Claim failed for initrd memory\n");
                         initrd_base = 0;
                    } else {
                    if (initrd_base == (void *)-1) {
                         prom_printf("Claim failed for initrd memory\n");
                         initrd_base = 0;
                    } else {

-                        initrd_size = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_base);
+                        initrd_size = file.fs->read(&file, len, initrd_base);

                         if (initrd_size == 0)
                              initrd_base = 0;
                         initrd_read = initrd_size;
                         initrd_more = initrd_base;
                         if (initrd_size == 0)
                              initrd_base = 0;
                         initrd_read = initrd_size;
                         initrd_more = initrd_base;

-                        while (initrd_read == INITRD_CHUNKSIZE ) { /* need to read more? */
-                             initrd_want = (void *)((unsigned long)initrd_more+INITRD_CHUNKSIZE);
-                             initrd_more = prom_claim(initrd_want, INITRD_CHUNKSIZE, 0);
+                        while (initrd_read == len ) { /* need to read more? */
+                             initrd_want = (void *)((unsigned long)initrd_more+len);
+                             initrd_more = prom_claim(initrd_want, len, 0);

                              if (initrd_more != initrd_want) {
                                   prom_printf("Claim failed for initrd memory at %p rc=%p\n",initrd_want,initrd_more);
                                   prom_pause();
                                   break;
                              }
                              if (initrd_more != initrd_want) {
                                   prom_printf("Claim failed for initrd memory at %p rc=%p\n",initrd_want,initrd_more);
                                   prom_pause();
                                   break;
                              }

-                             initrd_read = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_more);
+                             initrd_read = file.fs->read(&file, len, initrd_more);

                              DEBUG_F("  block at %p rc=%lu\n",initrd_more,initrd_read);
                              initrd_size += initrd_read;
                         }
                              DEBUG_F("  block at %p rc=%lu\n",initrd_more,initrd_read);
                              initrd_size += initrd_read;
                         }


@@ -1180,6 +1177,8 @@ yaboot_text_ui(void)
 
          DEBUG_F("Entering kernel...\n");
 
 
          DEBUG_F("Entering kernel...\n");
 

+         prom_print_available();
+

           /* call the kernel with our stack. */
          kernel_entry(initrd_base + loadinfo.load_loc, initrd_size, prom, 0, 0);
          continue;
           /* call the kernel with our stack. */
          kernel_entry(initrd_base + loadinfo.load_loc, initrd_size, prom, 0, 0);
          continue;


@@ -1217,11 +1216,6 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo)
 
      loadinfo->entry = e->e_entry;
 
 
      loadinfo->entry = e->e_entry;
 

-     if (e->e_phnum > MAX_HEADERS) {
-         prom_printf ("Can only load kernels with one program header\n");
-         goto bail;
-     }
-

      ph = (Elf32_Phdr *)malloc(sizeof(Elf32_Phdr) * e->e_phnum);
      if (!ph) {
          prom_printf ("Malloc error\n");
      ph = (Elf32_Phdr *)malloc(sizeof(Elf32_Phdr) * e->e_phnum);
      if (!ph) {
          prom_printf ("Malloc error\n");


@@ -1355,11 +1349,6 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo)
 
      loadinfo->entry = e->e_entry;
 
 
      loadinfo->entry = e->e_entry;
 

-     if (e->e_phnum > MAX_HEADERS) {
-         prom_printf ("Can only load kernels with one program header\n");
-         goto bail;
-     }
-

      ph = (Elf64_Phdr *)malloc(sizeof(Elf64_Phdr) * e->e_phnum);
      if (!ph) {
          prom_printf ("Malloc error\n");
      ph = (Elf64_Phdr *)malloc(sizeof(Elf64_Phdr) * e->e_phnum);
      if (!ph) {
          prom_printf ("Malloc error\n");