OpenBIOS April 2010

openbios@openbios.org

14 participants
65 discussions

[commit] r731 - trunk/openbios-devel/libc
by repository service 02 Apr '10

02 Apr '10

Author: blueswirl Date: Fri Apr 2 16:25:37 2010 New Revision: 731 URL: http://tracker.coreboot.org/trac/openbios/changeset/731 Log: Fix build CC target/libc/vsprintf.o cc1: warnings being treated as errors ../libc/string.c: In function 'strncasecmp': ../libc/string.c:518: warning: '__res' may be used uninitialized in this function Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libc/string.c Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Fri Apr 2 16:17:45 2010 (r730) +++ trunk/openbios-devel/libc/string.c Fri Apr 2 16:25:37 2010 (r731) @@ -515,7 +515,7 @@ int strncasecmp( const char *cs, const char *ct, size_t count ) { - register signed char __res; + register signed char __res = 0; while (count--) { char ch1 = toupper(*cs), ch2 = toupper(*ct);

1 0

[commit] r730 - in trunk/openbios-devel/arch: sparc32 sparc64 x86
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 16:17:45 2010 New Revision: 730 URL: http://tracker.coreboot.org/trac/openbios/changeset/730 Log: Add an extra linefeed in front of the jump message in (go) to make the debug output a bit tidier. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 16:14:34 2010 (r729) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 16:17:45 2010 (r730) @@ -97,7 +97,7 @@ feval("saved-program-state >sps.file-size @"); size = POP(); - printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { case 0x0: Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 16:14:34 2010 (r729) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 16:17:45 2010 (r730) @@ -89,7 +89,7 @@ feval("saved-program-state >sps.file-size @"); size = POP(); - printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { case 0x0: Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 16:14:34 2010 (r729) +++ trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 16:17:45 2010 (r730) @@ -86,7 +86,7 @@ feval("saved-program-state >sps.file-size @"); size = POP(); - printk("Jumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { case 0x0:

1 0

[commit] r729 - trunk/openbios-devel/arch/sparc64
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 16:14:34 2010 New Revision: 729 URL: http://tracker.coreboot.org/trac/openbios/changeset/729 Log: Enable (go) for SPARC64 and also force register o0 to be 0 as detailed in the OF specification. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Fri Apr 2 16:03:38 2010 (r728) +++ trunk/openbios-devel/arch/sparc64/context.c Fri Apr 2 16:14:34 2010 (r729) @@ -125,6 +125,7 @@ ctx = init_context(image_stack, sizeof image_stack, 0); ctx->pc = entry_point; ctx->npc = entry_point+4; + ctx->regs[REG_O0] = 0; ctx->regs[REG_O0+4] = cif_handler; ctx = switch_to(ctx); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 16:03:38 2010 (r728) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 16:14:34 2010 (r729) @@ -480,6 +480,7 @@ device_end(); bind_func("platform-boot", boot ); + bind_func("(go)", go); } unsigned long isa_io_base;

1 0

[commit] r728 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 forth/debugging
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 16:03:38 2010 New Revision: 728 URL: http://tracker.coreboot.org/trac/openbios/changeset/728 Log: Now that we have a C version of go available, rework client.fs so that it will automatically detect if a platform has execution capability based upon the existence of the lower level (go) word. Also add standard ELF image support to (go) for SPARC32, SPARC64 and x86. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/forth/debugging/client.fs Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 16:03:38 2010 (r728) @@ -107,6 +107,13 @@ break; + case 0x1: + /* Start ELF image */ + entry = (void *) address; + image_retval = entry(romvec, 0, 0, 0, 0); + + break; + case 0x5: /* Start a.out image */ entry = (void *) address; Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 16:03:38 2010 (r728) @@ -20,12 +20,12 @@ uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; +void *boot_notes = NULL; extern int sparc64_of_client_interface( int *params ); static int try_path(const char *path, char *param) { - void *boot_notes = NULL; ucell valid; #ifdef CONFIG_LOADER_ELF @@ -94,7 +94,12 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint64_t)NULL); + image_retval = start_elf(address, (uint64_t)&boot_notes); + break; + + case 0x1: + /* Start ELF image */ + image_retval = start_client_image(address, (uint64_t)&sparc64_of_client_interface); break; case 0x5: Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 16:03:38 2010 (r728) @@ -19,10 +19,10 @@ #include "boot.h" struct sys_info sys_info; +void *boot_notes = NULL; static int try_path(const char *path, char *param) { - void *boot_notes = NULL; ucell valid; #ifdef CONFIG_LOADER_ELF @@ -91,6 +91,11 @@ switch (type) { case 0x0: /* Start ELF boot image */ + image_retval = start_elf(address, (uint32_t)&boot_notes); + break; + + case 0x1: + /* Start ELF image */ image_retval = start_elf(address, (uint32_t)NULL); break; Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 15:29:12 2010 (r727) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 16:03:38 2010 (r728) @@ -97,23 +97,17 @@ ; : go ( -- ) - state-valid @ not if exit then - elf saved-program-state >sps.file-type @ = if -[IFDEF] CONFIG_PPC - saved-program-state >sps.entry @ " (go)" evaluate -[ELSE] - ." go is not yet implemented" -[THEN] + state-valid @ not if + s" No valid state has been set by load or init-program" type cr + exit + then + + \ Call the architecture-specific code to launch the client image + s" (go)" $find if + execute else - xcoff saved-program-state >sps.file-type @ = if -[IFDEF] CONFIG_PPC - saved-program-state >sps.entry @ " (go)" evaluate -[ELSE] - ." go is not yet implemented" -[THEN] - else - ." go is not yet implemented" - then + ." go is not yet implemented" + 2drop then ;

1 0

[commit] r727 - in trunk/openbios-devel/arch: sparc32 sparc64 x86
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 15:29:12 2010 New Revision: 727 URL: http://tracker.coreboot.org/trac/openbios/changeset/727 Log: Since the original boot code had been previously refactored to make use of saved-program-state, we can take the existing code and with only slight modification use it as a C implementation of the go word. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/boot.h Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc32/boot.c Fri Apr 2 15:29:12 2010 (r727) @@ -22,13 +22,14 @@ uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; +static const void *romvec; static int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); -static int try_path(const char *path, char *param, const void *romvec) + +static int try_path(const char *path, char *param) { void *boot_notes = NULL; - ucell valid, address, type, size; - int image_retval = 0; + ucell valid; push_str(path); fword("pathres-resolve-aliases"); @@ -78,6 +79,16 @@ start_image: + go(); + return -1; +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); address = POP(); @@ -122,8 +133,6 @@ } printk("Image returned with return value %#x\n", image_retval); - - return -1; } @@ -132,7 +141,6 @@ char *path = pop_fstr_copy(), *param, altpath[256]; const char *oldpath = path; int unit = 0; - const void *romvec; int result; if(!path) { @@ -209,7 +217,7 @@ else printk("without parameters.\n"); - result = try_path(path, param, romvec); + result = try_path(path, param); if (!result) { push_str(path); PUSH(':'); @@ -218,7 +226,7 @@ POP(); POP(); - try_path(altpath, param, romvec); + try_path(altpath, param); } printk("Unsupported image format\n"); Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc32/boot.h Fri Apr 2 15:29:12 2010 (r727) @@ -19,7 +19,8 @@ // boot.c extern struct sys_info sys_info; extern const char *bootpath; -void boot(void); +extern void boot(void); +extern void go(void); // sys_info.c extern unsigned int qemu_mem_size; Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc64/boot.c Fri Apr 2 15:29:12 2010 (r727) @@ -26,8 +26,7 @@ static int try_path(const char *path, char *param) { void *boot_notes = NULL; - ucell valid, address, type, size; - int image_retval = 0; + ucell valid; #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ @@ -72,6 +71,16 @@ start_image: + go(); + return -1; +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); address = POP(); @@ -85,7 +94,7 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint64_t)boot_notes); + image_retval = start_elf(address, (uint64_t)NULL); break; case 0x5: @@ -112,10 +121,9 @@ } printk("Image returned with return value %#x\n", image_retval); - - return -1; } + void boot(void) { char *path=pop_fstr_copy(), *param; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/sparc64/boot.h Fri Apr 2 15:29:12 2010 (r727) @@ -21,7 +21,8 @@ extern uint64_t qemu_cmdline; extern uint64_t cmdline_size; extern char boot_device; -void boot(void); +extern void boot(void); +extern void go(void); // sys_info.c extern uint64_t qemu_mem_size; Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/x86/boot.c Fri Apr 2 15:29:12 2010 (r727) @@ -23,8 +23,7 @@ static int try_path(const char *path, char *param) { void *boot_notes = NULL; - ucell valid, address, type, size; - int image_retval = 0;; + ucell valid; #ifdef CONFIG_LOADER_ELF /* ELF Boot loader */ @@ -69,6 +68,16 @@ start_image: + go(); + return -1; +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); address = POP(); @@ -109,10 +118,9 @@ } printk("Image returned with return value %#x\n", image_retval); - - return -1; } + void boot(void) { char *path=pop_fstr_copy(), *param; Modified: trunk/openbios-devel/arch/x86/boot.h ============================================================================== --- trunk/openbios-devel/arch/x86/boot.h Fri Apr 2 15:01:10 2010 (r726) +++ trunk/openbios-devel/arch/x86/boot.h Fri Apr 2 15:29:12 2010 (r727) @@ -15,4 +15,5 @@ /* boot.c */ extern struct sys_info sys_info; -void boot(void); +extern void boot(void); +extern void go(void);

1 0

[commit] r726 - in trunk/openbios-devel: forth/debugging include/libopenbios libopenbios
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 15:01:10 2010 New Revision: 726 URL: http://tracker.coreboot.org/trac/openbios/changeset/726 Log: The new loader APIs in libopenbios already have routines to detect the type of executable at a given address and react accordingly. Hence since the loaders are currently written in C, it makes more sense to drop down into C and re-use the same code rather than have a second implementation in Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/initprogram.h trunk/openbios-devel/libopenbios/initprogram.c Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/libopenbios/init.c Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Apr 2 15:01:10 2010 (r726) @@ -16,6 +16,7 @@ \ 7.6.2 Program download and execute + struct ( saved-program-state ) /n field >sps.entry /n field >sps.file-size @@ -32,7 +33,8 @@ : load-size file-size @ ; -variable file-type + +\ File types identified by (init-program) 0 constant elf-boot 1 constant elf @@ -43,289 +45,13 @@ 10 constant fcode 11 constant forth -\ Array indexes and values for e_type - -d# 16 constant EI_NIDENT - -0 constant EI_MAG0 - h# 7f constant ELFMAG0 - -1 constant EI_MAG1 - [CHAR] E constant ELFMAG1 - -2 constant EI_MAG2 - [CHAR] L constant ELFMAG2 - -3 constant EI_MAG3 - [CHAR] F constant ELFMAG3 - -4 constant EI_CLASS - 0 constant ELFCLASSNONE - 1 constant ELFCLASS32 - 2 constant ELFCLASS64 - -5 constant EI_DATA - 0 constant ELFDATANONE - 1 constant ELFDATA2LSB - 2 constant ELFDATA2MSB - -6 constant EI_VERSION - 0 constant EV_NONE - 1 constant EV_CURRENT - -\ Values for e_type - -0 constant ET_NONE -1 constant ET_REL -2 constant ET_EXEC -3 constant ET_DYN -4 constant ET_CORE - -\ Values for e_machine - -d# 2 constant EM_SPARC -d# 3 constant EM_386 -d# 6 constant EM_486 -d# 18 constant EM_SPARC32PLUS -d# 20 constant EM_PPC -d# 43 constant EM_SPARCV9 - -/l constant Elf32_Addr -/w constant Elf32_Half -/l constant Elf32_Off -/l constant Elf32_Sword -/l constant Elf32_Word -/l constant Elf32_Size - -struct ( ELF header ) - EI_NIDENT field >Elf32_Ehdr.e_ident ( File identification ) - Elf32_Half field >Elf32_Ehdr.e_type ( File type ) - Elf32_Half field >Elf32_Ehdr.e_machine ( Machine archicture ) - Elf32_Word field >Elf32_Ehdr.e_version ( ELF format version ) - Elf32_Addr field >Elf32_Ehdr.e_entry ( Entry point ) - Elf32_Off field >Elf32_Ehdr.e_phoff ( Program header file offset ) - Elf32_Off field >Elf32_Ehdr.e_shoff ( Section header file offset ) - Elf32_Word field >Elf32_Ehdr.e_flags ( Architecture specific flags ) - Elf32_Half field >Elf32_Ehdr.e_ehsize ( Size of ELF header in bytes ) - Elf32_Half field >Elf32_Ehdr.e_phentsize ( Size of program header entries ) - Elf32_Half field >Elf32_Ehdr.e_phnum ( Number of program header entry ) - Elf32_Half field >Elf32_Ehdr.e_shentsize ( Size of section header entry ) - Elf32_Half field >Elf32_Ehdr.e_shnum ( Number of section header entries ) - Elf32_Half field >Elf32_Ehdr.e_shstrndx ( Section name strings section ) -constant /Elf32_Ehdr - -: @e_ident ( base index -- byte ) - swap >Elf32_Ehdr.e_ident + c@ -; - -: @e_type ( base -- type ) - >Elf32_Ehdr.e_type w@ -; - -: @e_machine ( base -- type ) - >Elf32_Ehdr.e_machine w@ -; - -: @e_entry ( base -- entry ) - >Elf32_Ehdr.e_entry l@ -; - -: @e_phoff ( base -- poffset ) - >Elf32_Ehdr.e_phoff l@ -; - -: @e_phnum ( base -- pnum ) - >Elf32_Ehdr.e_phnum w@ -; - -: elf? - " load-base" evaluate - dup EI_MAG0 @e_ident - ELFMAG0 <> if drop false exit then - dup EI_MAG1 @e_ident - ELFMAG1 <> if drop false exit then - dup EI_MAG2 @e_ident - ELFMAG2 <> if drop false exit then - dup EI_MAG3 @e_ident - ELFMAG3 <> if drop false exit then - dup EI_CLASS @e_ident -[IFDEF] CONFIG_SPARC64 - ELFCLASS64 <> if drop false exit then -[ELSE] - ELFCLASS32 <> if drop false exit then -[THEN] - dup EI_DATA @e_ident - " little-endian?" evaluate if - ELFDATA2LSB <> if drop false exit then - else - ELFDATA2MSB <> if drop false exit then - then - dup @e_type - ET_EXEC <> if drop false exit then ( not executable ) - @e_machine -[IFDEF] CONFIG_PPC - EM_PPC <> if false exit then -[THEN] -[IFDEF] CONFIG_X86 - dup - EM_386 <> if - EM_486 <> if - false exit - then - else - drop - then -[THEN] -[IFDEF] CONFIG_SPARC32 - dup - EM_SPARC <> if - EM_SPARC32PLUS <> if - false exit - then - else - drop - then -[THEN] -[IFDEF] CONFIG_SPARC64 - EM_SPARCV9 <> if false exit then -[THEN] - true - ; - -variable elf-entry -variable xcoff-entry -variable bootinfo-entry -variable bootinfo-size - -: init-program-elf - elf file-type ! - " /packages/elf-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/elf-loader is missing" cr - then -; - -: xcoff? - " load-base" evaluate w@ - h# 1df <> if - false - exit - then - true - ; - -: init-program-xcoff - xcoff file-type ! - " /packages/xcoff-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/xcoff-loader is missing" cr - then - ; - -: pe? - false -; - -: init-program-pe - pe file-type ! - " /packages/pe-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/pe-loader is missing" cr - then - ; - -: bootinfo? - " load-base" evaluate dup - " <CHRP-BOOT>" comp 0= if - drop - true - exit - then - " <chrp-boot>" comp 0= if - true - exit - then - false - ; - -: init-program-bootinfo - bootinfo file-type ! - " /packages/bootinfo-loader" open-dev dup if - dup - " init-program" rot $call-method - close-dev - else - drop - ." /packages/bootinfo-loader is missing" cr - then - ; - -: fcode? - " load-base" evaluate c@ - dup h# f0 = if \ start0 - drop - true - exit - then - dup h# f1 = if \ start1 - drop - true - exit - then - dup h# f2 = if \ start2 - drop - true - exit - then - dup h# f3 = if \ start4 - drop - true - exit - then - h# fd = if \ version1 - true - exit - then - false - ; - -: init-program-fcode - " load-base" evaluate 8 + - 1 byte-load - ; : init-program ( -- ) - elf? if - init-program-elf - exit - then - xcoff? if - init-program-xcoff - exit - then - pe? if - init-program-pe - exit - then - bootinfo? if - init-program-bootinfo - exit - then - fcode? if - init-program-fcode - exit + \ Call down to the lower level for relocation etc. + s" (init-program)" $find if + execute + else + s" Unable to locate (init-program)!" type cr then ; @@ -372,29 +98,21 @@ : go ( -- ) state-valid @ not if exit then - elf file-type @ = if + elf saved-program-state >sps.file-type @ = if [IFDEF] CONFIG_PPC - elf-entry @ " (go)" evaluate + saved-program-state >sps.entry @ " (go)" evaluate [ELSE] ." go is not yet implemented" [THEN] else - xcoff file-type @ = if + xcoff saved-program-state >sps.file-type @ = if [IFDEF] CONFIG_PPC - xcoff-entry @ " (go)" evaluate + saved-program-state >sps.entry @ " (go)" evaluate [ELSE] ." go is not yet implemented" [THEN] else - bootinfo file-type @ = if -[IFDEF] CONFIG_PPC - bootinfo-entry @ bootinfo-size @ evaluate -[ELSE] - ." go is not yet implemented" -[THEN] - else - ." go is not yet implemented" - then + ." go is not yet implemented" then then ; Added: trunk/openbios-devel/include/libopenbios/initprogram.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/initprogram.h Fri Apr 2 15:01:10 2010 (r726) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/04/02 13:00:00 mcayland> + * Time-stamp: <2010/04/02 13:00:00 mcayland> + * + * <initprogram.h> + * + * C implementation of (init-program) word + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_INITPROGRAM +#define _H_INITPROGRAM + +extern void init_program(void); + +#endif /* _H_INITPROGRAM */ Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/libopenbios/aout_load.c Fri Apr 2 15:01:10 2010 (r726) @@ -10,7 +10,6 @@ #define CONFIG_SPARC64_PAGE_SIZE_8KB #endif -#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "libopenbios/bindings.h" #include "libopenbios/aout_load.h" Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 15:01:10 2010 (r726) @@ -13,6 +13,7 @@ <object source="fcode_load.c" condition="LOADER_FCODE"/> <object source="forth_load.c" condition="LOADER_FORTH"/> <object source="init.c"/> + <object source="initprogram.c"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> Modified: trunk/openbios-devel/libopenbios/init.c ============================================================================== --- trunk/openbios-devel/libopenbios/init.c Fri Apr 2 13:41:35 2010 (r725) +++ trunk/openbios-devel/libopenbios/init.c Fri Apr 2 15:01:10 2010 (r726) @@ -16,9 +16,12 @@ #include "config.h" #include "libopenbios/openbios.h" +#include "libopenbios/bindings.h" +#include "libopenbios/initprogram.h" void openbios_init( void ) { - // TODO + // Bind the C implementation of (init-program) into Forth + bind_func("(init-program)", init_program); } Added: trunk/openbios-devel/libopenbios/initprogram.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/initprogram.c Fri Apr 2 15:01:10 2010 (r726) @@ -0,0 +1,85 @@ +/* + * Creation Date: <2010/04/02 13:00:00 mcayland> + * Time-stamp: <2010/04/02 13:00:00 mcayland> + * + * <initprogram.c> + * + * C implementation of (init-program) word + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libopenbios/bindings.h" +#include "libopenbios/initprogram.h" + +/* Because the a.out loader requires platform-specific headers */ +#ifdef CONFIG_LOADER_AOUT +#include "libopenbios/aout_load.h" +#endif + +#include "libopenbios/bootinfo_load.h" +#include "libopenbios/elf_load.h" +#include "libopenbios/fcode_load.h" +#include "libopenbios/forth_load.h" +#include "libopenbios/xcoff_load.h" + + +void init_program(void) +{ + /* Get the value of load-base and use it to determine the correct loader + to use */ + ucell addr; + + feval("load-base"); + addr = POP(); + +#ifdef CONFIG_LOADER_AOUT + if (is_aout((struct exec *)addr)) { + aout_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_BOOTINFO + if (is_bootinfo((char *)addr)) { + bootinfo_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_ELF + if (is_elf((Elf_ehdr *)addr)) { + elf_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_FCODE + if (is_fcode((unsigned char *)addr)) { + fcode_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_FORTH + if (is_forth((char *)addr)) { + forth_init_program(); + return; + } +#endif + +#ifdef CONFIG_LOADER_XCOFF + if (is_xcoff((COFF_filehdr_t *)addr)) { + xcoff_init_program(); + return; + } +#endif + +}

1 0

[commit] r725 - in trunk/openbios-devel: arch/amd64 arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 include/libopenbios libopenbios
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 13:41:35 2010 New Revision: 725 URL: http://tracker.coreboot.org/trac/openbios/changeset/725 Log: Create an initialisation function called openbios_init(), similar to modules_init(), for use by libopenbios and make sure all architectures are updated to use it. This is required to allow binding of C functions into Forth by libopenbios (i.e. cross architecture) rather than having to update everything in every arch/*/ initialisation file. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/openbios.h trunk/openbios-devel/libopenbios/init.c Modified: trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/amd64/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" @@ -38,6 +39,7 @@ { void setup_timers(void); + openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_IDE setup_timers(); Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/briq/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -20,6 +20,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "arch/common/nvram.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/mol/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -16,6 +16,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "arch/common/nvram.h" #include "mol/mol.h" @@ -86,6 +87,7 @@ devtree_init(); node_methods_init(); nvram_init("/pci/mac-io/nvram"); + openbios_init(); modules_init(); pseudodisk_init(); osiblk_init(); Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -21,6 +21,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "arch/common/nvram.h" #include "pearpc/pearpc.h" @@ -94,6 +95,7 @@ devtree_init(); nvram_init("/pci/mac-io/nvram"); + openbios_init(); modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -21,6 +21,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "arch/common/nvram.h" @@ -490,6 +491,7 @@ ofmem_t *ofmem = ofmem_arch_get_private(); + openbios_init(); modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/sparc32/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "asm/types.h" @@ -130,6 +131,7 @@ static void arch_init( void ) { + openbios_init(); modules_init(); ob_init_mmu(); ob_init_iommu(hwdef->iommu_base); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "dict.h" @@ -470,6 +471,7 @@ static void arch_init( void ) { + openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/unix/unix.c Fri Apr 2 13:41:35 2010 (r725) @@ -32,6 +32,7 @@ #include "kernel/stack.h" #include "arch/unix/plugins.h" #include "libopenbios/bindings.h" +#include "libopenbios/openbios.h" #include "openbios-version.h" #include "blk.h" @@ -358,6 +359,7 @@ static void arch_init( void ) { + openbios_init(); modules_init(); if(diskemu!=-1) blk_init(); Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/arch/x86/openbios.c Fri Apr 2 13:41:35 2010 (r725) @@ -7,6 +7,7 @@ */ #include "config.h" +#include "libopenbios/openbios.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" @@ -50,6 +51,7 @@ { void setup_timers(void); + openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_PCI arch = &default_pci_host; Added: trunk/openbios-devel/include/libopenbios/openbios.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/openbios.h Fri Apr 2 13:41:35 2010 (r725) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/04/02 12:00:00 mcayland> + * Time-stamp: <2010/04/02 12:00:00 mcayland> + * + * <openbios.h> + * + * General OpenBIOS initialization + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_LIBOPENBIOS +#define _H_LIBOPENBIOS + +extern void openbios_init( void ); + +#endif /* _H_LIBOPENBIOS */ Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 12:28:48 2010 (r724) +++ trunk/openbios-devel/libopenbios/build.xml Fri Apr 2 13:41:35 2010 (r725) @@ -12,6 +12,7 @@ <object source="font_8x16.c" condition="FONT_8X16"/> <object source="fcode_load.c" condition="LOADER_FCODE"/> <object source="forth_load.c" condition="LOADER_FORTH"/> + <object source="init.c"/> <object source="ipchecksum.c"/> <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> Added: trunk/openbios-devel/libopenbios/init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/init.c Fri Apr 2 13:41:35 2010 (r725) @@ -0,0 +1,24 @@ +/* + * Creation Date: <2010/04/02 12:00:00 mcayland> + * Time-stamp: <2010/04/02 12:00:00 mcayland> + * + * <init.c> + * + * OpenBIOS intialization + * + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "config.h" +#include "libopenbios/openbios.h" + +void +openbios_init( void ) +{ + // TODO +}

1 0

input length
by Artyom Tarasenko 02 Apr '10

02 Apr '10

Meanwhile qemu-system-sparc is good enough to boot most Solaris versions with OBP. ( http://tyom.blogspot.com/2009/12/solaris-under-qemu-how-to.html ) I'm trying to find out what is missing in OpenBIOS to do the same. Currently the boot just hangs. I did a wild guess: $ strings sun4m/ufsboot ... ['] find-device catch if 2drop true else current-device device-end then swap l! ... It looks like all the keywords are known to the OpenBIOS, but I can't input the test string: " /options" ['] find-device catch if 2drop true else current-device device-end then swap l! it is longer than 80 characters, and OpenBIOS lets me enter only the part of the string up to "device-end t". The questions are: - is it just an interactive command line limitation, or an api limitation? - where is it defined? I couldn't find anything useful with grep -r 80 . - is there a forth debugger in OpenBIOS? -- Regards, Artyom Tarasenko solaris/sparc under qemu progress: http://tyom.blogspot.com/

3 6

Re: [OpenBIOS] name of current word
by Programmingkid 02 Apr '10

02 Apr '10

>> Is there a word that can tell me the name of the current word that is executing? >> >> I want something like this: >> >> : myword >> obtainWord >> ; >> >> obtainWord would somehow return "myword". Any tips would be great. > > No, I don't think this is really possible because of the way in which > Forth works (at least I ended up using a different solution for the > debugger anyway). > > Is there a reason that you're not using the in-built debugger for this? > I'm fairly sure it would make your life much easier. I'm making code that will associate a value with a function name and will store both in a table. Thank you Mark and Stefan for helping.

2 1

[commit] r724 - trunk/openbios-devel/libopenbios
by repository service 02 Apr '10

02 Apr '10

Author: mcayland Date: Fri Apr 2 12:28:48 2010 New Revision: 724 URL: http://tracker.coreboot.org/trac/openbios/changeset/724 Log: Finish the use of saved-program-state within the loaders. This involves 2 changes: firstly ensure that the saved-program-state is being set correctly in all of the loaders, and secondly we change the bootinfo loader so that the bootscript is executed as part of init-program and not go. This seems to reflect the idea of execute-buffer in OpenBOOT that any Forth code is executed directly during init-program, rather than being deferred to go. Note: the latter change is fairly simple, but I have been unable to test it myself other than verifying it compiles. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/libopenbios/xcoff_load.c Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootinfo_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/bootinfo_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -126,7 +126,7 @@ char *base; int proplen; phandle_t chosen; - int tag, taglen, script, scriptlen, entity, chrp; + int tag, taglen, script, scriptlen, scriptvalid, entity, chrp; char tagbuf[128], c; char *device, *filename, *directory; int partition; @@ -135,7 +135,7 @@ char *tmp; char bootpath[1024]; - feval("0 state-valid !"); + /* Parse the boot script */ chosen = find_dev("/chosen"); tmp = get_property(chosen, "bootpath", &proplen); @@ -169,6 +169,7 @@ tag = 0; taglen = 0; script = 0; + scriptvalid = 0; scriptlen = 0; entity = 0; current = 0; @@ -197,7 +198,7 @@ DPRINTF("got bootscript %s\n", bootscript); - feval("-1 state-valid !"); + scriptvalid = -1; break; } else if (strncasecmp(tagbuf, "/chrp-boot", 10) == 0) @@ -246,7 +247,10 @@ bootscript[scriptlen++] = c; } } - /* FIXME: should initialize saved-program-state. */ - push_str(bootscript); - feval("bootinfo-size ! bootinfo-entry !"); + + /* If the payload is bootinfo then we execute it immediately */ + if (scriptvalid) + feval(bootscript); + else + DPRINTF("Unable to parse bootinfo bootscript\n"); } Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/elf_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -473,7 +473,7 @@ int i; Elf_ehdr *ehdr; Elf_phdr *phdr; - size_t size; + size_t size, total_size = 0; char *addr; cell tmp; @@ -483,6 +483,12 @@ base = (char*)POP(); ehdr = (Elf_ehdr *)base; + + if (!is_elf(ehdr)) { + debug("Not a valid ELF memory image\n"); + return; + } + phdr = (Elf_phdr *)(base + ehdr->e_phoff); for (i = 0; i < ehdr->e_phnum; i++) { @@ -508,12 +514,20 @@ addr = (char *)tmp; memcpy(addr, base + phdr[i].p_offset, size); + + total_size += size; + #ifdef CONFIG_PPC flush_icache_range( addr, addr + size ); #endif } - /* FIXME: should initialize saved-program-state. */ + + // Initialise saved-program-state PUSH(ehdr->e_entry); - feval("elf-entry !"); + feval("saved-program-state >sps.entry !"); + PUSH(total_size); + feval("saved-program-state >sps.file-size !"); + feval("elf saved-program-state >sps.file-type !"); + feval("-1 state-valid !"); } Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/fcode_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -95,6 +95,12 @@ fword("load-base"); address = POP(); + + if (!is_fcode((unsigned char *)address)) { + debug("Not a valid Fcode memory image\n"); + return; + } + PUSH(address); PUSH(1); fword("byte-load"); Modified: trunk/openbios-devel/libopenbios/xcoff_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/xcoff_load.c Fri Apr 2 11:18:51 2010 (r723) +++ trunk/openbios-devel/libopenbios/xcoff_load.c Fri Apr 2 12:28:48 2010 (r724) @@ -58,6 +58,7 @@ COFF_aouthdr_t *ahdr; COFF_scnhdr_t *shdr; uint32_t offset; + size_t total_size = 0; int i; feval("0 state-valid !"); @@ -112,6 +113,7 @@ memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, shdr->s_size); + total_size += shdr->s_size; #ifdef CONFIG_PPC flush_icache_range((char*)shdr->s_vaddr, (char*)(shdr->s_vaddr + shdr->s_size)); @@ -120,22 +122,26 @@ memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, shdr->s_size); + total_size += shdr->s_size; } else if (strcmp(shdr->s_name, ".bss") == 0) { memset((void *)shdr->s_vaddr, 0, shdr->s_size); - + total_size += shdr->s_size; } else { DPRINTF(" Skip '%s' section\n", shdr->s_name); } offset += sizeof(COFF_scnhdr_t); } - /* FIXME: should initialize saved-program-state. */ - DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); + + // Initialise saved-program-state PUSH(*(uint32_t*)ahdr->entry); - feval("xcoff-entry !"); + feval("saved-program-state >sps.entry !"); + PUSH(total_size); + feval("saved-program-state >sps.file-size !"); + feval("xcoff saved-program-state >sps.file-type !"); feval("-1 state-valid !"); }

1 0