OpenBIOS January 2011

openbios@openbios.org

10 participants
48 discussions

[PATCH 2/4] sparc64: avoid runtime relocations
by Blue Swirl 23 Jan '11

23 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc64/build.xml | 6 +----- arch/sparc64/builtin.c | 12 ++++++++++-- arch/sparc64/ofmem_sparc64.c | 2 +- arch/sparc64/openbios.c | 10 ++++------ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/sparc64/build.xml b/arch/sparc64/build.xml index 3bea63c..54807c5 100644 --- a/arch/sparc64/build.xml +++ b/arch/sparc64/build.xml @@ -40,11 +40,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> diff --git a/arch/sparc64/builtin.c b/arch/sparc64/builtin.c index aba8a2b..864da79 100644 --- a/arch/sparc64/builtin.c +++ b/arch/sparc64/builtin.c @@ -14,12 +14,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc64/ofmem_sparc64.c b/arch/sparc64/ofmem_sparc64.c index 1655978..1ed4a7a 100644 --- a/arch/sparc64/ofmem_sparc64.c +++ b/arch/sparc64/ofmem_sparc64.c @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((256 + 512 + 512) * 1024) +#define MEMSIZE ((256 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 8c08814..ac709fe 100644 --- a/arch/sparc64/openbios.c +++ b/arch/sparc64/openbios.c @@ -33,7 +33,6 @@ #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory; @@ -617,12 +616,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT -- 1.6.2.4

1 0

[PATCH 1/4] sparc32: avoid runtime relocations
by Blue Swirl 23 Jan '11

23 Jan '11

The Forth dictionary was relocated at run time, incurring also a copy operation. The source dictionary remained in memory. It was not possible to run forthstrap without any input files besides the base dictionary. Make forthstrap generate a hex dump which can be included in C, but also contains relocations, so that relocations are performed by the linker at compile time. Allow dictionary compilation with no source files. Don't allocate the dictionary dynamically; reduce ofmem supply accordingly. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc32/build.xml | 6 +-- arch/sparc32/builtin.c | 12 +++++- arch/sparc32/ofmem_sparc32.c | 2 +- arch/sparc32/openbios.c | 10 ++--- include/libopenbios/sys_info.h | 2 + kernel/bootstrap.c | 82 ++++++++++++++++++++++++++++++++++++---- 6 files changed, 92 insertions(+), 22 deletions(-) diff --git a/arch/sparc32/build.xml b/arch/sparc32/build.xml index 3d2f71d..47ad01a 100644 --- a/arch/sparc32/build.xml +++ b/arch/sparc32/build.xml @@ -42,11 +42,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> diff --git a/arch/sparc32/builtin.c b/arch/sparc32/builtin.c index 8bcce4c..971a400 100644 --- a/arch/sparc32/builtin.c +++ b/arch/sparc32/builtin.c @@ -14,12 +14,20 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) +#define DICTIONARY_BASE ((ucell)((char *)&forth_dictionary)) + +static ucell forth_dictionary[DICTIONARY_SIZE] = { #include "static-dict.h" +}; void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc32/ofmem_sparc32.c b/arch/sparc32/ofmem_sparc32.c index 6815349..72079b2 100644 --- a/arch/sparc32/ofmem_sparc32.c +++ b/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (512 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index c940a5f..1d8842a 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -28,7 +28,6 @@ #include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) @@ -968,12 +967,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT diff --git a/include/libopenbios/sys_info.h b/include/libopenbios/sys_info.h index 2eea9af..a8b3cce 100644 --- a/include/libopenbios/sys_info.h +++ b/include/libopenbios/sys_info.h @@ -20,6 +20,8 @@ struct sys_info { } *memrange; unsigned long *dict_start; unsigned long *dict_end; + cell dict_limit; + ucell *dict_last; }; extern void *elf_boot_notes; diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 94aaeb8..546ffee 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -96,6 +96,11 @@ static const char *wordnames[] = { * dictionary related functions. */ +/* + * Compare two dictionaries constructed at different addresses. When + * the cells don't match, a need for relocation is detected and the + * corresponding bit in reloc_table bitmap is set. + */ static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, int length) { ucell *d1=(ucell *)dict_one, *d2=(ucell *)dict_two; @@ -237,6 +242,54 @@ static void write_dictionary(const char *filename) #endif } +/* + * Write dictionary as a list of ucell hex values to filename. Array + * header and end lines are not generated. + * + * Cells with relocations are output using the expression + * DICTIONARY_BASE + value. + * + * Define some helpful constants. + */ +static void write_dictionary_hex(const char *filename) +{ + FILE *f; + ucell *walk; + + f = fopen(filename, "w"); + if (!f) { + printk("panic: can't write to dictionary '%s'.\n", filename); + exit(1); + } + + for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { + int pos, bit, l; + ucell val; + + l = (walk - (ucell *)dict); + pos = l / BITS; + bit = l & ~(-BITS); + + val = read_ucell(walk); + if (relocation_address[pos] & target_ucell((ucell)1ULL << bit)) { + fprintf(f, "DICTIONARY_BASE + 0x%" FMT_CELL_x + ",\n", val); + } else { + fprintf(f, "0x%" FMT_CELL_x",\n", val); + } + } + + fprintf(f, "#define FORTH_DICTIONARY_LAST 0x%" FMT_CELL_x"\n", + (ucell)((unsigned long)last - (unsigned long)dict)); + fprintf(f, "#define FORTH_DICTIONARY_END 0x%" FMT_CELL_x"\n", + (ucell)dicthead); + fclose(f); + +#ifdef CONFIG_DEBUG_DICTIONARY + printk("wrote dictionary to file %s.\n", filename); +#endif +} + static ucell read_dictionary(char *fil) { int ilen; @@ -1032,7 +1085,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ - " dump dependencies in Makefile format\n\n" + " dump dependencies in Makefile format\n\n" \ + " -x|--hexdump output format is C language hex dump\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1045,8 +1099,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c output.log\n" \ " write kernel console output to log file\n" \ - " -s install segfault handler\n\n" - " -M file dump dependencies in Makefile format\n\n" + " -s install segfault handler\n\n" \ + " -M file dump dependencies in Makefile format\n\n" \ + " -x output format is C language hex dump\n" #endif int main(int argc, char *argv[]) @@ -1054,15 +1109,15 @@ int main(int argc, char *argv[]) struct sigaction sa; unsigned char *ressources=NULL; /* All memory used by us */ - char *dictname = NULL; + const char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; char *depfilename = NULL; unsigned char *bootstrapdict[2]; - int c, cnt; + int c, cnt, hexdump = 0; - const char *optstring = "VvhsI:d:D:c:M:?"; + const char *optstring = "VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1077,6 +1132,7 @@ int main(int argc, char *argv[]) {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, + {"hexdump", 0, NULL, 'x'}, }; /* @@ -1132,11 +1188,17 @@ int main(int argc, char *argv[]) depfilename = optarg; } break; + case 'x': + hexdump = 1; + break; default: return 1; } } + if (!dictname) { + dictname = "bootstrap.dict"; + } if (verbose) { printk(BANNER); printk("Using source dictionary '%s'\n", basedict); @@ -1144,7 +1206,7 @@ int main(int argc, char *argv[]) printk("Dumping dependencies to '%s'\n", depfilename); } - if (argc < optind + 1) { + if (argc < optind) { printk(USAGE, argv[0]); return 1; } @@ -1243,7 +1305,11 @@ int main(int argc, char *argv[]) #endif { relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); - write_dictionary( dictname ? dictname : "bootstrap.dict"); + if (hexdump) { + write_dictionary_hex(dictname); + } else { + write_dictionary(dictname); + } } free(ressources); -- 1.6.2.4

1 0

[PATCH 4/4] ppc: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

Because the sizes of cells and pointers do not match on PPC64, relocations can't be computed in an ucell array by the linker. Introduce a method to relocate the dictionary to a fixed address by forthstrap. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/ppc/build.xml | 6 +----- arch/ppc/qemu/kernel.c | 18 +++++++++++++----- arch/ppc/qemu/ldscript | 7 +++++++ arch/ppc/qemu/ofmem.c | 2 +- arch/ppc64/qemu/ldscript | 7 +++++++ kernel/bootstrap.c | 44 ++++++++++++++++++++++++++++++++++++-------- 6 files changed, 65 insertions(+), 19 deletions(-) diff --git a/arch/ppc/build.xml b/arch/ppc/build.xml index 4aec62f..2b7b605 100644 --- a/arch/ppc/build.xml +++ b/arch/ppc/build.xml @@ -60,11 +60,7 @@ <executable name="target/include/qemu-dict.h" target="target" condition="QEMU"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -a 0xfff08000 -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-qemu.dict"/> </executable> diff --git a/arch/ppc/qemu/kernel.c b/arch/ppc/qemu/kernel.c index 4cae525..fbb5925 100644 --- a/arch/ppc/qemu/kernel.c +++ b/arch/ppc/qemu/kernel.c @@ -17,7 +17,6 @@ * */ -#include "qemu-dict.h" #include "config.h" #include "dict.h" #include "libopenbios/bindings.h" @@ -27,7 +26,14 @@ #include "kernel.h" #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) + +/* + * wrap an array around the hex'ed dictionary file + */ + +#include "qemu-dict.h" static ucell *memory; @@ -82,10 +88,12 @@ init_memory( void ) int initialize_forth( void ) { - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)forth_dictionary; + dicthead = (ucell)FORTH_DICTIONARY_END; + last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + dictlimit = sizeof(forth_dictionary); - load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); forth_init(); PUSH_xt( bind_noname_func(arch_of_init) ); diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript index 840b498..3b1855a 100644 --- a/arch/ppc/qemu/ldscript +++ b/arch/ppc/qemu/ldscript @@ -6,6 +6,7 @@ OUTPUT_ARCH(powerpc) BASE_ADDR = 0xfff00000; /* As NVRAM is at 0xfff04000, the .text needs to be after that + * The value in arch/ppc/build.xml must match this value! */ TEXT_ADDR = 0xfff08000; @@ -26,6 +27,12 @@ SECTIONS . = TEXT_ADDR; /* Normal sections */ + .data.dict ALIGN(4096): { + _dict_start = .; + *(.data.dict) + _dict_end = .; + } + .text ALIGN(4096): { *(.text) *(.text.*) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 4c6825e..f6cf8cd 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -55,7 +55,7 @@ extern void setup_mmu(unsigned long code_base); #define HASH_BITS 15 #endif #define HASH_SIZE (2 << HASH_BITS) -#define OFMEM_SIZE (2 * 1024 * 1024) +#define OFMEM_SIZE (1 * 1024 * 1024 + 512 * 1024) #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 diff --git a/arch/ppc64/qemu/ldscript b/arch/ppc64/qemu/ldscript index 7a22903..0bb2157 100644 --- a/arch/ppc64/qemu/ldscript +++ b/arch/ppc64/qemu/ldscript @@ -6,6 +6,7 @@ OUTPUT_ARCH(powerpc:common64) BASE_ADDR = 0xfff00000; /* As NVRAM is at 0xfff04000, the .text needs to be after that + * The value in arch/ppc/build.xml must match this value! */ TEXT_ADDR = 0xfff08000; @@ -26,6 +27,12 @@ SECTIONS . = TEXT_ADDR; /* Normal sections */ + .data.dict ALIGN(4096): { + _dict_start = .; + *(.data.dict) + _dict_end = .; + } + .text ALIGN(4096): { *(.text) *(.text.*) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 68fe5dd..b19c5c4 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -96,7 +96,15 @@ static const char *wordnames[] = { * dictionary related functions. */ -static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, int length) +/* + * Compare two dictionaries constructed at different addresses. When + * the cells don't match, a need for relocation is detected and the + * corresponding bit in reloc_table bitmap is set. + * + * If offset is nonzero, add the offset to the cell instead. + */ +static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, + int length, ucell offset) { ucell *d1=(ucell *)dict_one, *d2=(ucell *)dict_two; ucell *reloc_table; @@ -122,8 +130,12 @@ static void relocation_table(unsigned char * dict_one, unsigned char *dict_two, // printk("\nWARNING: inconsistent relocation (%x:%x)!\n", d1[i], d2[i]); } else { /* This is a pointer, it needs relocation, d2==dict */ - reloc_table[pos] |= target_ucell((ucell)1ULL << bit); - d2[i] = target_ucell(target_ucell(d2[i]) - pointer2cell(d2)); + if (!offset) { + reloc_table[pos] |= target_ucell((ucell)1ULL + << bit); + } + d2[i] = target_ucell(target_ucell(d2[i]) - + pointer2cell(d2) + offset); } } @@ -237,6 +249,11 @@ static void write_dictionary(const char *filename) #endif } +/* + * Write dictionary as a C array of ucells to filename. + * Put the array to special section so that its address can be fixed. + * Define some helpful constants. + */ static void write_dictionary_hex(const char *filename) { FILE *f; @@ -248,7 +265,8 @@ static void write_dictionary_hex(const char *filename) exit(1); } - fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] = {\n"); + fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] " + "__attribute__((section(\".data.dict\"))) = {\n"); for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { int pos, bit, l; ucell val; @@ -1075,7 +1093,10 @@ static void new_dictionary(const char *source) " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ " dump dependencies in Makefile format\n\n" \ - " -x|--hexdump output format is C language hex dump\n" + " -x|--hexdump output format is C language hex dump\n" \ + " -a|--fixed-address base\n" \ + " relocate output to base\n" + #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1090,7 +1111,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s install segfault handler\n\n" \ " -M file dump dependencies in Makefile format\n\n" \ - " -x output format is C language hex dump\n" + " -x output format is C language hex dump\n" \ + " -a base relocate output to base\n" #endif int main(int argc, char *argv[]) @@ -1105,8 +1127,9 @@ int main(int argc, char *argv[]) unsigned char *bootstrapdict[2]; int c, cnt, hexdump = 0; + ucell relocation_offset = 0; - const char *optstring = "VvhsI:d:D:c:M:x?"; + const char *optstring = "a:VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1122,6 +1145,7 @@ int main(int argc, char *argv[]) {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, {"hexdump", 0, NULL, 'x'}, + {"fixed-address", 1, NULL, 'a'}, }; /* @@ -1180,6 +1204,9 @@ int main(int argc, char *argv[]) case 'x': hexdump = 1; break; + case 'a': + relocation_offset = strtoll(optarg, NULL, 0); + break; default: return 1; } @@ -1293,7 +1320,8 @@ int main(int argc, char *argv[]) else #endif { - relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); + relocation_table(bootstrapdict[0], bootstrapdict[1], dicthead, + relocation_offset); if (hexdump) { write_dictionary_hex(dictname); } else { -- 1.6.2.4

1 0

[PATCH 3/4] x86: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/x86/build.xml | 6 +----- arch/x86/builtin.c | 9 +++++++-- arch/x86/openbios.c | 12 ++++-------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/arch/x86/build.xml b/arch/x86/build.xml index 8317209..02cecce 100644 --- a/arch/x86/build.xml +++ b/arch/x86/build.xml @@ -55,11 +55,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-x86.dict"/> </executable> diff --git a/arch/x86/builtin.c b/arch/x86/builtin.c index a649172..b02f939 100644 --- a/arch/x86/builtin.c +++ b/arch/x86/builtin.c @@ -13,12 +13,17 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) + #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c index 24b886d..dd444fa 100644 --- a/arch/x86/openbios.c +++ b/arch/x86/openbios.c @@ -22,9 +22,6 @@ void collect_sys_info(struct sys_info *info); -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ -static unsigned char intdict[DICTIONARY_SIZE]; - #ifdef CONFIG_DRIVER_PCI static const pci_arch_t default_pci_host = { .name = "Intel,i440FX", @@ -84,12 +81,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict=intdict; - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); relocate(&sys_info); -- 1.6.2.4

1 0

[PATCH 2/4] sparc64: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc64/build.xml | 6 +----- arch/sparc64/builtin.c | 8 ++++++-- arch/sparc64/ofmem_sparc64.c | 2 +- arch/sparc64/openbios.c | 10 ++++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/arch/sparc64/build.xml b/arch/sparc64/build.xml index 3bea63c..54807c5 100644 --- a/arch/sparc64/build.xml +++ b/arch/sparc64/build.xml @@ -40,11 +40,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> diff --git a/arch/sparc64/builtin.c b/arch/sparc64/builtin.c index aba8a2b..cf15bb5 100644 --- a/arch/sparc64/builtin.c +++ b/arch/sparc64/builtin.c @@ -14,12 +14,16 @@ * wrap an array around the hex'ed dictionary file */ +/* 512K for the dictionary */ +#define DICTIONARY_SIZE (512 * 1024 / sizeof(ucell)) #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc64/ofmem_sparc64.c b/arch/sparc64/ofmem_sparc64.c index 1655978..1ed4a7a 100644 --- a/arch/sparc64/ofmem_sparc64.c +++ b/arch/sparc64/ofmem_sparc64.c @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((256 + 512 + 512) * 1024) +#define MEMSIZE ((256 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c index 8c08814..ac709fe 100644 --- a/arch/sparc64/openbios.c +++ b/arch/sparc64/openbios.c @@ -33,7 +33,6 @@ #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory; @@ -617,12 +616,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT -- 1.6.2.4

1 0

[PATCH 1/4] sparc32: avoid runtime relocations
by Blue Swirl 21 Jan '11

21 Jan '11

The Forth dictionary was relocated at run time, incurring also a copy operation. The source dictionary remained in memory. It was not possible to run forthstrap without any input files besides the base dictionary. Make forthstrap generate a hex dump which can be included in C, but also contains relocations, so that relocations are performed by the linker at compile time. Allow dictionary compilation with no source files. Don't allocate the dictionary dynamically; reduce ofmem supply accordingly. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc32/build.xml | 6 +--- arch/sparc32/builtin.c | 9 ++++- arch/sparc32/ofmem_sparc32.c | 2 +- arch/sparc32/openbios.c | 10 ++--- include/libopenbios/sys_info.h | 2 + kernel/bootstrap.c | 71 +++++++++++++++++++++++++++++++++++---- 6 files changed, 78 insertions(+), 22 deletions(-) diff --git a/arch/sparc32/build.xml b/arch/sparc32/build.xml index 3d2f71d..47ad01a 100644 --- a/arch/sparc32/build.xml +++ b/arch/sparc32/build.xml @@ -42,11 +42,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(call quiet-command,true, " GEN $(TARGET_DIR)$@") - @echo "static const char forth_dictionary[] = {" > $@ - @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ - | sed 's/0x ,//g' >> $@ - @echo "};" >> $@]]></rule> + $(call quiet-command,$(ODIR)/forthstrap -x -D $@ -d $< </dev/null, " GEN $(TARGET_DIR)$@")]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> diff --git a/arch/sparc32/builtin.c b/arch/sparc32/builtin.c index 8bcce4c..839ffd6 100644 --- a/arch/sparc32/builtin.c +++ b/arch/sparc32/builtin.c @@ -14,12 +14,17 @@ * wrap an array around the hex'ed dictionary file */ +/* 256K for the dictionary */ +#define DICTIONARY_SIZE (256 * 1024 / sizeof(ucell)) + #include "static-dict.h" void collect_multiboot_info(struct sys_info *info); void collect_multiboot_info(struct sys_info *info) { info->dict_start=(unsigned long *)forth_dictionary; - info->dict_end=(unsigned long *)((ucell)forth_dictionary + - sizeof(forth_dictionary)); + info->dict_end = (unsigned long *)FORTH_DICTIONARY_END; + info->dict_last = (ucell *)((unsigned char *)forth_dictionary + + FORTH_DICTIONARY_LAST); + info->dict_limit = sizeof(forth_dictionary); } diff --git a/arch/sparc32/ofmem_sparc32.c b/arch/sparc32/ofmem_sparc32.c index 6815349..72079b2 100644 --- a/arch/sparc32/ofmem_sparc32.c +++ b/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (512 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index c940a5f..1d8842a 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -28,7 +28,6 @@ #include "libopenbios/ofmem.h" #define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ -#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) @@ -968,12 +967,11 @@ int openbios(void) collect_sys_info(&sys_info); - dict = malloc(DICTIONARY_SIZE); - dictlimit = DICTIONARY_SIZE; + dict = (unsigned char *)sys_info.dict_start; + dicthead = (cell)sys_info.dict_end; + last = sys_info.dict_last; + dictlimit = sys_info.dict_limit; - load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end - - (unsigned long)sys_info.dict_start); forth_init(); #ifdef CONFIG_DEBUG_BOOT diff --git a/include/libopenbios/sys_info.h b/include/libopenbios/sys_info.h index 2eea9af..a8b3cce 100644 --- a/include/libopenbios/sys_info.h +++ b/include/libopenbios/sys_info.h @@ -20,6 +20,8 @@ struct sys_info { } *memrange; unsigned long *dict_start; unsigned long *dict_end; + cell dict_limit; + ucell *dict_last; }; extern void *elf_boot_notes; diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 94aaeb8..68fe5dd 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -237,6 +237,48 @@ static void write_dictionary(const char *filename) #endif } +static void write_dictionary_hex(const char *filename) +{ + FILE *f; + ucell *walk; + + f = fopen(filename, "w"); + if (!f) { + printk("panic: can't write to dictionary '%s'.\n", filename); + exit(1); + } + + fprintf(f, "static ucell forth_dictionary[DICTIONARY_SIZE] = {\n"); + for (walk = (ucell *)dict; walk < (ucell *)(dict + dicthead); walk++) { + int pos, bit, l; + ucell val; + + l = (walk - (ucell *)dict); + pos = l / BITS; + bit = l & ~(-BITS); + + val = read_ucell(walk); + if (relocation_address[pos] & target_ucell((ucell)1ULL << bit)) { + fprintf(f, "(ucell)((char *)&forth_dictionary + 0x%" FMT_CELL_x + "),\n", val); + } else { + fprintf(f, "0x%" FMT_CELL_x",\n", val); + } + } + + fprintf(f, "};\n"); + + fprintf(f, "#define FORTH_DICTIONARY_LAST 0x%" FMT_CELL_x"\n", + (ucell)((unsigned long)last - (unsigned long)dict)); + fprintf(f, "#define FORTH_DICTIONARY_END 0x%" FMT_CELL_x"\n", + (ucell)dicthead); + fclose(f); + +#ifdef CONFIG_DEBUG_DICTIONARY + printk("wrote dictionary to file %s.\n", filename); +#endif +} + static ucell read_dictionary(char *fil) { int ilen; @@ -1032,7 +1074,8 @@ static void new_dictionary(const char *source) " write kernel console output to log file\n" \ " -s|--segfault install segfault handler\n" \ " -M|--dependency-dump file\n" \ - " dump dependencies in Makefile format\n\n" + " dump dependencies in Makefile format\n\n" \ + " -x|--hexdump output format is C language hex dump\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1045,8 +1088,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c output.log\n" \ " write kernel console output to log file\n" \ - " -s install segfault handler\n\n" - " -M file dump dependencies in Makefile format\n\n" + " -s install segfault handler\n\n" \ + " -M file dump dependencies in Makefile format\n\n" \ + " -x output format is C language hex dump\n" #endif int main(int argc, char *argv[]) @@ -1054,15 +1098,15 @@ int main(int argc, char *argv[]) struct sigaction sa; unsigned char *ressources=NULL; /* All memory used by us */ - char *dictname = NULL; + const char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; char *depfilename = NULL; unsigned char *bootstrapdict[2]; - int c, cnt; + int c, cnt, hexdump = 0; - const char *optstring = "VvhsI:d:D:c:M:?"; + const char *optstring = "VvhsI:d:D:c:M:x?"; while (1) { #ifdef __GLIBC__ @@ -1077,6 +1121,7 @@ int main(int argc, char *argv[]) {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, {"dependency-dump", 1, NULL, 'M'}, + {"hexdump", 0, NULL, 'x'}, }; /* @@ -1132,11 +1177,17 @@ int main(int argc, char *argv[]) depfilename = optarg; } break; + case 'x': + hexdump = 1; + break; default: return 1; } } + if (!dictname) { + dictname = "bootstrap.dict"; + } if (verbose) { printk(BANNER); printk("Using source dictionary '%s'\n", basedict); @@ -1144,7 +1195,7 @@ int main(int argc, char *argv[]) printk("Dumping dependencies to '%s'\n", depfilename); } - if (argc < optind + 1) { + if (argc < optind) { printk(USAGE, argv[0]); return 1; } @@ -1243,7 +1294,11 @@ int main(int argc, char *argv[]) #endif { relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); - write_dictionary( dictname ? dictname : "bootstrap.dict"); + if (hexdump) { + write_dictionary_hex(dictname); + } else { + write_dictionary(dictname); + } } free(ressources); -- 1.6.2.4

1 0

AIX
by Grieve, Shane 11 Jan '11

11 Jan '11

Any progress on getting AIX to boot I am not a developer but happy to help test and have access to AIX machines.

1 0

Re: [OpenBIOS] [PATCH 0/6] OFMEM/SPARC32 memory fixes
by Artyom Tarasenko 10 Jan '11

10 Jan '11

On Sun, Jan 9, 2011 at 6:56 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patchset fixes up a couple of minor bugs in OFMEM and also fixes up > the SPARC32 memory/virtual-memory properties so that they are similar as > to how they appear under OBP. This furthers Solaris 8 boot in my tests > here. Sounds great! How far do you get it now? -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

2 1

Re: [OpenBIOS] [PATCH 0/6] OFMEM/SPARC32 memory fixes
by Blue Swirl 09 Jan '11

09 Jan '11

On Sun, Jan 9, 2011 at 5:56 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patchset fixes up a couple of minor bugs in OFMEM and also fixes up > the SPARC32 memory/virtual-memory properties so that they are similar as > to how they appear under OBP. This furthers Solaris 8 boot in my tests > here. Passes also my tests, so: Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com>

1 0

[PATCH 6/6] OFMEM: Fix bogus tail entry added to the end of the virtual memory available list.
by Mark Cave-Ayland 09 Jan '11

09 Jan '11

Since top_address is 64-bit, the existing code would incorrectly think that the end of virtual memory had not been reached and so add a bogus tail entry. Casting -1 to ucell should ensure that we pass the correct top address for virtual memory. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/libopenbios/ofmem_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index a2c69f8..ac36fca 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -347,7 +347,7 @@ static void ofmem_update_translations( void ) ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, - &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); + &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, (ucell)-1); ofmem_update_mmu_translations(); } -- 1.7.2.3

1 0