i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The bootmaker now defaults to the endian of the host platform.

Browse Source 
Fixed style issues.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2402 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-01-10 11:48:38 +00:00
parent d9f08d808d
commit 1ff1332c77
1 changed files with 348 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/bootmaker.c
+168 -125
View File
@@ -38,35 +38,36 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h>
#ifdef sparc #ifdef sparc
#define xBIG_ENDIAN 1 # define xBIG_ENDIAN 1
#endif #endif
#ifdef i386 #ifdef i386
#define xLITTLE_ENDIAN 1 # define xLITTLE_ENDIAN 1
#endif #endif
#ifdef __ppc__ #ifdef __ppc__
#define xBIG_ENDIAN 1 # define xBIG_ENDIAN 1
#endif #endif
#define SWAP32(x) \ #define SWAP32(x) \
((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000) >> 24)) ((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000) >> 24))
#if xBIG_ENDIAN #if xBIG_ENDIAN
#define HOST_TO_BENDIAN32(x) (x) # define HOST_TO_BENDIAN32(x) (x)
#define BENDIAN_TO_HOST32(x) (x) # define BENDIAN_TO_HOST32(x) (x)
#define HOST_TO_LENDIAN32(x) SWAP32(x) # define HOST_TO_LENDIAN32(x) SWAP32(x)
#define LENDIAN_TO_HOST32(x) SWAP32(x) # define LENDIAN_TO_HOST32(x) SWAP32(x)
#endif #endif
#if xLITTLE_ENDIAN #if xLITTLE_ENDIAN
#define HOST_TO_BENDIAN32(x) SWAP32(x) # define HOST_TO_BENDIAN32(x) SWAP32(x)
#define BENDIAN_TO_HOST32(x) SWAP32(x) # define BENDIAN_TO_HOST32(x) SWAP32(x)
#define HOST_TO_LENDIAN32(x) (x) # define HOST_TO_LENDIAN32(x) (x)
#define LENDIAN_TO_HOST32(x) (x) # define LENDIAN_TO_HOST32(x) (x)
#endif #endif
#if !xBIG_ENDIAN && !xLITTLE_ENDIAN #if !xBIG_ENDIAN && !xLITTLE_ENDIAN
#error not sure which endian the host processor is, please edit bootmaker.c # error not sure which endian the host processor is, please edit bootmaker.c
#endif #endif
// ELF stuff // ELF stuff
@@ -122,13 +123,18 @@ struct Elf32_Phdr {
}; };
#ifndef O_BINARY #ifndef O_BINARY
#define O_BINARY 0 # define O_BINARY 0
#endif #endif
#define LE 0 #define LE 0
#define BE 1 #define BE 1
// define host endian as default for the target environment
#if xBIG_ENDIAN
static int target_endian = BE;
#else
static int target_endian = LE; static int target_endian = LE;
#endif
#define fix(x) ((target_endian == BE) ? HOST_TO_BENDIAN32(x) : HOST_TO_LENDIAN32(x)) #define fix(x) ((target_endian == BE) ? HOST_TO_BENDIAN32(x) : HOST_TO_LENDIAN32(x))
@@ -136,7 +142,9 @@ static int make_sparcboot = 0;
static int strip_debug = 0; static int strip_debug = 0;
static char *strip_binary = "strip"; static char *strip_binary = "strip";
void die(char *s, char *a)
void
die(char *s, char *a)
{ {
fprintf(stderr,"error: "); fprintf(stderr,"error: ");
fprintf(stderr,s,a); fprintf(stderr,s,a);
@@ -144,20 +152,22 @@ void die(char *s, char *a)
exit(1); exit(1);
} }
void *loadfile(char *file, int *size)
void *
loadfile(char *file, int *size)
{ {
int fd; int fd;
char *data; char *data;
struct stat info; struct stat info;
if((fd = open(file,O_BINARY|O_RDONLY)) != -1){ if ((fd = open(file, O_BINARY|O_RDONLY)) != -1) {
if(fstat(fd,&info)){ if (fstat(fd, &info)) {
close(fd); close(fd);
*size = 0; *size = 0;
return NULL; return NULL;
} }
data = (char *) malloc(info.st_size); data = (char *)malloc(info.st_size);
if(read(fd, data, info.st_size) != info.st_size) { if (read(fd, data, info.st_size) != info.st_size) {
close(fd); close(fd);
*size = 0; *size = 0;
return NULL; return NULL;
@@ -170,14 +180,15 @@ void *loadfile(char *file, int *size)
return NULL; return NULL;
} }
void *loadstripfile(char *file, int *size)
void *
loadstripfile(char *file, int *size)
{ {
char temp[256]; char temp[256];
char cmd[4096]; char cmd[4096];
void *retval; void *retval;
if (strip_debug) {
if(strip_debug) {
strcpy(temp, "/tmp/mkboot.XXXXXXXX"); strcpy(temp, "/tmp/mkboot.XXXXXXXX");
mktemp(temp); mktemp(temp);
sprintf(cmd, "cp %s %s; %s %s", file, temp, strip_binary, temp); sprintf(cmd, "cp %s %s; %s %s", file, temp, strip_binary, temp);
@@ -193,11 +204,13 @@ void *loadstripfile(char *file, int *size)
return retval; return retval;
} }
// write a boot block to the head of the dir. // write a boot block to the head of the dir.
// note: the first 0x20 bytes are removed by the sparc prom // note: the first 0x20 bytes are removed by the sparc prom
// which makes the whole file off by 0x20 bytes // which makes the whole file off by 0x20 bytes
/* /*
int writesparcbootblock(int fd, unsigned int blocks) int
writesparcbootblock(int fd, unsigned int blocks)
{ {
unsigned char bb[0x200+0x20]; unsigned char bb[0x200+0x20];
@@ -223,19 +236,23 @@ typedef struct _section
struct _nvpair *firstnv; struct _nvpair *firstnv;
} section; } section;
void print_sections(section *first)
void
print_sections(section *first)
{ {
nvpair *p; nvpair *p;
while(first){ while (first) {
printf("\n[%s]\n",first->name); printf("\n[%s]\n", first->name);
for(p = first->firstnv; p; p = p->next){
printf("%s=%s\n",p->name,p->value); for (p = first->firstnv; p; p = p->next) {
printf("%s=%s\n", p->name, p->value);
} }
first = first->next; first = first->next;
} }
} }
#define stNEWLINE 0 #define stNEWLINE 0
#define stSKIPLINE 1 #define stSKIPLINE 1
#define stHEADER 2 #define stHEADER 2
@@ -245,41 +262,43 @@ void print_sections(section *first)
section *first = NULL; section *first = NULL;
section *last = NULL; section *last = NULL;
section *load_ini(char *file) section *
load_ini(char *file)
{ {
char *data,*end; char *data, *end;
int size; int size;
int state = stNEWLINE; int state = stNEWLINE;
section *cur; section *cur;
char *lhs, *rhs;
char *lhs,*rhs; if (!(data = loadfile(file, &size)))
if(!(data = loadfile(file,&size))){
return NULL; return NULL;
}
end = data+size; end = data+size;
while(data < end){ while (data < end) {
switch(state){ switch (state) {
case stSKIPLINE: case stSKIPLINE:
if(*data == '\n' || *data == '\r'){ if (*data == '\n' || *data == '\r')
state = stNEWLINE; state = stNEWLINE;
}
data++; data++;
break; break;
case stNEWLINE: case stNEWLINE:
if(*data == '\n' || *data == '\r'){ if (*data == '\n' || *data == '\r') {
data++; data++;
break; break;
} }
if(*data == '['){
if (*data == '[') {
lhs = data+1; lhs = data+1;
state = stHEADER; state = stHEADER;
data++; data++;
break; break;
} }
if(*data == '#' || *data <= ' '){
if (*data == '#' || *data <= ' ') {
state = stSKIPLINE; state = stSKIPLINE;
data++; data++;
break; break;
@@ -289,12 +308,12 @@ section *load_ini(char *file)
state = stLHS; state = stLHS;
break; break;
case stHEADER: case stHEADER:
if(*data == ']'){ if (*data == ']') {
cur = (section *) malloc(sizeof(section)); cur = (section *) malloc(sizeof(section));
cur->name = lhs; cur->name = lhs;
cur->firstnv = NULL; cur->firstnv = NULL;
cur->next = NULL; cur->next = NULL;
if(last){ if (last) {
last->next = cur; last->next = cur;
last = cur; last = cur;
} else { } else {
@@ -306,10 +325,10 @@ section *load_ini(char *file)
data++; data++;
break; break;
case stLHS: case stLHS:
if(*data == '\n' || *data == '\r'){ if (*data == '\n' || *data == '\r')
state = stNEWLINE; state = stNEWLINE;
}
if(*data == '='){ if (*data == '=') {
*data = 0; *data = 0;
rhs = data+1; rhs = data+1;
state = stRHS; state = stRHS;
@@ -317,8 +336,8 @@ section *load_ini(char *file)
data++; data++;
continue; continue;
case stRHS: case stRHS:
if(*data == '\n' || *data == '\r'){ if (*data == '\n' || *data == '\r') {
nvpair *p = (nvpair *) malloc(sizeof(nvpair)); nvpair *p = (nvpair *)malloc(sizeof(nvpair));
p->name = lhs; p->name = lhs;
p->value = rhs; p->value = rhs;
*data = 0; *data = 0;
@@ -331,29 +350,35 @@ section *load_ini(char *file)
} }
} }
return first; return first;
} }
char *getval(section *s, char *name) char *
getval(section *s, char *name)
{ {
nvpair *p; nvpair *p;
for(p = s->firstnv; p; p = p->next){ for (p = s->firstnv; p; p = p->next) {
if(!strcmp(p->name,name)) return p->value; if (!strcmp(p->name, name))
return p->value;
} }
return NULL; return NULL;
} }
char *getvaldef(section *s, char *name, char *def)
char *
getvaldef(section *s, char *name, char *def)
{ {
nvpair *p; nvpair *p;
for(p = s->firstnv; p; p = p->next){ for (p = s->firstnv; p; p = p->next) {
if(!strcmp(p->name,name)) return p->value; if (!strcmp(p->name, name))
return p->value;
} }
return def; return def;
} }
Elf32_Addr elf_find_entry(void *buf, int size)
Elf32_Addr
elf_find_entry(void *buf, int size)
{ {
struct Elf32_Ehdr *header; struct Elf32_Ehdr *header;
struct Elf32_Phdr *pheader; struct Elf32_Phdr *pheader;
@@ -363,19 +388,19 @@ Elf32_Addr elf_find_entry(void *buf, int size)
#define SWAPIT(x) ((byte_swap) ? SWAP32(x) : (x)) #define SWAPIT(x) ((byte_swap) ? SWAP32(x) : (x))
if(memcmp(cbuf, ELF_MAGIC, sizeof(ELF_MAGIC)-1) != 0) if (memcmp(cbuf, ELF_MAGIC, sizeof(ELF_MAGIC)-1) != 0)
return 0; return 0;
if(cbuf[EI_CLASS] != ELFCLASS32) if (cbuf[EI_CLASS] != ELFCLASS32)
return 0; return 0;
byte_swap = 0; byte_swap = 0;
#if xBIG_ENDIAN #if xBIG_ENDIAN
if(cbuf[EI_DATA] == ELFDATA2LSB) { if (cbuf[EI_DATA] == ELFDATA2LSB) {
byte_swap = 1; byte_swap = 1;
} }
#else #else
if(cbuf[EI_DATA] == ELFDATA2MSB) { if (cbuf[EI_DATA] == ELFDATA2MSB) {
byte_swap = 1; byte_swap = 1;
} }
#endif #endif
@@ -389,7 +414,8 @@ Elf32_Addr elf_find_entry(void *buf, int size)
#undef SWAPIT #undef SWAPIT
#define centry bdir.bd_entry[c] #define centry bdir.bd_entry[c]
void makeboot(section *s, char *outfile) void
makeboot(section *s, char *outfile)
{ {
int fd; int fd;
void *rawdata[64]; void *rawdata[64];
@@ -399,10 +425,10 @@ void makeboot(section *s, char *outfile)
int i,c; int i,c;
int nextpage = 1; /* page rel offset of next loaded object */ int nextpage = 1; /* page rel offset of next loaded object */
memset(fill,0,4096); memset(fill, 0, 4096);
memset(&bdir, 0, 4096); memset(&bdir, 0, 4096);
for(i=0;i<64;i++){
for (i = 0; i < 64; i++) {
rawdata[i] = NULL; rawdata[i] = NULL;
rawsize[i] = 0; rawsize[i] = 0;
} }
@@ -417,30 +443,32 @@ void makeboot(section *s, char *outfile)
strcpy(bdir.bd_entry[0].be_name,"SBBB/Directory"); strcpy(bdir.bd_entry[0].be_name,"SBBB/Directory");
while(s){ while (s) {
char *type = getvaldef(s,"type","NONE"); char *type = getvaldef(s, "type", "NONE");
char *file = getval(s,"file"); char *file = getval(s, "file");
int vsize; int vsize;
int size; int size;
struct stat statbuf; struct stat statbuf;
if(!type) die("section %s has no type",s->name); if (!type)
die("section %s has no type", s->name);
strncpy(centry.be_name,s->name, BOOTDIR_NAMELEN); strncpy(centry.be_name,s->name, BOOTDIR_NAMELEN);
centry.be_name[BOOTDIR_NAMELEN - 1] = 0; centry.be_name[BOOTDIR_NAMELEN - 1] = 0;
if(!file) die("section %s has no file",s->name); if (!file)
rawdata[c]= ((strcmp(type, "elf32")==0)?loadstripfile:loadfile)(file,&rawsize[c]); die("section %s has no file", s->name);
if(!rawdata[c])
rawdata[c] = ((strcmp(type, "elf32")==0) ? loadstripfile : loadfile)(file,&rawsize[c]);
if (!rawdata[c])
die("cannot load \"%s\"",file); die("cannot load \"%s\"",file);
if(stat(file,&statbuf)) if (stat(file,&statbuf))
die("cannot stat \"%s\"",file); die("cannot stat \"%s\"",file);
vsize = statbuf.st_size; vsize = statbuf.st_size;
centry.be_size = rawsize[c] / 4096 + (rawsize[c] % 4096 ? 1 : 0); centry.be_size = rawsize[c] / 4096 + (rawsize[c] % 4096 ? 1 : 0);
centry.be_vsize = centry.be_vsize = (vsize < centry.be_size) ? centry.be_size : vsize;
(vsize < centry.be_size) ? centry.be_size : vsize;
centry.be_offset = nextpage; centry.be_offset = nextpage;
nextpage += centry.be_size; nextpage += centry.be_size;
@@ -449,114 +477,129 @@ void makeboot(section *s, char *outfile)
centry.be_vsize = fix(centry.be_vsize); centry.be_vsize = fix(centry.be_vsize);
centry.be_offset = fix(centry.be_offset); centry.be_offset = fix(centry.be_offset);
if(!strcmp(type,"boot")){ if (!strcmp(type,"boot")) {
centry.be_type = fix(BE_TYPE_BOOTSTRAP); centry.be_type = fix(BE_TYPE_BOOTSTRAP);
centry.be_code_vaddr = fix(atoi(getvaldef(s,"vaddr","0"))); centry.be_code_vaddr = fix(atoi(getvaldef(s, "vaddr", "0")));
centry.be_code_ventr = fix(atoi(getvaldef(s,"ventry","0"))); centry.be_code_ventr = fix(atoi(getvaldef(s, "ventry", "0")));
} }
if(!strcmp(type,"code")){ if(!strcmp(type,"code")){
centry.be_type = fix(BE_TYPE_CODE); centry.be_type = fix(BE_TYPE_CODE);
centry.be_code_vaddr = fix(atoi(getvaldef(s,"vaddr","0"))); centry.be_code_vaddr = fix(atoi(getvaldef(s, "vaddr", "0")));
centry.be_code_ventr = fix(atoi(getvaldef(s,"ventry","0"))); centry.be_code_ventr = fix(atoi(getvaldef(s, "ventry", "0")));
} }
if(!strcmp(type,"data")){ if (!strcmp(type, "data"))
centry.be_type = fix(BE_TYPE_DATA); centry.be_type = fix(BE_TYPE_DATA);
}
if(!strcmp(type,"elf32")){ if (!strcmp(type, "elf32")) {
centry.be_type = fix(BE_TYPE_ELF32); centry.be_type = fix(BE_TYPE_ELF32);
centry.be_code_vaddr = 0; centry.be_code_vaddr = 0;
centry.be_code_ventr = fix(elf_find_entry(rawdata[c], rawsize[c])); centry.be_code_ventr = fix(elf_find_entry(rawdata[c], rawsize[c]));
} }
if(centry.be_type == BE_TYPE_NONE){ if (centry.be_type == BE_TYPE_NONE)
die("unrecognized section type \"%s\"",type); die("unrecognized section type \"%s\"", type);
}
c++; c++;
s = s->next; s = s->next;
if(c == BOOTDIR_MAX_ENTRIES) die("too many sections (>63)",NULL); if (c == BOOTDIR_MAX_ENTRIES)
die("too many sections (>63)",NULL);
} }
if((fd = open(outfile, O_BINARY|O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) { if ((fd = open(outfile, O_BINARY|O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
die("cannot write to \"%s\"",outfile); die("cannot write to \"%s\"",outfile);
}
/* XXX - Hope this isn't needed :( /* XXX - Hope this isn't needed :(
if(make_sparcboot) { if (make_sparcboot)
writesparcbootblock(fd, nextpage+1); writesparcbootblock(fd, nextpage + 1);
}
*/ */
for(i=0;i<c;i++){ for (i = 0; i < c; i++) {
write(fd, rawdata[i], rawsize[i]); write(fd, rawdata[i], rawsize[i]);
if(rawsize[i]%4096) if (rawsize[i] % 4096)
write(fd, fill, 4096 - (rawsize[i]%4096)); write(fd, fill, 4096 - (rawsize[i]%4096));
} }
close(fd); close(fd);
} }
int main(int argc, char **argv)
void
usage(char *name)
{
char *programName = strrchr(name, '/');
if (programName == NULL)
programName = name;
else
programName++;
fprintf(stderr,
"usage: %s [--littleendian] [--bigendian ] [ --strip-binary <binary ] [ --strip-debug] [ --sparc | -s ] [ <inifile> ... ] -o <bootfile>\n"
"\tdefaults to "
#if xBIG_ENDIAN
"\"big-endian\""
#else
"\"little-endian\""
#endif
" on this platform\n", programName);
exit(1);
}
int
main(int argc, char **argv)
{ {
char *file = NULL; char *file = NULL;
char *programName = argv[0];
section *s; section *s;
if(argc < 2){ if (argc < 2)
usage: usage(programName);
fprintf(stderr,"usage: %s [--littleendian (default)] [--bigendian ] [ --strip-binary <binary ] [ --strip-debug] [ --sparc | -s ] [ <inifile> ... ] -o <bootfile>\n",argv[0]);
return 1;
}
argc--; argc--;
argv++; argv++;
while(argc){ while (argc){
if(!strcmp(*argv,"--sparc")) { if (!strcmp(*argv,"--sparc")) {
make_sparcboot = 1; make_sparcboot = 1;
} else if(!strcmp(*argv, "--bigendian")) { } else if (!strcmp(*argv, "--bigendian")) {
target_endian = BE; target_endian = BE;
} else if(!strcmp(*argv,"-o")) { } else if (!strcmp(*argv,"-o")) {
argc--; argc--;
argv++; argv++;
if(argc) { if (argc)
file = *argv; file = *argv;
} else { else
goto usage; usage(programName);
} } else if (!strcmp(*argv, "--strip-binary")) {
} else if(!strcmp(*argv, "--strip-binary")) {
argc--; argc--;
argv++; argv++;
if(argc) { if (argc)
strip_binary = *argv; strip_binary = *argv;
} else { else
goto usage; usage(programName);
} } else if (!strcmp(*argv, "--strip-debug")) {
} else if(!strcmp(*argv, "--strip-debug")) {
strip_debug = 1; strip_debug = 1;
} else { } else {
if(load_ini(*argv) == NULL) { if (load_ini(*argv) == NULL)
fprintf(stderr,"warning: cannot load '%s'\n",*argv); fprintf(stderr, "warning: cannot load '%s'\n", *argv);
}
} }
argc--; argc--;
argv++; argv++;
} }
if ((argc > 3) && !strcmp(argv[3], "-sparc"))
if((argc > 3) && !strcmp(argv[3],"-sparc")){
make_sparcboot = 1; make_sparcboot = 1;
}
if(!file){ if (!file){
fprintf(stderr,"error: no output specified\n"); fprintf(stderr,"error: no output specified\n");
goto usage; usage(programName);
} }
if(!first){ if (!first){
fprintf(stderr,"error: no data to write?!\n"); fprintf(stderr, "error: no data to write?!\n");
goto usage; usage(programName);
} }
makeboot(first,file); makeboot(first, file);
return 0; return 0;
} }