1.1 --- a/src/loader.c Tue Jan 01 05:08:38 2008 +0000
1.2 +++ b/src/loader.c Tue Aug 19 22:58:05 2008 +0000
1.9 #include <sys/stat.h>
1.12 char bootstrap_magic[32] = "SEGA SEGAKATANA SEGA ENTERPRISES";
1.13 char iso_magic[6] = "\001CD001";
1.14 char *file_loader_extensions[][2] = {
1.15 - { "sbi", "Self Boot Inducer" },
1.16 - { "bin", "SH4 Bin file" },
1.18 + { "sbi", "Self Boot Inducer" },
1.19 + { "bin", "SH4 Bin file" },
1.22 #define BOOTSTRAP_LOAD_ADDR 0x8C008000
1.23 #define BOOTSTRAP_SIZE 32768
1.27 gboolean result = TRUE;
1.30 int fd = open( filename, O_RDONLY );
1.40 if( read( fd, buf, 32 ) != 32 ) {
1.41 ERROR( "Unable to read from file '%s'", filename );
1.43 lseek( fd, 0, SEEK_SET );
1.44 read( fd, load, BOOTSTRAP_SIZE );
1.45 bootstrap_dump( load, TRUE );
1.46 - dreamcast_program_loaded( filename, BOOTSTRAP_LOAD_ADDR + 0x300 );
1.47 + dreamcast_program_loaded( filename, BOOTSTRAP_LOAD_ADDR + 0x300 );
1.49 /* look for a valid ISO9660 header */
1.50 lseek( fd, 32768, SEEK_SET );
1.52 if( memcmp( buf, iso_magic, 6 ) == 0 ) {
1.53 /* Alright, got it */
1.54 INFO( "Loading ISO9660 filesystem from '%s'",
1.59 } else if( memcmp( buf, "PK\x03\x04", 4 ) == 0 ) {
1.60 - /* ZIP file, aka SBI file */
1.61 - WARN( "SBI files not supported yet" );
1.63 + /* ZIP file, aka SBI file */
1.64 + WARN( "SBI files not supported yet" );
1.66 } else if( memcmp( buf, DREAMCAST_SAVE_MAGIC, 16 ) == 0 ) {
1.68 - result = (dreamcast_load_state( filename )==0);
1.70 + result = (dreamcast_load_state( filename )==0);
1.71 } else if( buf[0] == 0x7F && buf[1] == 'E' &&
1.72 - buf[2] == 'L' && buf[3] == 'F' ) {
1.74 - lseek( fd, 0, SEEK_SET );
1.75 - result = file_load_elf_fd( filename, fd );
1.76 + buf[2] == 'L' && buf[3] == 'F' ) {
1.78 + lseek( fd, 0, SEEK_SET );
1.79 + result = file_load_elf_fd( filename, fd );
1.86 @@ -108,13 +109,13 @@
1.88 const gchar *bootstrap_file = lxdream_get_config_value(CONFIG_BOOTSTRAP);
1.89 if( bootstrap_file != NULL ) {
1.90 - /* Load in a bootstrap before the binary, to initialize everything
1.93 + /* Load in a bootstrap before the binary, to initialize everything
1.96 if( mem_load_block( bootstrap_file, BOOTSTRAP_LOAD_ADDR, BOOTSTRAP_SIZE ) == 0 ) {
1.97 - dreamcast_program_loaded( filename, BOOTSTRAP_LOAD_ADDR+0x300 );
1.100 + dreamcast_program_loaded( filename, BOOTSTRAP_LOAD_ADDR+0x300 );
1.104 dreamcast_program_loaded( filename, pc );
1.106 @@ -124,10 +125,10 @@
1.108 /* Load the binary itself */
1.109 if( mem_load_block( filename, BINARY_LOAD_ADDR, -1 ) == 0 ) {
1.110 - file_load_postload( filename, BINARY_LOAD_ADDR );
1.112 + file_load_postload( filename, BINARY_LOAD_ADDR );
1.120 @@ -138,32 +139,32 @@
1.123 if( read( fd, &head, sizeof(head) ) != sizeof(head) )
1.126 if( head.e_ident[EI_CLASS] != ELFCLASS32 ||
1.127 - head.e_ident[EI_DATA] != ELFDATA2LSB ||
1.128 - head.e_ident[EI_VERSION] != 1 ||
1.129 - head.e_type != ET_EXEC ||
1.130 - head.e_machine != EM_SH ||
1.131 - head.e_version != 1 ) {
1.132 - ERROR( "File is not an SH4 ELF executable file" );
1.134 + head.e_ident[EI_DATA] != ELFDATA2LSB ||
1.135 + head.e_ident[EI_VERSION] != 1 ||
1.136 + head.e_type != ET_EXEC ||
1.137 + head.e_machine != EM_SH ||
1.138 + head.e_version != 1 ) {
1.139 + ERROR( "File is not an SH4 ELF executable file" );
1.143 /* Program headers */
1.144 for( i=0; i<head.e_phnum; i++ ) {
1.145 - lseek( fd, head.e_phoff + i*head.e_phentsize, SEEK_SET );
1.146 - read( fd, &phdr, sizeof(phdr) );
1.147 - if( phdr.p_type == PT_LOAD ) {
1.148 - lseek( fd, phdr.p_offset, SEEK_SET );
1.149 - sh4ptr_t target = mem_get_region( phdr.p_vaddr );
1.150 - read( fd, target, phdr.p_filesz );
1.151 - if( phdr.p_memsz > phdr.p_filesz ) {
1.152 - memset( target + phdr.p_filesz, 0, phdr.p_memsz - phdr.p_filesz );
1.154 - INFO( "Loaded %d bytes to %08X", phdr.p_filesz, phdr.p_vaddr );
1.156 + lseek( fd, head.e_phoff + i*head.e_phentsize, SEEK_SET );
1.157 + read( fd, &phdr, sizeof(phdr) );
1.158 + if( phdr.p_type == PT_LOAD ) {
1.159 + lseek( fd, phdr.p_offset, SEEK_SET );
1.160 + sh4ptr_t target = mem_get_region( phdr.p_vaddr );
1.161 + read( fd, target, phdr.p_filesz );
1.162 + if( phdr.p_memsz > phdr.p_filesz ) {
1.163 + memset( target + phdr.p_filesz, 0, phdr.p_memsz - phdr.p_filesz );
1.165 + INFO( "Loaded %d bytes to %08X", phdr.p_filesz, phdr.p_vaddr );
1.170 file_load_postload( filename, head.e_entry );