OpenBIOS April 2010

openbios@openbios.org

14 participants
65 discussions

[commit] r737 - trunk/openbios-devel/arch/sparc64

by repository service

Author: mcayland Date: Thu Apr 8 23:22:39 2010 New Revision: 737 URL: http://tracker.coreboot.org/trac/openbios/changeset/737 Log: According to the OF spec, any calls to claim made through the /memory node should not attempt to add a memory translation. This solves a problem in Milax boot whereby the boot loader was attempting to map the address after it had already been done. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Thu Apr 8 23:19:09 2010 (r736) +++ trunk/openbios-devel/arch/sparc64/lib.c Thu Apr 8 23:22:39 2010 (r737) @@ -376,8 +376,6 @@ phys = ofmem_claim_phys(phys, size, align); - ofmem_map(phys, phys, size, -1); - PUSH(phys & 0xffffffffUL); PUSH(phys >> 32); }

10 years, 3 months

[commit] r736 - trunk/openbios-devel/libopenbios

by repository service

Author: mcayland Date: Thu Apr 8 23:19:09 2010 New Revision: 736 URL: http://tracker.coreboot.org/trac/openbios/changeset/736 Log: Fix bug when DEBUG_CIF is enabled and getprop is called with nret set to zero. Originally the code tried to use the size returned from the CIF, but with nret set to zero then the size argument is never pushed onto the stack and so the size would be set to whatever junk was left in the argument block. Change the code to use the size expected by the client instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Mon Apr 5 21:19:37 2010 (r735) +++ trunk/openbios-devel/libopenbios/client.c Thu Apr 8 23:19:09 2010 (r736) @@ -171,7 +171,7 @@ printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[2], pb->args[pb->nargs]); + memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[pb->nargs]);

10 years, 3 months

OpenSolaris starts to live on SPARC64

by Mark Cave-Ayland

Hi all, After all the refactoring work, I got around to re-working the init-program and go words and plugging the new unified ELF loader into the SPARC64 build. And the result? As of SVN r730, I'm pleased to report that the Solaris kernel starts to execute on my Milax test ISO. After typing "go" to execute the loaded ELF image manually, I see a twirly baton rotating on the console for about 0.5s before the inevitable segfault. So it's a small step, but still a great milestone for the OpenBIOS project :D Happy holidays, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

10 years, 3 months

[commit] r732 - in trunk/openbios-devel: forth/system libopenbios

by repository service

Author: mcayland Date: Sat Apr 3 10:25:47 2010 New Revision: 732 URL: http://tracker.coreboot.org/trac/openbios/changeset/732 Log: Fix two errors related to argument passing in the client interface: i) client-call-iface did not set a return value of 0 on success; hence the top stack argument was dropped as part of the status check causing an off-by-one error. ii) instead of setting pb->nret to be the number of arguments returned, the (random) value being passed in was being used to control the number of arguments being returned. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Fri Apr 2 16:25:37 2010 (r731) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Apr 3 10:25:47 2010 (r732) @@ -341,4 +341,5 @@ : client-call-iface ( [args] name len -- [args] -1 | [rets] 0 ) ciface-ph find-method 0= if -1 exit then execute + 0 ; Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Fri Apr 2 16:25:37 2010 (r731) +++ trunk/openbios-devel/libopenbios/client.c Sat Apr 3 10:25:47 2010 (r732) @@ -302,11 +302,11 @@ return -1; } - for( i=0; i<pb->nret && dstackcnt > dstacksave ; i++ ) - pb->args[pb->nargs + i] = POP(); + for( pb->nret=0; dstackcnt > dstacksave ; pb->nret++ ) + pb->args[pb->nargs + pb->nret] = POP(); #ifdef DEBUG_CIF - if( i != pb->nret || dstackcnt != dstacksave ) { + if( dstackcnt != dstacksave ) { printk("service %s: argument count error (%d %d)\n", pb->service, i, dstackcnt - dstacksave ); dstackcnt = dstacksave;

10 years, 4 months

[commit] r735 - trunk/openbios-devel/forth/system

by repository service

Author: mcayland Date: Mon Apr 5 21:19:37 2010 New Revision: 735 URL: http://tracker.coreboot.org/trac/openbios/changeset/735 Log: Fix incorrect stack (dropping one too many items) when a phandle of 0 is passed into getprop CIF. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Mon Apr 5 20:41:11 2010 (r734) +++ trunk/openbios-devel/forth/system/ciface.fs Mon Apr 5 21:19:37 2010 (r735) @@ -92,7 +92,7 @@ then \ return -1 if phandle is 0 (MacOS actually does this) - ?dup 0= if 2drop 2drop -1 exit then + ?dup 0= if drop 2drop -1 exit then over cstrlen swap ?phandle get-package-property if 2drop -1 exit then

10 years, 4 months

[commit] r734 - in trunk/openbios-devel: arch/ppc/qemu config/examples include/arch/ppc

by repository service

Author: mcayland Date: Mon Apr 5 20:41:11 2010 New Revision: 734 URL: http://tracker.coreboot.org/trac/openbios/changeset/734 Log: Partially fix up the OpenBIOS PPC build. While the code technically works, even with this fix in place the PPC console output disappears when booting a FC12 test ISO directly. Interestingly enough, if the equivalent "load" and "go" commands are entered manually then the console output works fine and the ISO can boot?! So there is still an issue with the console not being initialised correctly somewhere. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/arch/ppc/types.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Apr 5 20:41:11 2010 (r734) @@ -472,6 +472,7 @@ { ucell addr; + feval("saved-program-state >sps.entry @"); addr = POP(); call_elf( 0, 0, addr); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Apr 5 20:41:11 2010 (r734) @@ -162,8 +162,6 @@ /* misc */ /************************************************************************/ -extern char _start[], _end[]; - ucell ofmem_arch_default_translation_mode( ucell phys ) { /* XXX: Guard bit not set as it should! */ Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml Mon Apr 5 20:41:11 2010 (r734) @@ -42,7 +42,7 @@ <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> - <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/config/examples/ppc_config.xml Mon Apr 5 20:41:11 2010 (r734) @@ -42,7 +42,7 @@ <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> - <option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/include/arch/ppc/io.h Mon Apr 5 20:41:11 2010 (r734) @@ -6,6 +6,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" +extern char _start, _end; extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sat Apr 3 15:03:39 2010 (r733) +++ trunk/openbios-devel/include/arch/ppc/types.h Mon Apr 5 20:41:11 2010 (r734) @@ -40,6 +40,10 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +#define FMT_elf "%#x" +#define FMT_sizet "%lx" +#define FMT_aout_ehdr "%lx" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3)

10 years, 4 months

[commit] r733 - trunk/openbios-devel/libopenbios

by repository service

Author: mcayland Date: Sat Apr 3 15:03:39 2010 New Revision: 733 URL: http://tracker.coreboot.org/trac/openbios/changeset/733 Log: Another couple of client interface fixes: i) Ensure that the CIF caller's idea of pb->nret is always respected, but if there is a mismatch then log a warning if DEBUG_CIF is enabled, then correct the stack and continue. ii) Correct the code path for call-method and interpret to ensure they ignore the extra status variable pushed onto the stack by client-call-iface. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sat Apr 3 10:25:47 2010 (r732) +++ trunk/openbios-devel/libopenbios/client.c Sat Apr 3 15:03:39 2010 (r733) @@ -245,7 +245,11 @@ push_str( pb->service ); fword("client-call-iface"); - for( i=0; i<pb->nret && dstackcnt > dstacksave; i++ ) { + /* Drop the return code from client-call-iface (status is handled by the + catch result which is the first parameter below) */ + POP(); + + for( i=0; i<pb->nret; i++ ) { val = POP(); pb->args[pb->nargs + i] = val; @@ -253,9 +257,10 @@ if( !i && val ) break; } + #ifdef DEBUG_CIF /* useful for debug but not necessarily an error */ - if( i != pb->nret || dstacksave != dstacksave ) { + if( i != pb->nret || dstackcnt != dstacksave ) { printk("%s '%s': possible argument error (%ld--%ld) got %d\n", pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); } @@ -266,6 +271,7 @@ } printk("\n"); #endif + dstackcnt = dstacksave; return 0; } @@ -279,6 +285,7 @@ if( pb->nargs < 0 || pb->nret < 0 || pb->nargs + pb->nret > PROM_MAX_ARGS) return -1; + #ifdef DEBUG_CIF dump_service(pb); #endif @@ -302,16 +309,21 @@ return -1; } - for( pb->nret=0; dstackcnt > dstacksave ; pb->nret++ ) - pb->args[pb->nargs + pb->nret] = POP(); + for( i=0; i<pb->nret ; i++ ) + pb->args[pb->nargs + i] = POP(); -#ifdef DEBUG_CIF if( dstackcnt != dstacksave ) { - printk("service %s: argument count error (%d %d)\n", +#ifdef DEBUG_CIF + printk("service %s: possible argument error (%d %d)\n", pb->service, i, dstackcnt - dstacksave ); +#endif + /* Some clients request less parameters than the CIF method + returns, e.g. getprop with OpenSolaris. Hence we drop any + stack parameters after issuing a warning above */ dstackcnt = dstacksave; } +#ifdef DEBUG_CIF dump_return(pb); #endif return 0;

10 years, 4 months

Problem solved

by Programmingkid

I finally figured out how to make my '{' word work the they I wanted it to. Here is my last update on this word: : { copyWordName postpone currentWordName begin parse-word dup 0> while 2dup drop " }" comp 0= if exit then 2dup drop " ;" comp 0= if false useTopStackValue ! else currentWordAddr @ currentWordLen @ loadLocalVariable then repeat ; immediate

10 years, 4 months

Update

by Programmingkid

Here is a better version of '{' with another word added. : currentWordName ( -- addr len ) currentWordAddr @ currentWordLen @ ; : { copyWordName begin parse-word dup 0> while 2dup drop " }" comp 0= if exit then 2dup drop " ;" comp 0= if false useTopStackValue ! else currentWordAddr @ currentWordLen @ loadLocalVariable then repeat postpone currentWordName ; immediate

10 years, 4 months

name of current word

by Programmingkid

> Programmingkid wrote: > >>> 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. > > It sounds as if you're working with Forth at quite a low level. Perhaps > you should consider breaking the task down into small chunks and then > posting patches to the list for feedback? Then people can offer more > guidance to help you. > > > ATB, > > Mark. This is what I am trying to do. I am making a word called '{' that will read each symbol after it and load it into memory. Here is my code so far: variable currentWordAddr variable currentWordLen / copies the current words name / must be called at beginning of '{' word : copyWordName ( - addr len) ib >in @ dup alloc-mem swap 2dup >r >r move r> r> currentWordLen ! currentWordAddr ! ; : { copyWordName begin parse-word dup 0> while 2dup drop " }" comp 0= if exit then 2dup drop " ;" comp 0= if false useTopStackValue ! else currentWordAddr @ currentWordLen @ loadLocalVariable then repeat does> copyWordName ; immediate copyWordName simply copies the word name that comes before the '{' and after the ':'. I am trying to make the '{' word have a compile-time behavior of loading each symbol after the '{'. It stops when '}' is encountered. So if this word is being compiled : hi { dog cat hamster } the '{' word will send dog, cat, and hamster to loadLocalVariable. At run-time, it should only call copyWordName to load the current word being ran. I simply don't know how to do both compile and run-time behaviors that I want. Anyone know how to do this? This is my starting point for local variable support in OpenBIOS.

10 years, 4 months