Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2025-02-26 15:29:12 +00:00
Code Issues Projects Releases Wiki Activity

Return to menu if kernel or ramdisk fail to load

Browse Source
This commit is contained in:
Laurent Vivier 2007-09-17 22:23:06 +00:00
parent 04d9d79d74
commit 2526dd9419
2 changed files with 78 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
second/load.c
View File

@ -81,18 +81,26 @@ char* load_kernel(char* path, int bootstrap_size,
stream = stream_open(path);
if (stream == NULL)
{
printf("Cannot open kernel\n");
return NULL;
}
stream_uncompress(stream);
ret = stream_read(stream, &elf_header, sizeof(Elf32_Ehdr));
if (ret != sizeof(Elf32_Ehdr))
error("Cannot read\n");
{
printf("Cannot read kernel ELF header\n");
stream_close(stream);
return NULL;
}
#ifdef ARCH_M68K
if (elf_header.e_machine != EM_68K)
{
printf( "Not MC680x0 architecture\n");
stream_close(stream);
return NULL;
}
#endif /* ARCH_M68K */
@ -100,6 +108,7 @@ char* load_kernel(char* path, int bootstrap_size,
if (elf_header.e_machine != EM_PPC)
{
printf( "Not PowerPC architecture\n");
stream_close(stream);
return NULL;
}
#endif /* ARCH_PPC */
@ -107,6 +116,7 @@ char* load_kernel(char* path, int bootstrap_size,
if (elf_header.e_type != ET_EXEC)
{
printf( "Not an executable file\n");
stream_close(stream);
return NULL;
}
@ -151,7 +161,12 @@ char* load_kernel(char* path, int bootstrap_size,
kernel = (char*)malloc_contiguous(kernel_size + PAGE_SIZE + bootstrap_size);
kernel = (char*)(((unsigned long)kernel + PAGE_SIZE) & ~(PAGE_SIZE - 1));
if (!check_full_in_bank((unsigned long)kernel, kernel_size))
error("Kernel between two banks, contact maintainer\n");
{
printf("Kernel between two banks, contact maintainer\n");
free(kernel);
stream_close(stream);
return NULL;
}
memset(kernel, 0, kernel_size);
read = 0;
@ -161,7 +176,10 @@ char* load_kernel(char* path, int bootstrap_size,
ret = stream_lseek(stream, program_header[i].p_offset, SEEK_SET);
if (ret != program_header[i].p_offset)
{
error("Cannot seek");
printf("Cannot seek\n");
stream_close(stream);
free(kernel);
return NULL;
}
ret = bar_read( stream, pg,
kernel + program_header[i].p_vaddr - min_addr,
@ -171,11 +189,14 @@ char* load_kernel(char* path, int bootstrap_size,
{
printf("Read %d instead of %d\n",
ret, program_header[i].p_filesz);
error("Cannot load");
printf("Cannot load\n");
free(kernel);
stream_close(stream);
return NULL;
}
read += ret;
}
emile_progressbar_value(pg, to_read);
emile_progressbar_value(pg, to_read);
emile_progressbar_delete(pg);
ret = stream_close(stream);
@ -187,6 +208,7 @@ char *load_ramdisk(char* path, unsigned long *ramdisk_size)
{
stream_t *stream;
char *ramdisk_start;
char *ramdisk;
struct stream_stat stat;
int ret;
emile_window_t win;
@ -203,15 +225,23 @@ char *load_ramdisk(char* path, unsigned long *ramdisk_size)
stream = stream_open(path);
if (stream == NULL)
{
printf("Cannot open ramdisk\n");
return NULL;
}
stream_fstat(stream, &stat);
ramdisk_start = (char*)malloc_top(stat.st_size + 4);
ramdisk_start = (char*)(((unsigned long)ramdisk_start + 3) & 0xFFFFFFFC);
ramdisk = (char*)malloc_top(stat.st_size + 4);
ramdisk_start = (char*)(((unsigned long)ramdisk + 3) & 0xFFFFFFFC);
if (!check_full_in_bank((unsigned long)ramdisk_start, stat.st_size))
error("ramdisk between two banks, contact maintainer\n");
{
printf("ramdisk between two banks, contact maintainer\n");
free(ramdisk);
stream_close(stream);
return NULL;
}
console_set_cursor_position(win.l - 2, win.c + (win.w - strlen("Loading RAMDISK")) / 2);
printf("Loading RAMDISK");
@ -221,7 +251,11 @@ char *load_ramdisk(char* path, unsigned long *ramdisk_size)
emile_progressbar_delete(pg);
putchar('\n');
if (ret != stat.st_size)
error("Cannot load");
{
printf("Cannot load\n");
free(ramdisk);
stream_close(stream);
}
stream_close(stream);
*ramdisk_size = stat.st_size;

55
second/main.c
View File

@ -72,9 +72,9 @@ int start(emile_l2_header_t* info)
char *ramdisk_start;
unsigned long kernel_size;
unsigned long ramdisk_size;
char *kernel_path;
char *ramdisk_path;
char *command_line;
char *kernel_path = NULL;
char *ramdisk_path = NULL;
char *command_line = NULL;
serial_init();
console_init();
@ -85,6 +85,14 @@ int start(emile_l2_header_t* info)
#endif
enter_kernel_init();
retry:
if (kernel_path != NULL)
free(kernel_path);
if (command_line != NULL)
free(command_line);
if (ramdisk_path != NULL)
free(command_line);
if (read_config(info, &kernel_path, &command_line, &ramdisk_path) != 0)
error("cannot read configuration\n");
@ -119,7 +127,30 @@ int start(emile_l2_header_t* info)
bootstrap_size,
&start_mem, &entry_point, &kernel_size);
if (kernel == NULL)
error("Cannot load and uncompress kernel image\n");
{
printf("Cannot load and uncompress kernel image\n");
printf("Press any key");
console_keypressed(0);
goto retry;
}
/* load ramdisk if needed */
if (ramdisk_path)
{
ramdisk_start = load_ramdisk(ramdisk_path, &ramdisk_size);
if (ramdisk_start == NULL)
{
if (kernel != NULL)
free(kernel);
printf("Cannot open ramdisk\n");
printf("Press any key");
console_keypressed(0);
goto retry;
}
}
else
ramdisk_start = 0;
#ifdef ARCH_M68K
if (arch_type == gestalt68k)
@ -136,23 +167,7 @@ int start(emile_l2_header_t* info)
kernel_size + bootstrap_size;
enter_kernel = (unsigned long)kernel +
bootstrap_size - enter_size + kernel_size;
}
#endif
/* load ramdisk if needed */
if (ramdisk_path)
{
ramdisk_start = load_ramdisk(ramdisk_path, &ramdisk_size);
if (ramdisk_start == NULL)
error("Cannot open ramdisk\n");
}
else
ramdisk_start = 0;
#ifdef ARCH_M68K
if (arch_type == gestalt68k)
{
/* compute final address of kernel */
if (mmu_type == gestaltNoMMU)