OpenBIOS December 2009

openbios@openbios.org

19 participants
44 discussions

r642 - trunk/openbios-devel/forth/device
by svn＠openbios.org 09 Dec '09

09 Dec '09

Author: mcayland Date: 2009-12-09 19:44:01 +0100 (Wed, 09 Dec 2009) New Revision: 642 Modified: trunk/openbios-devel/forth/device/other.fs Log: Correct Forth data stack when the alarm word is used (the implementation is currently missing, but we'll worry about that a bit later). This allows us to proceed further with SPARC64 boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/device/other.fs =================================================================== --- trunk/openbios-devel/forth/device/other.fs 2009-12-09 01:09:48 UTC (rev 641) +++ trunk/openbios-devel/forth/device/other.fs 2009-12-09 18:44:01 UTC (rev 642) @@ -96,6 +96,7 @@ ; : alarm ( xt n -- ) + 2drop ; : user-abort ( ... -- ) ( R: ... -- )

1 0

PATCH: RFC: Rework control flow stack words to use 2 data stack items
by Mark Cave-Ayland 09 Dec '09

09 Dec '09

Hi all, After some more debugging this weekend, I've found that r638 is not the correct fix for resolving backwards branches. Re-reading the OF spec lots of times and searching the internet for information on the Forth control flow stack has now changed my understanding of how this should work. Currently, OpenBIOS uses 1 stack item per control flow stack item which works fine when executing control flow words directly in the interpreter. However, Fcode evaluation requires slightly different semantics for bbranch and b?branch (since they can be used as part of different control flow words with slightly different behaviours) and so in order for this to work, we also need to know the *type* of a control flow stack item. In particular, we need to know if it is a source address or a dest address in order to be able to resolve nested control flow statements correctly. Please find attached my current working patch for extending the control flow stack so that each item now takes 2 data stack words: an address, followed by an address type. I have a separate patch for the Fcode evaluator, which when applied in conjunction with this patch actually gets to the point where it attempts to read the file from the ISO image. Nice. However, since this patch involves some reasonably low level tinkering, I'd like to put it out for review first. Please can people with some Forth experience (e.g. Stefan, Tarl, Laurent) take a look at this and check that it's okay to apply? ATB, 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

1 1

r641 - in trunk/openbios-devel/forth: bootstrap device
by svn＠openbios.org 09 Dec '09

09 Dec '09

Author: mcayland Date: 2009-12-09 02:09:48 +0100 (Wed, 09 Dec 2009) New Revision: 641 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/device/fcode.fs Log: Revert r638, apply previous patch to extend control flow stack items to 2 data stack items, and fix the Fcode evaluator to use this new information to correctly resolve destination (b<mark) references. See the email archives for further discussion on why this is required. Hopefully this should finally resolve the Fcode backward branch problem; at least all previous incorrect resolutions now appear correct and the Fcode evaluator no longer crashes or gets stuck in a loop while attempting to boot Milax. Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-12-05 10:13:17 UTC (rev 640) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-12-09 01:09:48 UTC (rev 641) @@ -159,15 +159,20 @@ \ 7.3.8.1 Conditional branches \ -: resolve-orig here over /n + - swap ! ; -: (if) ['] do?branch , here 0 , ; compile-only +\ A control stack entry is implemented using 2 data stack items +\ of the form ( addr type ). type can be one of the +\ following: +\ 0 - orig +\ 1 - dest +\ 2 - do-sys + +: resolve-orig here nip over /n + - swap ! ; +: (if) ['] do?branch , here 0 0 , ; compile-only : (then) resolve-orig ; compile-only variable tmp-comp-depth -1 tmp-comp-depth ! variable tmp-comp-buf 0 tmp-comp-buf ! -variable cstack-startdepth -1 cstack-startdepth ! \ start depth of the cstack - : setup-tmp-comp ( -- ) state @ 0 = (if) here tmp-comp-buf @ here! , \ save here and switch to tmp directory @@ -175,20 +180,9 @@ depth tmp-comp-depth ! \ save control depth ] (then) - - \ If start of new execution context, record the location of the bottom - \ of the new cstack (required for backwards Fcode branches) - cstack-startdepth @ -1 = (if) - depth cstack-startdepth ! - (then) ; : execute-tmp-comp ( -- ) - \ If at the end of this execution context, reset cstack location - depth cstack-startdepth @ = (if) - -1 cstack-startdepth ! - (then) - depth tmp-comp-depth @ = (if) -1 tmp-comp-depth ! @@ -200,9 +194,9 @@ (then) ; -: if setup-tmp-comp ['] do?branch , here 0 , ; immediate +: if setup-tmp-comp ['] do?branch , here 0 0 , ; immediate : then resolve-orig execute-tmp-comp ; compile-only -: else ['] dobranch , here 0 , swap resolve-orig ; compile-only +: else ['] dobranch , here 0 0 , 2swap resolve-orig ; compile-only \ \ 7.3.8.3 Conditional loops @@ -215,42 +209,66 @@ : (while) ; : (repeat) ; -: resolve-dest here /n + - , ; +\ resolve-dest requires a loop... +: (resolve-dest) here /n + nip - , ; +: (resolve-begin) setup-tmp-comp ['] (begin) , here 1 ; immediate +: (resolve-until) ['] (until) , ['] do?branch , (resolve-dest) execute-tmp-comp ; compile-only -: begin +: resolve-dest ( dest origN ... orig ) + 2 >r + (resolve-begin) + \ Find topmost control stack entry with a type of 1 (dest) + r> dup dup pick 1 = if + \ Move it to the top + roll + swap 1 - roll + \ Resolve it + (resolve-dest) + 1 \ force exit + else + drop + 2 + >r + 0 + then + (resolve-until) +; + +: begin setup-tmp-comp ['] (begin) , - here + here + 1 ; immediate - -: again + +: again ['] (again) , ['] dobranch , resolve-dest execute-tmp-comp ; compile-only - -: until + +: until ['] (until) , ['] do?branch , - resolve-dest + resolve-dest execute-tmp-comp ; compile-only - + : while setup-tmp-comp ['] (while) , ['] do?branch , - here 0 , swap + here 0 0 , 2swap ; immediate - -: repeat + +: repeat ['] (repeat) , ['] dobranch , resolve-dest resolve-orig execute-tmp-comp ; compile-only + \ \ 7.3.8.4 Counted loops \ @@ -267,13 +285,14 @@ here over - \ -- *leaves leaves here-leaves swap ! \ -- *leaves repeat - here - , + here nip - , leaves ! ; -: do +: do setup-tmp-comp - leaves @ here + leaves @ + here 2 ['] (do) , 0 leaves ! ; immediate @@ -282,7 +301,7 @@ setup-tmp-comp leaves @ ['] (?do) , - here + here 2 here leaves ! 0 , ; immediate @@ -299,6 +318,7 @@ execute-tmp-comp ; immediate + \ Using primitive versions of i and j \ speeds up loops by 300% \ : i r> r@ swap >r ; @@ -325,15 +345,15 @@ 0 ; immediate -: endcase +: endcase ['] drop , - 0 ?do + 0 ?do ['] then execute loop execute-tmp-comp ; immediate -: of +: of 1 + >r ['] over , ['] = , @@ -342,13 +362,12 @@ r> ; immediate -: endof +: endof >r ['] else execute r> ; immediate - \ \ 7.3.8.5 Other control flow commands \ Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-12-05 10:13:17 UTC (rev 640) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-12-09 01:09:48 UTC (rev 641) @@ -451,15 +451,13 @@ : bbranch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes ['] dobranch , - \ Backwards branches are resolved from the bottom of the cstack - depth cstack-startdepth @ 1+ - roll resolve-dest execute-tmp-comp else setup-tmp-comp ['] dobranch , - here + here 0 0 , - swap + 2swap then ; immediate @@ -470,13 +468,11 @@ : b?branch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes ['] do?branch , - \ Backwards branches are resolved from the bottom of the cstack - depth cstack-startdepth @ 1+ - roll resolve-dest execute-tmp-comp else setup-tmp-comp ['] do?branch , - here + here 0 0 , then ; immediate @@ -487,7 +483,7 @@ : b(<mark) setup-tmp-comp - here + here 1 ; immediate

1 0

Re: [OpenBIOS] [Qemu-devel] Staging update (0.12 pending freeze)
by Aurelien Jarno 07 Dec '09

07 Dec '09

On Wed, Dec 02, 2009 at 10:46:11AM -0600, Anthony Liguori wrote: > I've got all of the patches I'm considering for 0.12 currently in > staging. I'm going to work through and test/commit these in a few > chunks over the next few days before freezing the tree. > What are the plans on the OpenBIOS side? The version currently included in QEMU is old compared to the SVN. Is it plan to sync a release of OpenBIOS with QEMU? -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

2 6

Re: [OpenBIOS] r640 - trunk/openbios-devel/arch/sparc64
by Mark Cave-Ayland 07 Dec '09

07 Dec '09

svn(a)openbios.org wrote: > Author: blueswirl > Date: 2009-12-05 11:13:17 +0100 (Sat, 05 Dec 2009) > New Revision: 640 > > Modified: > trunk/openbios-devel/arch/sparc64/lib.c > Log: > Revert r639, fix mem_claim (Igor Kovalenko) and mem_release Thanks a lot guys - this works, and has enabled me to get much further with my testing over the weekend (see next email). ATB, 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

1 0

Cross-compiling and testing sparc64 on Mac OS X
by Andreas Färber 06 Dec '09

06 Dec '09

Hello guys, It's awesome seeing you've made some progress towards emulating Solaris/sparc64! However trying myself, compiling on Mac OS X (after making sure that NEED_INT128_T is defined) fails with the following error: HOSTCC host/kernel/bootstrap.o In file included from ../include/openbios/sysinclude.h:7, from ../kernel/bootstrap.c:9: /usr/include/stdlib.h:267: error: syntax error before ‘arc4random’ make[1]: *** [host/kernel/bootstrap.o] Error 1 The return type of arc4random is u_int32_t, which is defined (in my case) in <ppc/types.h>. Not sure what goes wrong there. I thought it could be a name clash with OpenBIOS' __TYPES_H (malc would be furious!), but - luckily - Apple uses __TYPES_H_ for their _types.h. Anyway, not having these functions declared by defining _POSIX_C_SOURCE made the compilation proceed with only one warning: HOSTCC host/kernel/bootstrap.o ../kernel/bootstrap.c: In function ‘interpret_source’: ../kernel/bootstrap.c:529: warning: implicit declaration of function ‘strcasecmp’ If I symlink .../share/qemu/openbios-sparc64 to .../obj-sparc64/ openbios-builtin.elf (or copy it over) I get this at runtime: qemu: fatal: Trap 0x0010 while trap level (5) >= MAXTL (5), Error state pc: 0000000000004200 npc: 0000000000004204 General Registers: %g0: 0000000000000000 %g1: 0000000000000000 %g2: 0000000008000000 %g3: 0000000000000000 %g4: 0000000000000000 %g5: 0000000000000000 %g6: 0000000000000000 %g7: 0000000000000000 Current Register Window: %o0: 00000000ffe00000 %o1: 00000000ffe01000 %o2: 000001fff0100000 %o3: 000001fff0000000 %o4: 0000000000000000 %o5: 0000000000000000 %o6: 0000000000000000 %o7: 000001ff00000000 %l0: 0000000007e80000 %l1: 000001ff00000000 %l2: 000001fff0080000 %l3: 0000000000000000 %l4: 0000000000000000 %l5: 0000000000000000 %l6: 0000000000000000 %l7: 0000000000000000 %i0: 0000000000000000 %i1: 0000000000000000 %i2: 0000000000000000 %i3: 0000000000000000 %i4: 0000000000000000 %i5: 0000000000000000 %i6: 0000000000000000 %i7: 0000000000000000 Floating Point Registers: %f00: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f04: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f08: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f12: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f16: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f20: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f24: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f28: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 pstate: 0x00000015 ccr: 0x99 asi: 0x00 tl: 5 fprs: 0 cansave: 6 canrestore: 0 otherwin: 0 wstate 0 cleanwin 6 cwp 7 fsr: 0x00000000 ../qemu-solaris-sparc.command: line 3: 3289 Abort trap / Users/andreas/Q/latest/bin/qemu-system-sparc64 -nographic -boot d - cdrom /Users/andreas/Q/sol-10-u3-ga-sparc-dvd.iso This looks different from what you've posted and is identical with QEMU's version of openbios-sparc64. Same with or without -nographic. Any ideas? Regards, Andreas

3 10

Re: [OpenBIOS] r638 - in trunk/openbios-devel/forth: bootstrap device
by Nick Couchman 05 Dec '09

05 Dec '09

>>> On 2009/12/03 at 08:47, <svn(a)openbios.org> wrote: > Author: mcayland > Date: 2009-12-03 16:47:39 +0100 (Thu, 03 Dec 2009) > New Revision: 638 > > Modified: > trunk/openbios-devel/forth/bootstrap/bootstrap.fs > trunk/openbios-devel/forth/device/fcode.fs > Log: > Fix backwards Fcode branches (bbranch and b?branch). > > According to the specification, the destination for a backwards Fcode branch > must be resolved from the bottom rather than the > top of the cstack. The existing version of the code was simply doing a swap, > and so nesting any branches within a backward branch > would fail since the wrong destination would be resolved from the stack. > > This patch adds a new cstack-startdepth variable to keep track of the cstack > base location within an execution context > (setup-tmp-comp and execute-tmp-comp) and alters the backward branches to make > use of it. > > With this patch in place, Milax under Qemu doesn't crash anymore but sits in > an infinite loop reading sectors from the CDROM. > > The Solaris Nevada code still gets the unhandled exception in cfetch. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

5 16

r640 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 05 Dec '09

05 Dec '09

Author: blueswirl Date: 2009-12-05 11:13:17 +0100 (Sat, 05 Dec 2009) New Revision: 640 Modified: trunk/openbios-devel/arch/sparc64/lib.c Log: Revert r639, fix mem_claim (Igor Kovalenko) and mem_release Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-12-04 22:01:12 UTC (rev 639) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-12-05 10:13:17 UTC (rev 640) @@ -261,6 +261,8 @@ size = POP(); virt = POP(); phys = POP(); + phys <<= 32; + phys |= POP(); ofmem_map(phys, virt, size, mode); } @@ -376,8 +378,8 @@ ofmem_map(phys, phys, size, -1); + PUSH(phys & 0xffffffffUL); PUSH(phys >> 32); - PUSH(phys & 0xffffffffUL); } /* ( phys size --- ) */ @@ -388,6 +390,8 @@ size = POP(); phys = POP(); + phys <<= 32; + phys |= POP(); ofmem_release_phys(phys, size); }

1 0

Re: [OpenBIOS] r639 - trunk/openbios-devel/arch/sparc64
by Nick Couchman 04 Dec '09

04 Dec '09

>>> On 2009/12/04 at 15:01, <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2009-12-04 23:01:12 +0100 (Fri, 04 Dec 2009) > New Revision: 639 > > Modified: > trunk/openbios-devel/arch/sparc64/lib.c > Log: > Sparc64: fix mmu_map > Awesome...no more unhandled exception! I get this: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Dec 4 2009 22:22 Type 'help' for detailed information 0 > boot cdrom [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7120 bytes entry point is 0x4000 Evaluating FCode... invalid access of +vd Can't mount root byte-load: exception caught! ok 0 > I'm trying to track down in Forth where the +vd is - I'll post, again, if/when I find it! -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

r639 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 04 Dec '09

04 Dec '09

Author: blueswirl Date: 2009-12-04 23:01:12 +0100 (Fri, 04 Dec 2009) New Revision: 639 Modified: trunk/openbios-devel/arch/sparc64/lib.c Log: Sparc64: fix mmu_map Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-12-03 15:47:39 UTC (rev 638) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-12-04 22:01:12 UTC (rev 639) @@ -261,8 +261,6 @@ size = POP(); virt = POP(); phys = POP(); - phys <<= 32; - phys |= POP(); ofmem_map(phys, virt, size, mode); }

1 0