OpenBIOS January 2013

openbios@openbios.org

14 participants
55 discussions

[commit] r1088 - trunk/openbios-devel/packages
by repository service 13 Jan '13

13 Jan '13

Author: mcayland Date: Sun Jan 13 16:26:57 2013 New Revision: 1088 URL: http://tracker.coreboot.org/trac/openbios/changeset/1088 Log: Switch partition argument parsing to use left-parse-string as per CHRP bindings. As suggested in the PPC CHRP bindings, use the Forth left-parse-string word to parse the arguments passed to open in the mac-parts, sun-parts and pc-parts packages. This results is a much less complicated and more robust argument parser. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Jan 13 16:26:53 2013 (r1087) +++ trunk/openbios-devel/packages/mac-parts.c Sun Jan 13 16:26:57 2013 (r1088) @@ -49,8 +49,7 @@ macparts_open( macparts_info_t *di ) { char *str = my_args_copy(); - char *argstr = strdup(""); - char *parstr = strdup(""); + char *parstr = NULL, *argstr = NULL; int bs, parnum=-1, apple_parnum=-1; int parlist[2], parlist_size = 0; desc_map_t dmap; @@ -67,47 +66,32 @@ id: [0-7] [(id)][,][filespec] */ - - if( str ) { - if ( !strlen(str) ) - parnum = -1; - else { - /* Detect the boot parameters */ - char *ptr; - ptr = str; - - /* <id>,<file> */ - if (*ptr >= '0' && *ptr <= '9' && *(ptr + 1) == ',') { - parstr = ptr; - *(ptr + 1) = '\0'; - argstr = ptr + 2; - } - - /* <id> */ - else if (*ptr >= '0' && *ptr <='9' && *(ptr + 1) == '\0') { - parstr = ptr; - } - - /* ,<file> */ - else if (*ptr == ',') { - argstr = ptr + 1; - } - - /* <file> */ - else { - argstr = str; - } - - /* Convert the id to a partition number */ - if (strlen(parstr)) - parnum = atol(parstr); - - /* Detect if we are looking for the bootcode */ - if (strcmp(argstr, "%BOOT") == 0) - want_bootcode = 1; + + if ( strlen(str) ) { + /* Detect the arguments */ + if ((*str >= '0' && *str <= '9') || (*str == ',')) { + push_str(str); + PUSH(','); + fword("left-parse-string"); + parstr = pop_fstr_copy(); + argstr = pop_fstr_copy(); + } else { + argstr = str; } + + /* Convert the id to a partition number */ + if (parstr && strlen(parstr)) + parnum = atol(parstr); + + /* Detect if we are looking for the bootcode */ + if (strcmp(argstr, "%BOOT") == 0) + want_bootcode = 1; } + /* Make sure argstr is not null */ + if (argstr == NULL) + argstr = strdup(""); + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); DPRINTF("want_bootcode %d\n", want_bootcode); @@ -230,7 +214,7 @@ /* Make sure our partition is valid */ parnum = parlist[j]; - DPRINTF("Selected partition %d to boot\n", parnum); + DPRINTF("Selected partition %d\n", parnum); SEEK( bs * parnum ); READ( &par, sizeof(par) ); Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Jan 13 16:26:53 2013 (r1087) +++ trunk/openbios-devel/packages/pc-parts.c Sun Jan 13 16:26:57 2013 (r1088) @@ -94,42 +94,27 @@ [(id)][,][filespec] */ - if( str ) { - if ( !strlen(str) ) - parnum = -1; - else { - /* Detect the boot parameters */ - char *ptr; - ptr = str; - - /* <id>,<file> */ - if (*ptr >= '0' && *ptr <= '9' && *(ptr + 1) == ',') { - parstr = ptr; - *(ptr + 1) = '\0'; - argstr = ptr + 2; - } - - /* <id> */ - else if (*ptr >= '0' && *ptr <='9' && *(ptr + 1) == '\0') { - parstr = ptr; - } - - /* ,<file> */ - else if (*ptr == ',') { - argstr = ptr + 1; - } - - /* <file> */ - else { - argstr = str; - } - - /* Convert the id to a partition number */ - if (strlen(parstr)) - parnum = atol(parstr); + if ( strlen(str) ) { + /* Detect the arguments */ + if ((*str >= '0' && *str <= '7') || (*str == ',')) { + push_str(str); + PUSH(','); + fword("left-parse-string"); + parstr = pop_fstr_copy(); + argstr = pop_fstr_copy(); + } else { + argstr = str; } + + /* Convert the id to a partition number */ + if (parstr && strlen(parstr)) + parnum = atol(parstr); } + /* Make sure argstr is not null */ + if (argstr == NULL) + argstr = strdup(""); + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); free(parstr); Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Jan 13 16:26:53 2013 (r1087) +++ trunk/openbios-devel/packages/sun-parts.c Sun Jan 13 16:26:57 2013 (r1088) @@ -109,46 +109,31 @@ [(id)][,][filespec] */ - if( str ) { - if ( !strlen(str) ) - parnum = -1; - else { - /* Detect the boot parameters */ - char *ptr; - ptr = str; - - /* <id>,<file> */ - if (((*ptr >= '0' && *ptr <= '9') || (*ptr >= 'a' && *ptr <= 'a' + 8)) && *(ptr + 1) == ',') { - parstr = ptr; - *(ptr + 1) = '\0'; - argstr = ptr + 2; - } - - /* <id> */ - else if (((*ptr >= '0' && *ptr <= '9') || (*ptr >= 'a' && *ptr <= 'a' + 8)) && *(ptr + 1) == '\0') { - parstr = ptr; - } - - /* ,<file> */ - else if (*ptr == ',') { - argstr = ptr + 1; - } - - /* <file> */ - else { - argstr = str; - } + if ( strlen(str) ) { + /* Detect the arguments */ + if ((*str >= '0' && *str <= '9') || (*str >= 'a' && *str < ('a' + 8)) || (*str == ',')) { + push_str(str); + PUSH(','); + fword("left-parse-string"); + parstr = pop_fstr_copy(); + argstr = pop_fstr_copy(); + } else { + argstr = str; + } - /* Convert the id to a partition number */ - if (parstr && strlen(parstr)) { - if (parstr[0] >= 'a' && parstr[0] < ('a' + 8)) - parnum = parstr[0] - 'a'; - else - parnum = atol(parstr); - } + /* Convert the id to a partition number */ + if (parstr && strlen(parstr)) { + if (parstr[0] >= 'a' && parstr[0] < ('a' + 8)) + parnum = parstr[0] - 'a'; + else + parnum = atol(parstr); } } + /* Make sure argstr is not null */ + if (argstr == NULL) + argstr = strdup(""); + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); di->filesystem_ph = 0;

1 0

[commit] r1087 - trunk/openbios-devel/arch/ppc/qemu
by repository service 13 Jan '13

13 Jan '13

Author: mcayland Date: Sun Jan 13 16:26:53 2013 New Revision: 1087 URL: http://tracker.coreboot.org/trac/openbios/changeset/1087 Log: PPC: Mimic Apple's OpenFirmware behaviour if a divide by zero occurs. As reported by Amadeusz Sławiński using a real Mac, if anything is divided by zero then we should return zero rather than invoke a manual trap: 0 > 2 0 / ok 1 > u. 0 ok This resolves a bug in BootX which (un)intentionally divides by zero during boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Jan 12 18:22:39 2013 (r1086) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jan 13 16:26:53 2013 (r1087) @@ -59,6 +59,14 @@ } } +extern void __divide_error(void); + +void +__divide_error(void) +{ + return; +} + enum { ARCH_PREP = 0, ARCH_MAC99, Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat Jan 12 18:22:39 2013 (r1086) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sun Jan 13 16:26:53 2013 (r1087) @@ -295,7 +295,6 @@ exception_return: EXCEPTION_EPILOGUE -_GLOBAL(__divide_error): trap_error: mflr r3 LOAD_REG_FUNC(r4, unexpected_excep)

1 0

Re: [OpenBIOS] [RFC 3/3] SPARC32/64: Mimic Sun's OBP behaviour if a divide by zero occurs.
by Mark Cave-Ayland 12 Jan '13

12 Jan '13

On 07/01/13 16:47, Artyom Tarasenko wrote: Hi Artyom, Happy New Year! >> As reported by Artyom Tarasenko, if anything is divided by zero then we should >> return no value: >> >> 0> 4 2 / u. 2 ok >> 0> 2 0 / ok > > NAK. Either my memory is cheating on me or there is some other Artyom > Tarasenko who reported it. OBP produces an exception in case of > division by zero. Here is the post I referenced sent by your imposter: http://lists.openbios.org/pipermail/openbios/2011-August/006626.html. Also as noted in the first patch's commit message, most of the OpenBIOS platforms can't call Forth from a trap :( SPARC64 is the only exception here as I had to write something to enable va>tte-data to be called from an MMU trap, but that was just one platform and took me in the order of months. Hence why the patch takes the approach it does :/ > (This time adding you to cc, since the mailing list bounces my mails > saying my emai is graylisted - whatever it means). Graylisting means that the first email from your domain (@gmail.com) in every period (say 24 hours) is temporarily delayed to prevent spam overload :) ATB, Mark.

6 12

[commit] r1086 - trunk/openbios-devel/packages
by repository service 12 Jan '13

12 Jan '13

Author: mcayland Date: Sat Jan 12 18:22:39 2013 New Revision: 1086 URL: http://tracker.coreboot.org/trac/openbios/changeset/1086 Log: mac-parts.c: Add Apple_Bootstrap to partition types considered for Mac boot. When falling back to Mac rather than CHRP boot, allow Apple_Bootstrap partitions to be considered. This fixes booting from CD images with a New World Apple_Bootstrap partition, such as FreeBSD. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Fri Jan 11 12:10:07 2013 (r1085) +++ trunk/openbios-devel/packages/mac-parts.c Sat Jan 12 18:22:39 2013 (r1086) @@ -184,6 +184,7 @@ if (apple_parnum == -1 && (strcmp(par.pmPartType, "Apple_Boot") == 0 || + strcmp(par.pmPartType, "Apple_Bootstrap") == 0 || strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "DOS_FAT_") == 0)) { apple_parnum = i;

1 0

[RFCv3] PPC: Mimic Apple's OpenFirmware behaviour if a divide by zero occurs.
by Mark Cave-Ayland 12 Jan '13

12 Jan '13

As reported by Amadeusz Sławiński using a real Mac, if anything is divided by zero then we should return zero: 0 > 2 0 / ok 1 > u. 0 ok This resolves a bug in BootX which (un)intentionally divides by zero during boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/ppc/qemu/init.c | 8 ++++++++ openbios-devel/arch/ppc/qemu/start.S | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/openbios-devel/arch/ppc/qemu/init.c b/openbios-devel/arch/ppc/qemu/init.c index dfc201f..a8fc320 100644 --- a/openbios-devel/arch/ppc/qemu/init.c +++ b/openbios-devel/arch/ppc/qemu/init.c @@ -59,6 +59,14 @@ unexpected_excep(int vector) } } +extern void __divide_error(void); + +void +__divide_error(void) +{ + return; +} + enum { ARCH_PREP = 0, ARCH_MAC99, diff --git a/openbios-devel/arch/ppc/qemu/start.S b/openbios-devel/arch/ppc/qemu/start.S index 77ced18..5c86d74 100644 --- a/openbios-devel/arch/ppc/qemu/start.S +++ b/openbios-devel/arch/ppc/qemu/start.S @@ -295,7 +295,6 @@ call_isi_exception: exception_return: EXCEPTION_EPILOGUE -_GLOBAL(__divide_error): trap_error: mflr r3 LOAD_REG_FUNC(r4, unexpected_excep) -- 1.7.10.4

1 0

Re: [OpenBIOS] [commit] r1078 - trunk/openbios-devel/arch/ppc/qemu
by Programmingkid 11 Jan '13

11 Jan '13

On Jan 9, 2013, at 7:27 PM, Mark Cave-Ayland wrote: > (this is what I get with the patch I just posted applied): > > 0 > here 10 0 fill ok > 0 > here 4 44332211 filll ok > 0 > here 8 dump > fff503c0 44 33 22 11 00 00 00 00 00 00 00 00 00 00 00 00 D3"............. Same as Open Firmware. > 0 > here 5 44332211 filll ok > 0 > here 8 dump > fff503c0 44 33 22 11 44 00 00 00 00 00 00 00 00 00 00 00 D3".D........... This output in incorrect. This is what Open Firmware outputs: ff94d75c: 44 33 22 11 44 33 22 11 > 0 > here 6 44332211 filll ok > 0 > here 8 dump > fff503c0 44 33 22 11 44 33 00 00 00 00 00 00 00 00 00 00 D3".D3.......... This output is also incorrect. This is what Open Firmware outputs: ff94d75c: 44 33 22 11 44 33 22 11 > 0 > here 7 44332211 filll ok > 0 > here 8 dump > fff503c0 44 33 22 11 44 33 22 00 00 00 00 00 00 00 00 00 D3".D3"......... This output is incorrect. This is what Open Firmware outputs: ff94d75c: 44 33 22 11 44 33 22 11 > 0 > here 8 44332211 filll ok > 0 > here 8 dump > fff503c0 44 33 22 11 44 33 22 11 00 00 00 00 00 00 00 00 D3".D3"........ This output is correct. Segher is wrong.

3 3

[RFCv2 1/2] Add new defer word for mu/mod to allow division behaviour to be customised on a per platform basis.
by Mark Cave-Ayland 11 Jan '13

11 Jan '13

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/bootstrap/bootstrap.fs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openbios-devel/forth/bootstrap/bootstrap.fs b/openbios-devel/forth/bootstrap/bootstrap.fs index 6878449..ded2e90 100644 --- a/openbios-devel/forth/bootstrap/bootstrap.fs +++ b/openbios-devel/forth/bootstrap/bootstrap.fs @@ -445,10 +445,15 @@ variable leaves 0 leaves ! \ 7.3.2.3 double number arithmetic \ +defer (mu/mod) + : s>d dup 0 < ; : dnegate 0 0 2swap d- ; : dabs dup 0 < if dnegate then ; -: um/mod mu/mod drop ; +: um/mod (mu/mod) drop ; + +\ default divide implementation +['] mu/mod ['] (mu/mod) (to) \ symmetric division : sm/rem ( d n -- rem quot ) -- 1.7.10.4

1 1

Re: [OpenBIOS] [RFC 3/3] SPARC32/64: Mimic Sun's OBP behaviour if a divide by zero occurs.
by Mark Cave-Ayland 11 Jan '13

11 Jan '13

On 11/01/13 11:05, Artyom Tarasenko wrote: > Actually from this article I don't see that exception is happening in > the Firmware. > I'm very surprised, but our tests on RS/6000 (PReP) and Beige Rev 1 > (thanks dreadbit for testing that!) show that PPC firmware allows > division by zero: > > 0> 1 0 / ok > 1> 0 0 / ok > 2> . 0 ok > 1> . 0 ok > 0> > > It would be interesting to know what happens on a CHRP platform, can > anyone check? Hi Artyom, I guess it must depend on whether or not the divide by zero trap is enabled - at least definitely in the C portion of OpenBIOS, a divide by zero will definitely trap on QEMU's PPC implementation. I have a slightly less invasive patch than my last which I shall post to the list in a moment. ATB, Mark.

1 0

Re: [OpenBIOS] [commit] r1078 - trunk/openbios-devel/arch/ppc/qemu
by Olivier DANET 11 Jan '13

11 Jan '13

----- Message d'origine ----- De : Programmingkid Envoyés : 10.01.13 23:58 À : Olivier DANET Objet : Re: [OpenBIOS] [commit] r1078 - trunk/openbios-devel/arch/ppc/qemu How silly ! Sorry. The SparcStation does not know "filll" and the iBook does as you described. filll 5 ,6, 7 or 8 produce the same sequence 44 33 22 11 44 33 22 11 Regards

2 1

[commit] r1085 - trunk/openbios-devel/arch/ppc/qemu
by repository service 11 Jan '13

11 Jan '13

Author: mcayland Date: Fri Jan 11 12:10:07 2013 New Revision: 1085 URL: http://tracker.coreboot.org/trac/openbios/changeset/1085 Log: PPC: Fix filll word used by BootX As pointed out by Segher, the length parameter is specified in bytes rather than cells. The behaviour when the number of bytes is not an exact multiple of a long word is to round up to the next long word, as verified on real Mac hardware. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Tested-by: Olivier DANET <odanet(a)caramail.com> Tested-by: John Arbuckle <programmingkidx(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Jan 7 13:57:56 2013 (r1084) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Jan 11 12:10:07 2013 (r1085) @@ -614,18 +614,19 @@ } /* - * filll ( addr len quad -- ) + * filll ( addr bytes quad -- ) */ static void ffilll(void) { const u32 longval = POP(); - u32 len = POP(); - u32 *aaddr = (u32 *)cell2pointer(POP()); - - while (len--) { - *aaddr++ = longval; - } + u32 bytes = POP(); + u32 *laddr = (u32 *)cell2pointer(POP()); + u32 len; + + for (len = 0; len < bytes / sizeof(u32); len++) { + *laddr++ = longval; + } } void

1 0