- OpenBIOS - mail.coreboot.org

testing Max OS X boot on latest trunk (revision 1085) + divide by zero patch
by Amadeusz Sławiński 13 Jan '13

13 Jan '13

I used the latest proposed divide by zero patch So it seems like it is almost there. Seems like it still can't load kernel when run with boot cd:,\\:tbxi Mac OS X 10.0 http://asmblr.net/scrot/2013-01-12-155737_1366x768_scrot.png Mac OS X 10.2 http://asmblr.net/scrot/2013-01-12-155642_1366x768_scrot.png Mac OS X 10.4 http://asmblr.net/scrot/2013-01-12-155935_1366x768_scrot.png However when I specify partition to use it loads: Mac OS X 10.0 (boot cd:9,\\:tbxi) http://asmblr.net/scrot/2013-01-12-163133_1366x768_scrot.png Mac OS X 10.2 (boot cd:9,\\:tbxi) http://asmblr.net/scrot/2013-01-12-163300_1366x768_scrot.png Mac OS X 10.4 (boot cd:3,\\:tbxi) http://asmblr.net/scrot/2013-01-12-163419_1366x768_scrot.png There is also another patch which I think I forgot to mention but it makes kernel boot further on older versions: https://lists.nongnu.org/archive/html/qemu-devel/2011-08/msg01418.html it fakes frequencies of some hardware Mac OS X 10.0 http://asmblr.net/scrot/2013-01-12-164304_1366x768_scrot.png Mac OS X 10.2 http://asmblr.net/scrot/2013-01-12-164529_1366x768_scrot.png Mac OS X 10.4 (looks same as without) http://asmblr.net/scrot/2013-01-12-164738_1366x768_scrot.png Amadeusz

4 4

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

13 Jan '13

Author: mcayland Date: Sun Jan 13 16:27:00 2013 New Revision: 1089 URL: http://tracker.coreboot.org/trac/openbios/changeset/1089 Log: mac-parts.c: Update bootpath to reflect the chosen partition if unspecified. When not booting from a specified partition, bootpath doesn't contain the selected partition id. Since this is parsed by BootX in order to locate the Mach kernel, update it accordingly. Otherwise BootX falls back to its default behaviour of scanning the first 3 partitions in order to find the kernel and fails on early Darwin/OS X images. 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 Sun Jan 13 16:26:57 2013 (r1088) +++ trunk/openbios-devel/packages/mac-parts.c Sun Jan 13 16:27:00 2013 (r1089) @@ -50,13 +50,14 @@ { char *str = my_args_copy(); char *parstr = NULL, *argstr = NULL; + char *tmpstr, *bootpath; int bs, parnum=-1, apple_parnum=-1; int parlist[2], parlist_size = 0; desc_map_t dmap; part_entry_t par; int ret = 0, i = 0, j = 0; int want_bootcode = 0; - phandle_t ph; + phandle_t ph, chosen_ph; ducell offs = 0, size = -1; DPRINTF("macparts_open '%s'\n", str ); @@ -256,6 +257,35 @@ DPRINTF("mac-parts: filesystem found on partition %d with ph " FMT_ucellx " and args %s\n", parnum, ph, argstr); di->filesystem_ph = ph; + /* Update bootpath to reflect where we booted from */ + chosen_ph = find_dev("/chosen"); + tmpstr = get_property(chosen_ph, "bootpath", &i); + if (tmpstr == NULL) { + tmpstr = strdup(""); + } + + /* Find just the device */ + if (strlen(tmpstr)) { + for (i = 0; i < strlen(tmpstr); i++) { + if (tmpstr[i] == ':' || tmpstr[i] == ',') { + tmpstr[i] = '\0'; + } + } + + /* Rebuild bootpath with the currently selected partition number */ + bootpath = malloc(strlen(tmpstr) + strlen(str) + 4); + sprintf(bootpath, "%s:%d", tmpstr, parnum); + if (strlen(argstr)) { + sprintf(bootpath, "%s:%d,%s", tmpstr, parnum, argstr); + } else { + sprintf(bootpath, "%s:%d", tmpstr, parnum); + } + + DPRINTF("mac-parts: setting bootpath to %s\n", bootpath); + + set_property(chosen_ph, "bootpath", bootpath, strlen(bootpath) + 1); + } + /* If the filename was %BOOT then it's not a real filename, so clear argstr before attempting interpose */ if (want_bootcode) {

2 1

[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

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

11 Jan '13

[Appologies if the mail appears twice. Got the "graylisted" error from the mailing list again, and since the message didn't appear within the last two days, resending it] On Mon, Jan 7, 2013 at 7:46 PM, Tarl Neustaedter <tarl-b2(a)tarl.net> wrote: > > On 2013-Jan-7 13:44 , Programmingkid wrote: >> >> What PowerPC systems trap on divide by zero? > > > PPC 8360 > http://stackoverflow.com/questions/6460558/powerpc-how-to-make-div-0-return… 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?

1 0

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

10 Jan '13

> De : Mark Cave-Ayland > Envoyés : 10.01.13 20:54 > Objet : Re: [OpenBIOS] [commit] r1078 - trunk/openbios-devel/arch/ppc/qemu > > >On 10/01/13 18:25, Programmingkid wrote: > >> 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"........ > >Hmmm well that looks as if it just rounds up to the next 4-byte word, >which is like the last patch but without the extra byte handling on the >end. Segher - can you confirm this on your hardware? > > >ATB, > >Mark. Out of curiosity, I have tried these sequences on a SparcStation5 and a PowerPC G3 iBook Both get the same result. here 4 44332211 fill > 11 11 11 11 here 5 44332211 fill > 11 11 11 11 11 here 8 44332211 fill > 11 11 11 11 11 11 11 11 The lowest significant byte is repeated and the lenght is the byte count. Hope this help ... Olivier

2 1

[PATCH] PPC: Fix filll word used by BootX
by Mark Cave-Ayland 10 Jan '13

10 Jan '13

As pointed out by Segher, the length parameter is specified in bytes rather than cells. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/ppc/qemu/init.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/init.c b/openbios-devel/arch/ppc/qemu/init.c index 61374c3..3107708 100644 --- a/openbios-devel/arch/ppc/qemu/init.c +++ b/openbios-devel/arch/ppc/qemu/init.c @@ -614,18 +614,25 @@ static void kvm_of_init(void) } /* - * 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()); + char *baddr; + u32 len; + + for (len = 0; len < bytes / 4; len++) { + *laddr++ = longval; } + + baddr = (char *)laddr; + for (len = 0; len < bytes % 4; len++) { + *baddr++ = ((char *)&longval)[len]; + } } void -- 1.7.10.4

1 0

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

10 Jan '13

Author: mcayland Date: Sun Dec 9 21:37:53 2012 New Revision: 1078 URL: http://tracker.coreboot.org/trac/openbios/changeset/1078 Log: PPC: Implement filll (fill long) word for QEMU/PPC as required by BootX. Based upon an original patch by John Arbuckle <programmingkidx(a)gmail.com>. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> 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 Fri Dec 7 15:28:07 2012 (r1077) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Dec 9 21:37:53 2012 (r1078) @@ -613,6 +613,21 @@ fword("finish-device"); } +/* + * filll ( addr len quad -- ) + */ + +static void ffilll(void) +{ + const u32 longval = POP(); + u32 len = POP(); + u32 *aaddr = (u32 *)cell2pointer(POP()); + + while (len--) { + *aaddr++ = longval; + } +} + void arch_of_init(void) { @@ -877,6 +892,9 @@ device_end(); + /* Implementation of filll word (required by BootX) */ + bind_func("filll", ffilll); + bind_func("platform-boot", boot); bind_func("(go)", go); }

3 2

[RFC 1/3] Allow customisable behaviour when a divide-by-zero situation is encountered.
by Mark Cave-Ayland 07 Jan '13

07 Jan '13

Sun's OBP and Apple's OpenFirmware have different behaviours from each other when a divide-by-zero error is encountered. Since we can't reenter Forth from a trap on all platforms, detect this case before performing the division and allow an optional defer word to be executed instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/bootstrap/bootstrap.fs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/openbios-devel/forth/bootstrap/bootstrap.fs b/openbios-devel/forth/bootstrap/bootstrap.fs index 6878449..dc20caf 100644 --- a/openbios-devel/forth/bootstrap/bootstrap.fs +++ b/openbios-devel/forth/bootstrap/bootstrap.fs @@ -445,10 +445,23 @@ variable leaves 0 leaves ! \ 7.3.2.3 double number arithmetic \ +defer (div-by-zero-handler) + : s>d dup 0 < ; : dnegate 0 0 2swap d- ; : dabs dup 0 < if dnegate then ; -: um/mod mu/mod drop ; +: um/mod + dup 0 = if + \ Allow optional override of divide by zero handling + ['] (div-by-zero-handler) /n + @ 0 <> if + (div-by-zero-handler) drop + else + mu/mod drop + then + else + mu/mod drop + then + ; \ symmetric division : sm/rem ( d n -- rem quot ) -- 1.7.10.4

2 3

Re: [OpenBIOS] patches
by Programmingkid 07 Jan '13

07 Jan '13

On Jan 7, 2013, at 10:22 AM, Mark Cave-Ayland wrote: > On 07/01/13 15:14, Programmingkid wrote: > >>> Was there any patch in particular you are concerned with? To the best of my knowledge, all of the patches except the OFMEM virtual-physical mapping fix have been out for review in a similar form for a while now. >>> >>> I've also spent a couple of days heavily testing them against my set of PPC ISO images, so I'm not expecting any serious regressions... >> >> I was hoping to review the get-key-map patch before it was submitted. Now that I have looked at it, it seems good enough. > > Oh I see - sorry I didn't mean to offend. > > My thinking was that because both yourself and Amadeusz are keen to work on OS X boot, I'd rather commit a skeleton function until such time as we can figure out the real mapping and/or why you version causes random hangs :/ > > BTW with the RFC patchset I just posted to the list applied, all the outstanding issues from William's original patches should now be resolved! So please test away and report back... I can get Darwin kernel to boot now but it panics early :O There is still one unresolved issue that William's patches fixed. When booting Mac OS X using this command: "boot cd:,\\:tbxi", it causes Bootx to go back and try to find the partition that it can open. This search fails. A way around this is to just specify the partition to open: "boot cd:9,\\:tbxi". William made two patches that handles this situation: http://lists.openbios.org/pipermail/openbios/2011-August/006630.html http://lists.openbios.org/pipermail/openbios/2011-August/006640.html I don't think these patches can be applied now, but I do suggest we come up with a way to only open the APPLE_HFS and APPLE_HFSX partitions. P.S. The recent patches to OpenBIOS have made my Mac OS 10.0 cd boot further than before. :)

2 1

patches
by Programmingkid 07 Jan '13

07 Jan '13

Hi Mark, could you please post your patches onto the mailing list before committing them please.

2 1

[commit] r1084 - trunk/openbios-devel/forth/admin
by repository service 07 Jan '13

07 Jan '13

Author: mcayland Date: Mon Jan 7 13:57:56 2013 New Revision: 1084 URL: http://tracker.coreboot.org/trac/openbios/changeset/1084 Log: Ignore any attempts to emit a character to stdout when stdout is set to 0. When booting in standard (non-verbose) mode, BootX sets the stdout package handle to zero to suppress output, yet still continues to invoke the underlying emit word. This would cause OpenBIOS to become confused, often getting stuck in a tight loop. This patch checks the value of stdout before calling the underlying emit word, and simply returns if stdout is not set. Based upon an original patch by William Hahne <will07c5(a)gmail.com>. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/admin/iocontrol.fs Modified: trunk/openbios-devel/forth/admin/iocontrol.fs ============================================================================== --- trunk/openbios-devel/forth/admin/iocontrol.fs Mon Jan 7 13:57:54 2013 (r1083) +++ trunk/openbios-devel/forth/admin/iocontrol.fs Mon Jan 7 13:57:56 2013 (r1084) @@ -80,8 +80,11 @@ ; : io-emit ( char -- ) - io-out-char c! - io-out-char 1 " write" stdout @ $call-method drop + stdout @ if + io-out-char c! + io-out-char 1 " write" stdout @ $call-method + then + drop ; variable CONSOLE-IN-list

1 0

[commit] r1083 - trunk/openbios-devel/drivers
by repository service 07 Jan '13

07 Jan '13

Author: mcayland Date: Mon Jan 7 13:57:54 2013 New Revision: 1083 URL: http://tracker.coreboot.org/trac/openbios/changeset/1083 Log: adb_kbd.c: Implement dummy get-key-map word for the ADB keyboard package. This word is used by some bootloaders to detect keypresses at startup e.g. to enable verbose boot. The current implementation simply returns an empty array (indicating no keys are pressed) as the key/bitmap mapping is unknown; however this allows bootloaders which make use of the word to execute. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/adb_kbd.c Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Mon Jan 7 13:57:51 2013 (r1082) +++ trunk/openbios-devel/drivers/adb_kbd.c Mon Jan 7 13:57:54 2013 (r1083) @@ -42,11 +42,13 @@ } static void keyboard_read(void); +static void keyboard_getkeymap(void); NODE_METHODS( keyboard ) = { { "open", keyboard_open }, { "close", keyboard_close }, { "read", keyboard_read }, + { "get-key-map", keyboard_getkeymap }, }; /* VT100 escape sequences */ @@ -471,6 +473,7 @@ int next_key; char sequence[ADB_MAX_SEQUENCE_LEN]; int len; + char keytable[32]; }; static adb_dev_t *my_adb_dev = NULL; @@ -531,6 +534,21 @@ ADB_kbd_us, ADB_sequences); kbd->next_key = -1; kbd->len = 0; + + /* Debugging BootX: the lines below force get-key-map to report that + * cmd-V is being held down, which forces BootX to run in verbose mode + * for debugging. + * + * TODO: if we can find a mapping between the get-key-map bitmap and + * ADB scancodes, the keyboard driver should be altered to update this + * accordingly. + */ + + /* + kbd->keytable[3] = 0x40; + kbd->keytable[28] = 0x10; + */ + dev->state = kbd; my_adb_dev = dev; } @@ -566,3 +584,12 @@ } PUSH(i); } + +/* ( -- keymap ) (?) */ +/* should return a pointer to an array with 32 bytes (256 bits) */ +static void keyboard_getkeymap(void) +{ + adb_kbd_t *kbd = my_adb_dev->state; + + PUSH( pointer2cell(kbd->keytable) ); +}

1 0

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

07 Jan '13

Author: mcayland Date: Mon Jan 7 13:57:51 2013 New Revision: 1082 URL: http://tracker.coreboot.org/trac/openbios/changeset/1082 Log: PPC: Fix mapping of OpenBIOS ROM in RAM copy within OFMEM The OpenBIOS ROM in RAM copy was being incorrectly mapped in OFMEM as part of the 1:1 physical to virtual mapping used for OpenBIOS housekeeping at the top of RAM. Change the existing 1:1 mapping to handle everything up to the ROM in RAM copy, and then add a separate virtual mapping for the OpenBIOS ROM in RAM address space. This ensures that the OpenBIOS address space mapping is now recorded in the MMU translations property, and hence presented to client kernels to be incorporated in their existing mapping list before taking control of the MMU. With this patch applied, my NetBSD 5 test ISO is now able to complete a substantial part of its kernel boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 6 14:29:59 2013 (r1081) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Jan 7 13:57:51 2013 (r1082) @@ -553,7 +553,13 @@ ofmem_claim_virt(0, get_ram_bottom(), 0); ofmem_map(0, 0, get_ram_bottom(), 0); - ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_map(get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + /* Map everything at the top of physical RAM 1:1, minus the OpenBIOS ROM in RAM copy */ + ofmem_claim_phys(get_ram_top(), get_hash_base() + HASH_SIZE - get_ram_top(), 0); + ofmem_claim_virt(get_ram_top(), get_hash_base() + HASH_SIZE - get_ram_top(), 0); + ofmem_map(get_ram_top(), get_ram_top(), get_hash_base() + HASH_SIZE - get_ram_top(), 0); + + /* Map the OpenBIOS ROM in RAM copy */ + ofmem_claim_phys(ofmem->ramsize - OF_CODE_SIZE, OF_CODE_SIZE, 0); + ofmem_claim_virt(OF_CODE_START, OF_CODE_SIZE, 0); + ofmem_map(ofmem->ramsize - OF_CODE_SIZE, OF_CODE_START, OF_CODE_SIZE, 0); }

1 0

Re: [OpenBIOS] PPC: QEMU breaks static variables in OpenBIOS
by Mark Cave-Ayland 06 Jan '13

06 Jan '13

On 05/01/13 20:21, Blue Swirl wrote: (removed Ben from the CC as this is clearly an OpenBIOS issue) >> Actually here's a revised version that moves the __next_grab_slot back into >> C which is simpler still and continues to work for me. I guess in this form >> the same change could be applied as-is to hash_page_64()? > > The address arithmetic looks very similar to va2pa() or ea_to_phys(). > Could one of those be used instead? I thought about that, but figured that because it was a hot-path I'd do it inline to save some cycles invoking another function. Since it uses the same OF_* constants as those functions then it should just work. > Also since this is pretty hot code path, could you initialize the > pointer and perform the calculations just once during init? Unfortunately not :( The whole issue is that the exception handlers are invoked in real mode with MMU disabled, and hence to locate your global/static pointer you'd still have to convert its address from virtual to real before you could do anything with it. So for me it made sense to just do the increment on the variable directly. ATB, Mark.

2 8

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

06 Jan '13

Author: agraf Date: Sun Jan 6 14:29:59 2013 New Revision: 1081 URL: http://tracker.coreboot.org/trac/openbios/changeset/1081 Log: PPC: Fix next slot eviction This patch fixes next slot eviction in the MMU code when our HTAB is full. The basic problem behind this is that the next slot id is stored in .bss which is automatically resolved to an address that resides in a r/o area. This is not an issue usually, because in virtual addressing mode OpenBIOS swizzles accesses to the r/o ROM area to the r/w shadow in RAM. But since the MMU code runs in real mode, this logic doesn't apply. The solution is simple: Access the global variable using its shadowed address, not the ROM address. Based upon an original patch by Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 13 22:30:25 2012 (r1080) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 6 14:29:59 2013 (r1081) @@ -311,10 +311,32 @@ return phys; } +/* Converts a global variable (from .data or .bss) into a pointer that + can be accessed from real mode */ +static void * +global_ptr_real(void *p) +{ + return (void*)((uintptr_t)p - OF_CODE_START + get_rom_base()); +} + +/* Return the next slot to evict, in the range of [0..7] */ +static int +next_evicted_slot(void) +{ + static int next_grab_slot; + int *next_grab_slot_va; + int r; + + next_grab_slot_va = global_ptr_real(&next_grab_slot); + r = *next_grab_slot_va; + *next_grab_slot_va = (r + 1) % 8; + + return r; +} + static void hash_page_64(unsigned long ea, phys_addr_t phys, ucell mode) { - static int next_grab_slot = 0; uint64_t vsid_mask, page_mask, pgidx, hash; uint64_t htab_mask, mask, avpn; unsigned long pgaddr; @@ -349,10 +371,8 @@ found = 1; /* out of slots, just evict one */ - if (!found) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; - } + if (!found) + i = next_evicted_slot() + 1; i--; { mPTE_64_t p = { @@ -381,7 +401,6 @@ hash_page_32(unsigned long ea, phys_addr_t phys, ucell mode) { #ifndef __powerpc64__ - static int next_grab_slot = 0; unsigned long *upte, cmp, hash1; int i, vsid, found; mPTE_t *pp; @@ -407,10 +426,8 @@ found = 1; /* out of slots, just evict one */ - if (!found) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; - } + if (!found) + i = next_evicted_slot() + 1; i--; upte[i * 2] = cmp; upte[i * 2 + 1] = (phys & ~0xfff) | mode;

1 0

Re: [OpenBIOS] PPC: QEMU breaks static variables in OpenBIOS
by Mark Cave-Ayland 05 Jan '13

05 Jan '13

On 04/01/13 20:31, Blue Swirl wrote: >> Reading the comments for SPARC in arch/sparc32/entry.S, it looks as if the >> pages are marked writeable in the MMU and there is some kind of relocation >> into RAM occurring - Blue, can you comment on this? > > At first, I tried to use ROM for .text and .rodata, eliminate all > .data and only put .bss in RAM, but because of some problems it was > easier to copy the whole ROM to RAM. It wastes some guest RAM but IIRC > Linux wanted to patch some areas. > > I'd copy the ROM to RAM for PPC also. On Sparc, MMU is always enabled > and guests take care to preserve our mappings, but maybe this is not > the case for PPC. Then fully relocatable code would make sense there. Yes, I think this is the same approach as PPC (see my previous email). The trick being used is to ensure that the the virtual addresses containing the OpenBIOS ROM image are remapped to the RAM copy once the MMU is enabled. ATB, Mark.

1 0

PPC: QEMU breaks static variables in OpenBIOS
by Mark Cave-Ayland 04 Jan '13

04 Jan '13

Hi all, Futher to John's report of next_grab_slot not changing value within the PPC MMU hash_page_32() function, I've done some more experimentation and determined that there is indeed a problem with all OpenBIOS static variables on PPC. The issue is that OpenBIOS uses static variables in several places to keep track of various bits of information, and at compile-time these variables are given addresses within the OpenBIOS image itself, e.g. (gdb) p &next_grab_slot $1 = (int *) 0xfffdd000 However as John points out, the MemoryRegion associated with OpenBIOS is set to read-only. Single-stepping using gdb shows that while the store to update the value is executed, it is discarded by QEMU and so therefore static variables never change from their initial value. Rather amusingly, it seems that setting the variable value via gdb bypasses the MemoryRegion read-only check which made this more interesting to debug. I've done a quick hack on QEMU which is to comment out the following line from hw/ppc_oldworld.c in order to make the region read/write again: memory_region_set_readonly(bios, true); I've confirmed in gdb that this fixes the issue with static variables being able to update their value, and now with the latest round of OS X patches applied, the Darwin kernel boots although panics fairly early on. At this point, it seems that we have a decision to make. Is the bug here that the OpenBIOS ROM is marked as read-only for PPC, or OpenBIOS's use of static variables? If it's the latter, I think there is going to have to be a fairly major patch to remove static variables completely from the target image codebase. Thoughts? Mark.

7 19

Re: [OpenBIOS] static and global variable problem
by Programmingkid 01 Jan '13

01 Jan '13

On Dec 21, 2012, at 8:14 AM, Mark Cave-Ayland wrote: > On 21/12/12 13:09, Programmingkid wrote: > >>> No, you've got this the wrong way around. The default CFLAGS for OpenBIOS uses -Os which causes heavy optimisation and confuses gdb causing it to give incorrect output. So if you want to use gdb to debug OpenBIOS, you need to rebuild it with -O0 and use the generated .nostrip unstripped binary. >> >> I have done that and the problem is still there. > > Okay - did you make sure you did a complete rebuild so the flags got picked up by the C compiler? > > rm -rf obj-ppc > vi Makefile.target > (change -Os to -O0) > ./config/scripts/switch-arch ppc > make > > If you're sure, post a message with detailed instructions to the list so that others can try and reproduce what you are seeing. > How to reproduce the problem: 1. Start QEMU for debugging: qemu-system-ppc -m 128 -bios openbios-qemu.elf.nostrip -cdrom darwin8.iso -s -S 2. Start up gdb to read the firmware file: powerpc-linux-gdb openbios-qemu.elf.nostrip 3. Connect to QEMU using this command inside gdb: target remote localhost:1234 4. Set a breakpoint at this place: b ofmem.c:414 5. Have OpenBIOS start the boot process by entering this in QEMU: boot cd:,\\:tbxi 6. When the breakpoint in tripped, type this in gdb: print &next_grab_slot. next_grab_slot will have an address that isn't available to QEMU. The value I see is 0xfffda060. QEMU would have to have over 4 GB of ram in order to access this address.

2 4

bootx error message
by Programmingkid 30 Dec '12

30 Dec '12

I just wanted to share this error message I see right before booting failed for Mac OS X: setting boot-uuid to: A9E84582-CFBD-347C-B2E9-5C3F4F1138C247 non-root file owner detected: 501 non-root file owner detected: 501 Reading HFS+ file: [\mach_kernel] from 3fc5d1a4. Reading HFS+ file: [\mach_kernel] from 3fc5d1a4. Should I be concerned with the 501 issue? I guess what I'm asking is can file permissions stop bootx from loading and running the mach kernel?

1 0

testing Max OS X boot on latest trunk (revision 1080)
by Amadeusz Sławiński 25 Dec '12

25 Dec '12

Resending because it got stuck in moderation queue due to size logs in separate mails Here are results of my testing booting OS X on latest trunk Logs in attachment Not patched ones (fails without get-key-map): 10.0.log 10.2.log 10.4.log Patched with gsoc get-key-map patch: 10.0-gkm.log 10.2-gkm-panic.log 10.4-gkm.log Patched with gsoc divide by 0: 10.2-gkm-dvb0.log Logs from patched boot without CIF: all-without-cif.log 10.2 ones show that there is need for some solution regarding division by 0, some notes from my talks with Mark: My g5 machine returns 0 when dividing by 0, no warnings are printed: 0 > 0 0 / ok 1 > . ok 0 > 0 0 > 2 0 / ok 1 > . ok 0 > 0 Question is how to implement it, or maybe just use gsoc patch? Also it seems that Mac OS X seems to provide it's own fill-rectangle and +draw-rectangle it prints: FILL-RECTANGLE isn't unique. and also similar message when I apply gsoc draw-rectangle patch so it seems that this one isn't needed Another problem is that it seems to be unable to open/load kernel. On graphic side of things it seems to draw things better than with gsoc patches, graphics are not weirdly resized, but there is not much to see except boot folder graphic (10.0)/white apple(10.2, 10.4). Amadeusz

4 12

[PATCH] get-key-map implementation
by Programmingkid 23 Dec '12

23 Dec '12

This patch is an improvement upon the last get-key-map patch. This patch makes the code more 64bit friendly. It also fixes some whitespace damage. The get-key-map word is used by bootx to see if any keys are being held down. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: drivers/adb_kbd.c =================================================================== --- drivers/adb_kbd.c (revision 1078) +++ drivers/adb_kbd.c (working copy) @@ -24,7 +24,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "kbd.h" - +#include <math.h> #include "adb_bus.h" #include "adb_kbd.h" @@ -42,11 +42,13 @@ } static void keyboard_read(void); +static void getKeyMap(void); NODE_METHODS( keyboard ) = { { "open", keyboard_open }, { "close", keyboard_close }, { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -566,3 +568,65 @@ } PUSH(i); } + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +static void getKeyMap(void) +{ + #define sizeOfArray 8 // 8 bytes (32 bits) in size + uint32_t keyPushed, *keyMapArray, offset; + const uint32_t modifierKeyIndex = 7; + const uint32_t commandKeyValue = pow(2,28); + const uint32_t shiftKeyValue = pow(2,30); + const uint32_t theAKeyValue = pow(2,27); + + keyMapArray = (uint32_t *) malloc(sizeOfArray); + if(!keyMapArray) // if failed to allocate memory + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(0); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + { + PUSH((uint32_t)keyMapArray); // returns the address of keyMapArray + return; + } + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH((uint32_t) keyMapArray); +} This patch takes us a lot further along while booting Mac OS X. Here is the CIF. >> ============================================================= >> OpenBIOS 1.0 [Dec 12 2012 20:16] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Dec 12 2012 20:16 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> finddevice("/openprom") = 0xfff49f40 >> getprop(0xfff49f40, "model", 0x0565f68c, 255) = 15 >> 0x0565f68c 4f 70 65 6e 46 69 72 6d 77 61 72 65 20 33 00 __ OpenFirmware 3. >> peer(0x00000000) = 0xfff49d80 >> getprop(0xfff49d80, "#address-cells", 0x056579d0, 4) = 4 >> 0x056579d0 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> peer(0x00000000) = 0xfff49d80 >> getprop(0xfff49d80, "#size-cells", 0x056579d4, 4) = 4 >> 0x056579d4 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> of_client_interface: interpret 05616674 >> interpret hex unselect-dev " /packages" find-device new-device " sl_words" device-name : open true ; : close ; 0 value outputLevel : slw_set_output_level dup 0= if 0 stdout ! then to outputLevel ; : slw_emit 2 outputLevel <= if emit else drop then ; : slw_cr 2 outputLevel <= if cr then ; 0 value keyboardIH 20 buffer: keyMap : slw_init_keymap to keyboardIH keyMap dup 20 0 fill ; : slw_update_keymap { ; dpth } depth -> dpth keyboardIH if " get-key-map" keyboardIH $call-method depth dpth - 1 = if 20 then 4 / 0 do dup i 4 * + l@ keyMap i 4 * + tuck l@ or swap l! loop drop then ; 0 value screenIH 0 value cursorAddr 0 value cursorX 0 value cursorY 0 value cursorW 0 value cursorH 0 value cursorFrames 0 value cursorPixelSize 0 value cursorStage 0 value cursorTime 0 value cursorDelay : slw_spin screenIH 0<> cursorAddr 0<> and if get-msecs dup cursorTime - cursorDelay >= if to cursorTime slw_update_keymap cursorStage 1+ cursorFrames mod dup to cursorStage handle_calls return: 00000000 07c5b098 >> finddevice("/options") = 0xfff4a0e8 >> finddevice("/chosen") = 0xfff4a160 >> of_client_interface: interpret 056133e4 >> interpret dev /chosen new-device " memory-map" device-name active-package device-end ([1] -- [2]) >> handle_calls return: 00000000 fff57a90 >> getprop(0xfff4a160, "mmu", 0x056579ec, 4) = 4 >> 0x056579ec 07 c5 a8 2c __ __ __ __ __ __ __ __ __ __ __ __ .Ũ, >> getprop(0xfff4a160, "memory", 0x056579f0, 4) = 4 >> 0x056579f0 07 c5 ae 58 __ __ __ __ __ __ __ __ __ __ __ __ .ŮX >> peer(0x00000000) = 0xfff49d80 >> of_client_interface: interpret 05616db8 fff49d80 0000000a 056131d4 >> interpret get-package-property if 0 0 then ([4] -- [3]) >> handle_calls return: 00000000 00000019 fff56d04 >> getprop(0xfff4a160, "stdout", 0x056579f4, 4) = 4 >> 0x056579f4 07 c5 af 5c __ __ __ __ __ __ __ __ __ __ __ __ .ů\ >> instance-to-package(0x07c5af5c) = 0xfff567a4 >> getprop(0xfff4a160, "stdin", 0x056579f8, 4) = 4 >> 0x056579f8 07 c5 b0 64 __ __ __ __ __ __ __ __ __ __ __ __ .Űd >> instance-to-package(0x07c5b064) = 0xfff567a4 >> getprop(0xfff567a4, "name", 0x0565f81c, 31) = 5 >> 0x0565f81c 63 68 2d 62 00 __ __ __ __ __ __ __ __ __ __ __ ch-b. >> open("keyboard") = 0x07c5b49c >> of_client_interface: call-method 05616d78 07c5b098 07c5b49c >> call-method slw_init_keymap ([3] -- [2]) >> handle_calls return: 00000000 fff57558 >> of_client_interface: call-method 05616d88 07c5b098 >> call-method slw_update_keymap ([2] -- [1]) >> handle_calls return: 00000000 >> getprop(0xfff4a0e8, "security-mode", 0x0565f83c, 32) = -1 >> of_client_interface: call-method 05616d60 07c5b098 00000000 >> call-method slw_set_output_level ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 07c5b098 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 07c5b098 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 0000004d >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000063 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 0000004f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000053 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000058 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 0000004c >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 0000006f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000064 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000065 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b098 00000072 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 07c5b098 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> claim(0x05000000, 4194304, 0) = 0x05000000 >> claim(0x05400000, 2097152, 0) = 0x05400000 >> claim(0x04000000, 16777216, 0) = 0x04000000 >> claim(0x00004000, 67092480, 0) = 0x00004000

3 4

Update
by Programmingkid 23 Dec '12

23 Dec '12

The Darwin PPC cd is definitely something you should download. I tried it today and was blown away by the results. I was actually able to see the Apple logo displayed in QEMU! This cd image is free and would allow you to actually test some of the patches yourself. Here's the link: http://www.opensource.apple.com/darwinsource/images/darwinppc-801.cdr.gz This patch is what allowed me to go so far in booting: Index: forth/admin/iocontrol.fs =================================================================== --- forth/admin/iocontrol.fs (revision 1041) +++ forth/admin/iocontrol.fs (working copy) @@ -80,6 +80,7 @@ ; : io-emit ( char -- ) + stdout @ 0= if drop exit then \ make sure stdout pointer is not null io-out-char c! io-out-char 1 " write" stdout @ $call-method drop ; I could post the CIF, but it is huge. The above patch is definitely needed.

3 5

static and global variable problem
by Programmingkid 21 Dec '12

21 Dec '12

I was doing some debugging of an issue with the hash_page_32() function in the file ofmem.c, when I noticed a very odd problem. The static variable next_grab_slot never changes value. I tried declaring it as a global variable and its value still never changes. I used gdb to monitor its value. Local variables work just fine. Any body know a way to fix this problem? My guess is this is a gcc problem. What is your theory?

3 4

Fwd: static and global variable problem
by Programmingkid 21 Dec '12

21 Dec '12

On Dec 21, 2012, at 8:14 AM, Mark Cave-Ayland wrote: > On 21/12/12 13:09, Programmingkid wrote: > >>> No, you've got this the wrong way around. The default CFLAGS for OpenBIOS uses -Os which causes heavy optimisation and confuses gdb causing it to give incorrect output. So if you want to use gdb to debug OpenBIOS, you need to rebuild it with -O0 and use the generated .nostrip unstripped binary. >> >> I have done that and the problem is still there. > > Okay - did you make sure you did a complete rebuild so the flags got picked up by the C compiler? > > rm -rf obj-ppc > vi Makefile.target > (change -Os to -O0) > ./config/scripts/switch-arch ppc > make > > If you're sure, post a message with detailed instructions to the list so that others can try and reproduce what you are seeing. I found out that the address of the variable next_grab_slot was way out of range. Qemu was given only 128MB of ram, and this variable was located at an address around the 4095 MB area.

1 0

Re: [OpenBIOS] Mac OS X support
by Programmingkid 21 Dec '12

21 Dec '12

On Nov 16, 2012, at 1:54 PM, Amadeusz Sławiński wrote: > On Fri, Nov 16, 2012 at 11:29:04AM -0500, Programmingkid wrote: >> >> On Nov 16, 2012, at 7:08 AM, Amadeusz Sławiński wrote: >> >>> On Thu, Nov 15, 2012 at 05:44:54PM -0500, Programmingkid wrote: >>>> Could you send me your OpenBIOS-qemu.elf file? I tried the link that was on that page you sent me, but I only see an error message that says "Wrong IP" when I try to download it. >>>> >>>> Here is the problem link: http://free-uploading.com/t0uwrodvvxkz/ ... u.elf.html >>>> >>>> May I suggest using mediafire.com instead. >>> >>> Sorry, this file seems to be lost and I also get "Wrong IP" message, >>> however when applying patches from GSOC onto current trunk I was able to >>> get it into similar state (it even stopped in same places). >>> I will redo this later (I deleted my working dir) and send you newer one. >> >> Thank you. > > And here it is, both stripped and not stripped > I tested it with Mac OS X 10.0 and 10.2 install cd, boots similarly to > what was on screenshots > > I run it as follows: > qemu-system-ppc -bios openbios-qemu.elf -cdrom Mac\ OS\ 10.0.img -g 800x600x32 -m 1024 > > Please tell me if you got them as gmail can do weird things whan it > comes to mailing attachments. > <openbios-qemu.elf><openbios-qemu.elf.nostrip> I recently decided to try your openbios files you sent me a while back. This time I tried them in QEMU 1.2.2 and 0.12.5. Both times, the boot process stops at the same place. It is where this is displayed in the log: >> claim(0x05000000, 4194304, 0) = 0x05000000 >> claim(0x05400000, 2097152, 0) = 0x05400000 >> claim(0x04000000, 16777216, 0) = 0x04000000 >> claim(0x00004000, 67092480, 0) = 0x00004000 The only way I can go further is the alter a few lines in ofmem.c. Did you make any changes to QEMU?

3 3

[PATCH] Fix configuration issues on Mac OS X
by Programmingkid 14 Dec '12

14 Dec '12

This patch fixes the problem of not correctly configuring for Mac OS X. On Mac OS X, the compiler is simply called gcc, so the names the switch-arch script would look for were not available. Also uname -m returns i386 on Mac OS X. This value doesn't change on 32bit or 64bit intel processors. On Linux, the value would be x86_64 for 64bit processors and i686 for 32bit processors. The 6 in 686 might be 3,4, or 5 depending on your processor type. With this patch I was actually able to go pretty far in the building process of making OpenBIOS. I stopped at an issue in elf_info.c. This is another issue to be solved for another time. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 1078) +++ config/scripts/switch-arch (working copy) @@ -89,15 +89,25 @@ archname() { - HOSTARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ - -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ - -e "s/Power Macintosh/ppc/"` + OS_NAME=`uname` + if test "$OS_NAME" = "Darwin"; then # Can't depend on uname -m on Mac OS X + IS_64BIT=`sysctl hw.cpu64bit_capable` + if test "$IS_64BIT" = "hw.cpu64bit_capable: 1"; then + HOSTARCH="amd64" + else + HOSTARCH="x86" + fi + else + HOSTARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ + -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ + -e "s/Power Macintosh/ppc/"` + fi } select_prefix() { - for TARGET in ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- + for TARGET in ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- '' do if type ${TARGET}gcc > /dev/null 2>&1 then

3 3

Re: [OpenBIOS] Search word
by Programmingkid 14 Dec '12

14 Dec '12

It is because nobody has written one yet. This reminds me, I have to update one of my own tutorials on OpenBIOS. Few people around here care about writing document. Just look at the lack of comments in OpenBIOS's source code. Sorry we can't be more helpful. On Jul 16, 2012, at 1:55 PM, mustapha adib wrote: > Subject : Looking for working package: computer (exact reference) + Firmware (BIOS or/and MBR with exact version) > > Hello every body, > > Please excuse first my english, > > I can not understand why we can't found on Openbios site an example of easy working configuration for demonstration for example! > It would be very gentle if some one tell us witch IBM Leneevo (but exact reference, not just X60) and witch OpenBios or Openboot will much with. > > For example, I have to have a PC (laptop or desktop) witch has a fully reprogrammable BIOS. This BIOS must, after minimal POST, copy every time it starts the content of the inserted CD into C drive, and then boot from C, and give hand to an application just installed on C. May be it seems easy for many of you guys, so if some one has time to help me I'm thanking him in advance. > > Best regard > Mustapha who will spend this summer on this tasks :( > > > 2012/7/5 Tarl Neustaedter <tarl-b2(a)tarl.net> > On 2012-Jul-4 19:25 , Programmingkid wrote: > What is the word used to search for a string inside another string? I tried using 'Search', but that isn't included with openbios. > > > There is "left-parse-string", which is used to split strings on specific character boundaries, but not much more in general string manipulation routines. > >

1 0

Re: [OpenBIOS] Mac OS X patches for OpenBIOS testing
by Programmingkid 14 Dec '12

14 Dec '12

On Dec 13, 2012, at 4:36 PM, Mark Cave-Ayland wrote: > Hi both, > > Good news - we finally have SOB from William so I've applied to 2 easiest patches to review :) > > I understand that an implementation of get-key-map is still required, however if you are both still interested in booting OS X, I'd be grateful for some more testing from SVN trunk in order to determine which patches are still need (and why). For example, some of them should no longer be required because "<value> to active-package" should now work. > > Let me know how you both get on now - any interesting screenshots always appreciated ;) > > > Kind regards, > > Mark. We don't go very far without get-key-map, so I applied my new get-key-map patch, then printed out the CIF after trying to boot Mac OS X. The frame-buffer-adr patch works. The wrapper patch works. CIF output: >> ============================================================= >> OpenBIOS 1.0 [Dec 12 2012 20:16] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 512M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Dec 12 2012 20:16 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> finddevice("/openprom") = 0xfff49f40 >> getprop(0xfff49f40, "model", 0x0565f68c, 255) = 15 >> 0x0565f68c 4f 70 65 6e 46 69 72 6d 77 61 72 65 20 33 00 __ OpenFirmware 3. >> peer(0x00000000) = 0xfff49d80 >> getprop(0xfff49d80, "#address-cells", 0x056579d0, 4) = 4 >> 0x056579d0 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> peer(0x00000000) = 0xfff49d80 >> getprop(0xfff49d80, "#size-cells", 0x056579d4, 4) = 4 >> 0x056579d4 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> of_client_interface: interpret 05616674 >> interpret hex unselect-dev " /packages" find-device new-device " sl_words" device-name : open true ; : close ; 0 value outputLevel : slw_set_output_level dup 0= if 0 stdout ! then to outputLevel ; : slw_emit 2 outputLevel <= if emit else drop then ; : slw_cr 2 outputLevel <= if cr then ; 0 value keyboardIH 20 buffer: keyMap : slw_init_keymap to keyboardIH keyMap dup 20 0 fill ; : slw_update_keymap { ; dpth } depth -> dpth keyboardIH if " get-key-map" keyboardIH $call-method depth dpth - 1 = if 20 then 4 / 0 do dup i 4 * + l@ keyMap i 4 * + tuck l@ or swap l! loop drop then ; 0 value screenIH 0 value cursorAddr 0 value cursorX 0 value cursorY 0 value cursorW 0 value cursorH 0 value cursorFrames 0 value cursorPixelSize 0 value cursorStage 0 value cursorTime 0 value cursorDelay : slw_spin screenIH 0<> cursorAddr 0<> and if get-msecs dup cursorTime - cursorDelay >= if to cursorTime slw_update_keymap cursorStage 1+ cursorFrames mod dup to cursorStage handle_calls return: 00000000 1fc5b098 >> finddevice("/options") = 0xfff4a0e8 >> finddevice("/chosen") = 0xfff4a160 >> of_client_interface: interpret 056133e4 >> interpret dev /chosen new-device " memory-map" device-name active-package device-end ([1] -- [2]) >> handle_calls return: 00000000 fff57a90 >> getprop(0xfff4a160, "mmu", 0x056579ec, 4) = 4 >> 0x056579ec 1f c5 a8 2c __ __ __ __ __ __ __ __ __ __ __ __ .Ũ, >> getprop(0xfff4a160, "memory", 0x056579f0, 4) = 4 >> 0x056579f0 1f c5 ae 58 __ __ __ __ __ __ __ __ __ __ __ __ .ŮX >> peer(0x00000000) = 0xfff49d80 >> of_client_interface: interpret 05616db8 fff49d80 0000000a 056131d4 >> interpret get-package-property if 0 0 then ([4] -- [3]) >> handle_calls return: 00000000 00000019 fff56d04 >> getprop(0xfff4a160, "stdout", 0x056579f4, 4) = 4 >> 0x056579f4 1f c5 af 5c __ __ __ __ __ __ __ __ __ __ __ __ .ů\ >> instance-to-package(0x1fc5af5c) = 0xfff567a4 >> getprop(0xfff4a160, "stdin", 0x056579f8, 4) = 4 >> 0x056579f8 1f c5 b0 64 __ __ __ __ __ __ __ __ __ __ __ __ .Űd >> instance-to-package(0x1fc5b064) = 0xfff567a4 >> getprop(0xfff567a4, "name", 0x0565f81c, 31) = 5 >> 0x0565f81c 63 68 2d 62 00 __ __ __ __ __ __ __ __ __ __ __ ch-b. >> open("keyboard") = 0x1fc5b49c >> of_client_interface: call-method 05616d78 1fc5b098 1fc5b49c >> call-method slw_init_keymap ([3] -- [2]) >> handle_calls return: 00000000 fff57558 >> of_client_interface: call-method 05616d88 1fc5b098 >> call-method slw_update_keymap ([2] -- [1]) >> handle_calls return: 00000000 >> getprop(0xfff4a0e8, "security-mode", 0x0565f83c, 32) = -1 >> of_client_interface: call-method 05616d60 1fc5b098 00000000 >> call-method slw_set_output_level ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 1fc5b098 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 1fc5b098 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 0000004d >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000063 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 0000004f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000053 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000058 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 0000004c >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 0000006f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000064 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000065 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b098 00000072 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 1fc5b098 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> claim(0x05000000, 4194304, 0) = 0x05000000 >> claim(0x05400000, 2097152, 0) = 0x05400000 >> claim(0x04000000, 16777216, 0) = 0x04000000 >> claim(0x00004000, 67092480, 0) = 0x00004000 I think the next patch to commit is the draw-rectangle patch: http://lists.openbios.org/pipermail/openbios/2011-August/006642.html

1 0

[commit] r1080 - trunk/openbios-devel/packages
by repository service 13 Dec '12

13 Dec '12

Author: mcayland Date: Thu Dec 13 22:30:25 2012 New Revision: 1080 URL: http://tracker.coreboot.org/trac/openbios/changeset/1080 Log: video.c: Place framebuffer address in frame-buffer-adr BootX gets the framebuffer address to provide to Mac OS from the frame-buffer-adr value. This value was previously just set to null. This is in agreement with section 3.8.4.4 of the IEE1275 specification. Signed-off-by: William Hahne <will07c5(a)gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Thu Dec 13 22:30:23 2012 (r1079) +++ trunk/openbios-devel/packages/video.c Thu Dec 13 22:30:25 2012 (r1080) @@ -339,6 +339,9 @@ video.has_video = 1; video.pal = malloc( 256 * sizeof(unsigned long) ); + PUSH(video.fb.mvirt); + feval("to frame-buffer-adr"); + #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) size = ((video.fb.h * video.fb.rb) + 0xfff) & ~0xfff;

1 0

[commit] r1079 - trunk/openbios-devel/fs/hfsplus
by repository service 13 Dec '12

13 Dec '12

Author: mcayland Date: Thu Dec 13 22:30:23 2012 New Revision: 1079 URL: http://tracker.coreboot.org/trac/openbios/changeset/1079 Log: mac-parts.c: Fix detection of wrapped HFS+ volumes. The code for checking for a wrapped HFS+ volume looks at the wrong offset. The offset of the magic number for the wrapped volume is 0x7c, but vol is declared as a uint16 meaning the correct array index to check is 0x3e (see http://developer.apple.com/library/mac/#technotes/tn/tn1150.html). Signed-off-by: William Hahne <will07c5(a)gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Sun Dec 9 21:37:53 2012 (r1078) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Thu Dec 13 22:30:23 2012 (r1079) @@ -311,7 +311,7 @@ os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && - __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { + __be16_to_cpu(vol[0x3e]) == HFSP_VOLHEAD_SIG) { ret = -1; } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { ret = -1;

1 0

Forthstrap issues
by Programmingkid 13 Dec '12

13 Dec '12

I am having issues with making forthstrap work. The program is trying to access a memory address that doesn't belong to it. I think the problem is with the calculation of the variable latest. This line in bootstrap.c is where it is calculated: *latest = target_ucell(pointer2cell(dict) + dicthead - sizeof(cell)); My question is is the variable latest suppose to hold the address of a memory location? I can't access that value immediately after it is set.

2 2

Local variable support
by Programmingkid 13 Dec '12

13 Dec '12

The following code is for the use of local variables in OpenBIOS. I was able to successfully make a word that used local variables. The work isn't complete. There is still work to be done with the INTERPRET word. The LFIND word has be implemented in the INTERPRET word for local variables to be recognized during the compile state. I just need a C-like CONTINUE word to go back to the start of a loop to fix all my problems with INTERPRET. Maybe someone knows a better way of adding LFIND to INTERPRET. I would appreciate any comments, suggestions, or advice for the following code. \ Creates an array variable : ARRAY ( cellCount - ) DEPTH 0= IF CR ." Please specify an array size." CR EXIT THEN \ Compile-time behavior CREATE CELL * ALLOT \ creates and initializes the instance DOES> \ Run-time behavior DEPTH 2 < IF CR ." Please specify an index number." CR drop \ removes the address of the array instance -1 throw \ stop normal execution after error THEN SWAP CELL * + \ Calculates address to return ; immediate \ Declare the local-base-address VALUE 0 VALUE local-base-address \ returns the base address used for the local words : getBaseAddress ( - addr ) local-base-address ; \ sets the base address used for the local words : setBaseAddress ( addr - ) TO local-base-address ; \ Sets the first local variable's value : Local0! ( x - ) 0 CELL * getBaseAddress + ! ; \ Sets the second local variable's value : Local1! ( x - ) 1 CELL * getBaseAddress + ! ; \ Sets the third local variable's value : Local2! ( x - ) 2 CELL * getBaseAddress + ! ; \ Sets the fourth local variable's value : Local3! ( x - ) 3 CELL * getBaseAddress + ! ; \ Sets the fifth local variable's value : Local4! ( x - ) 4 CELL * getBaseAddress + ! ; \ Sets the sixth local variable's value : Local5! ( x - ) 5 CELL * getBaseAddress + ! ; \ Sets the seventh local variable's value : Local6! ( x - ) 6 CELL * getBaseAddress + ! ; \ Sets the eighth local variable's value : Local7! ( x - ) 7 CELL * getBaseAddress + ! ; \ Sets the ninth local variable's value : Local8! ( x - ) 8 CELL * getBaseAddress + ! ; \ Sets the tenth local variable's value : Local9! ( x - ) 9 CELL * getBaseAddress + ! ; \ Sets the eleventh local variable's value : Local10! ( x - ) 10 CELL * getBaseAddress + ! ; \ Sets the twelfth local variable's value : Local11! ( x - ) 11 CELL * getBaseAddress + ! ; \ **** Calculates the needed amount of memory for local variables **** 0 value variableCount : calculateNeededMemory ( "char" - n ) 0 TO variableCount >in @ \ keep track of where the pointer was begin parse-word 0= if \ if there is no more text to parse drop true else dup " ;" comp 0= if \ if the semicolon is encountered drop \ drop the duplicated address false else " }" comp 0= if \ if '}' character is encountered true \ end loop because '}' marks end of local variables else variableCount 1 + TO variableCount false then then then until >in ! \ reset the pointer variableCount CELL * ; \ **** allocates the memory for local variables **** : allocateMemory ( n - addr ) alloc-mem dup 0= if drop cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr then ; \ Declares the size of the local variable table 48 CONSTANT localTableSize \ Declare the local variable table localTableSize ARRAY localVariableTable \ Keeps track of end of array 0 VALUE arrayCount \ gets the number of records in the local variable table : getLocalRecordCount arrayCount 4 / ; \ Clears the local variable table : initLocalTable ( - ) \ free all the dynamically allocated memory arrayCount 0 ?do I 3 + localVariableTable @ ( addr ) free-mem ( ) 4 +loop 0 localVariableTable localTableSize erase 0 TO arrayCount ; \ Adds a local variable symbol to the local variable table : addLocal ( addr len order initflag - ) depth 4 < if cr ." The stack needs at least 4 values to add a local variable." cr exit then \ add to the table arrayCount 0 + localVariableTable ! \ initflag arrayCount 1 + localVariableTable ! \ order arrayCount 2 + localVariableTable ! \ len arrayCount 3 + localVariableTable ! \ addr \ allocate memory for the symbol arrayCount 2 + localVariableTable @ ( length ) alloc-mem ( memaddr ) dup ( memaddr memaddr ) dup ( memaddr memaddr memaddr ) \ called only when memaddr = 0 0= ( memaddr memaddr flag ) if cr ." Failed to allocate memory in addLocal!" cr ( memaddr memaddr ) then \ copy local variable name to a safe location arrayCount 3 + localVariableTable @ ( memaddr memaddr addr ) swap ( memaddr addr memaddr ) arrayCount 2 + localVariableTable @ ( memaddr addr memaddr length ) move ( memaddr ) arrayCount 3 + localVariableTable ! ( ) \ increment arrayCount arrayCount 4 + TO arrayCount ; \ prints the local variable table : printLocalTable arrayCount 0= if cr ." No variables loaded" cr exit then arrayCount 0 ?do cr ." Variable name: " I 3 + localVariableTable @ I 2 + localVariableTable @ type ." Order: " I 1 + localVariableTable @ . ." Init Flag: " I 0 + localVariableTable @ . 4 +loop ; \ Finds a local variable symbol in the local variable table \ Returns its order or -1 on failure : getOrder ( addr len - order ) \ if the address and length are missing depth 2 < if cr ." Address and length are required on the stack to use getOrder!" cr -1 throw \ ends execution then arrayCount 0 ?do over ( addr len addr ) I 3 + ( addr len addr addrindex ) localVariableTable @ ( addr len addr addr1 ) 2 pick ( addr len addr addr1 len ) comp ( addr len n ) 0= ( addr len flag ) if \ if the symbol is found 2drop ( addr len - ) I 1 + localVariableTable @ unloop exit then 4 \ increment the index by 4 +loop 2drop ( addr len - ) -1 \ returns -1 for the order if the symbol is not found ; \ **** read the local variables in the input stream **** 0 VALUE useTopStackValue 0 VALUE index 0 VALUE localVariableMemory : readLocalVariables ( "char" - ) 0 TO index true TO useTopStackValue begin parse-word ( addr len ) dup ( addr len len ) 0> ( addr len flag ) while ( addr len ) 2dup ( addr len addr len ) drop ( addr len addr ) " }" ( addr len addr addr len ) comp ( addr len flag ) 0= ( addr len flag ) if ( addr len ) \ if end of local variables drop ( addr ) drop ( ) exit ( ) then 2dup ( addr len addr len ) drop ( addr len addr ) " ;" ( addr len addr addr len ) comp ( addr len flag ) 0= ( addr len flag ) if ( addr len ) \ if not using top stack value for local variables false TO useTopStackValue ( addr len ) else \ add local variable to table index useTopStackValue ( addr len order useTopStackValue ) addLocal ( ) index 1 + TO index \ increment index then repeat drop ( addr ) drop ( ) ; \ FALSE VALUE usingLocals \ not needed because it is in the interpreter.fs file \ declare the local stack 1000 ARRAY localStack \ declare the stack top pointer 0 VALUE localStackTop \ Adds to the top of the local stack : pushLocalStack ( x - L:x ) localStackTop localStack ! ( x - ) localStackTop 1 + TO localStackTop ; \ Removes the top local stack value and places it into the data stack : popLocalStack ( L:x - x ) localStackTop localStack @ localStackTop 1 - TO localStackTop ; 12 CONSTANT localVariableLimit \ ***** sets up local variables ****** : { ( "char" - ) initLocalTable \ localVariableLimit CELL * ( memorySize ) calculateNeededMemory ( memorySize ) allocateMemory ( memorySize - addr ) TO localVariableMemory ( ) readLocalVariables ( ) TRUE TO usingLocals \ add code to the current definition \ saves the old base address postpone getBaseAddress postpone pushLocalStack \ sets the base address to this definition's reserved memory localVariableMemory postpone literal postpone setBaseAddress \ add code to initialize the variables if needed arrayCount 0 ?do I 0 + localVariableTable @ ( flag ) \ get the init flag true ( flag true ) = ( flag1 ) if I 4 / ( variable number ) case 0 of ['] Local0! , endof 1 of ['] Local1! , endof 2 of ['] Local2! , endof 3 of ['] Local3! , endof 4 of ['] Local4! , endof 5 of ['] Local5! , endof 6 of ['] Local6! , endof 7 of ['] Local7! , endof 8 of ['] Local8! , endof 9 of ['] Local9! , endof 10 of ['] Local10! , endof 11 of ['] Local11! , endof cr ." Can't save to local variable! " cr exit endcase then 4 +loop ; immediate \ declares this word as a compiler directive \ sets values for local variables : -> ( - ) parse-word ( addr len ) getOrder ( order ) dup ( order order ) -1 = ( order flag ) if \ if the symbol isn't found cr ." Symbol is not a local variable! " cr drop ( ) exit then case 0 of ['] Local0! , endof 1 of ['] Local1! , endof 2 of ['] Local2! , endof 3 of ['] Local3! , endof 4 of ['] Local4! , endof 5 of ['] Local5! , endof 6 of ['] Local6! , endof 7 of ['] Local7! , endof 8 of ['] Local8! , endof 9 of ['] Local9! , endof 10 of ['] Local10! , endof 11 of ['] Local11! , endof cr ." Can't save to local variable! " cr exit endcase ; immediate \ returns the first local variable's value : Local0@ CELL 0 * getBaseAddress + @ ; \ returns the second local variable's value : Local1@ CELL 1 * getBaseAddress + @ ; \ returns the third local variable's value : Local2@ CELL 2 * getBaseAddress + @ ; \ returns the fourth local variable's value : Local3@ CELL 3 * getBaseAddress + @ ; \ returns the fifth local variable's value : Local4@ CELL 4 * getBaseAddress + @ ; \ returns the sixth local variable's value : Local5@ CELL 5 * getBaseAddress + @ ; \ returns the seventh local variable's value : Local6@ CELL 6 * getBaseAddress + @ ; \ returns the eighth local variable's value : Local7@ CELL 7 * getBaseAddress + @ ; \ returns the ninth local variable's value : Local8@ CELL 8 * getBaseAddress + @ ; \ returns the tenth local variable's value : Local9@ CELL 9 * getBaseAddress + @ ; \ returns the eleventh local variable's value : Local10@ CELL 10 * getBaseAddress + @ ; \ returns the twelfth local variable's value : Local11@ CELL 11 * getBaseAddress + @ ; \ determines if a symbol is a local variable : LFIND ( addr len - ) depth 2 < if \ if the address and length are not on the stack exit then 2dup ( addr len addr len ) getOrder ( addr len addr len - addr len n ) dup ( addr len n - addr len n n ) -1 = if \ if the symbol isn't a local variable drop ( addr len n - addr len ) else \ if the symbol is a local variable case 0 of ['] Local0@ , endof 1 of ['] Local1@ , endof 2 of ['] Local2@ , endof 3 of ['] Local3@ , endof 4 of ['] Local4@ , endof 5 of ['] Local5@ , endof 6 of ['] Local6@ , endof 7 of ['] Local7@ , endof 8 of ['] Local8@ , endof 9 of ['] Local9@ , endof 10 of ['] Local10@ , endof 11 of ['] Local11@ , endof \ default case 2drop ( addr len - ) cr ." Could not compile local variable!" cr TRUE exit endcase 2drop ( addr len - ) ." compiled" \ display this text when entering a local variable symbol FALSE then ; \ Redefine colon to clean up after { : ; usingLocals TRUE = if FALSE TO usingLocals postpone popLocalStack postpone setBaseAddress then postpone ; ; immediate ' lfind is mydefer \ makes lfind work in INTERPRET \ ************ OVERWRITE THESE WORDS IN interpreter.fs *************** Defer mydefer : interpret 0 >in ! begin parse-word dup 0> \ was there a word at all? while usingLocals if mydefer \ need to add a code to continue to the next iteration right here then $find if dup flags? 0<> state @ 0= or if execute else , \ compile mode && !immediate then else \ word is not known. maybe it's a number 2dup $number if span @ >in ! \ if we encountered an error, don't continue parsing type 3a emit -13 throw else -rot 2drop 1 handle-lit then then depth 200 >= if -3 throw then depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then repeat 2drop ; : print-status ( exception -- ) space ?dup if dup sys-debug \ system debug hook case -1 of s" Aborted." type endof -2 of s" Aborted." type endof -3 of s" Stack Overflow." type 0 depth! endof -4 of s" Stack Underflow." type 0 depth! endof -5 of s" Return Stack Overflow." type endof -6 of s" Return Stack Underflow." type endof -13 of s" undefined word." type endof -15 of s" out of memory." type endof -21 of s" undefined method." type endof -22 of s" no such device." type endof -100 of endof \ local variable being used dup s" Exception #" type . 0 state ! endcase else state @ 0= if s" ok" else s" compiled" then type then cr ;

5 6

Re: [OpenBIOS] Signed-off-by
by Programmingkid 13 Dec '12

13 Dec '12

1 0

[PATCH] Adds filll (3 l's) to dictionary
by Programmingkid 09 Dec '12

09 Dec '12

The filll word fills memory addresses with a value. It's different from fill (2 l's) because filll fills the specified memory addresses with 32-bit values. Index: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c (revision 1075) +++ trunk/openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -613,6 +613,25 @@ fword("finish-device"); } + +// filll ( addr len num -- ) +// Fills an address in memory with 32-bit values +static void filll(void) +{ + u32 * location; + u32 length, fillNumber, x; + + fillNumber = POP(); + length = POP(); + location = (u32 *) cell2pointer(POP()); + + for(x = 0; x <= length; x++) + { + location[x] = fillNumber; + } +} + + void arch_of_init(void) { @@ -879,4 +898,5 @@ bind_func("platform-boot", boot); bind_func("(go)", go); + bind_func("filll", filll); }

2 6

[PATCH] Set value of frame-buffer-adr
by Programmingkid 09 Dec '12

09 Dec '12

This patch sets the value frame-buffer-adr to the address of the frame buffer. This code below is what I used to test this patch. : video-test { value } ( x -- ) 100000 0 do value frame-buffer-adr i + ! loop ; When I ran it like this: 0 video-test the screen changes to a black color. This happens on both on Apple's Open Firmware and in OpenBIOS. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: packages/video.c =================================================================== --- packages/video.c (revision 1077) +++ packages/video.c (working copy) @@ -338,7 +338,8 @@ } video.has_video = 1; video.pal = malloc( 256 * sizeof(unsigned long) ); - + PUSH(video.fb.mphys); + feval("to frame-buffer-adr"); #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) size = ((video.fb.h * video.fb.rb) + 0xfff) & ~0xfff;

1 0

[PATCH] Fix HFS+ wrapper recognition issue
by Programmingkid 07 Dec '12

07 Dec '12

This patch fixes a problem with recognizing wrapped HFS+ volumes. This patch will eliminate the problem of seeing the file Where_have_all_my_files_gone? when listing the contents of a volume. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c =================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_volume.c (revision 1075) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c (working copy) @@ -305,13 +305,14 @@ { UInt16 *vol; int ret = 0; + #define wrapper_offset 0x3e vol = (UInt16 *)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); os_seek_offset( fd, 2 * (1 << HFSP_BLOCKSZ_BITS) + offset ); os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && - __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { + __be16_to_cpu(vol[wrapper_offset]) == HFSP_VOLHEAD_SIG) { ret = -1; } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { ret = -1;

1 0

[commit] r1077 - in trunk/openbios-devel/forth: bootstrap device
by repository service 07 Dec '12

07 Dec '12

Author: mcayland Date: Fri Dec 7 15:28:07 2012 New Revision: 1077 URL: http://tracker.coreboot.org/trac/openbios/changeset/1077 Log: Redefine "to" word in device.fs to allow the current package to be set like a standard value. BootX appears to be able to want to change the current package phandle by executing Forth statements in the form "<value> to active-package". This won't work correctly in OpenBIOS, since changing packages requires calling the active-package! word to perform additional housekeeping such as changing wordlists. The proposed solution here is to redefine "to" at the end of device.fs so that if package support is included, we perform an additional check on the destination xt to see if it matches that of active-package. If it does, then we manually invoke the active-package! word to select the new package. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/device/device.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Fri Dec 7 15:18:41 2012 (r1076) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Fri Dec 7 15:28:07 2012 (r1077) @@ -1052,17 +1052,21 @@ 3 /n* + ! then ; - -: to - ['] ' execute + +: (to-xt) ( xt -- ) dup @ instance-cfa? state @ if swap ['] (lit) , , if ['] (ito) else ['] (to) then , else if (ito) else /n + ! then then - ; immediate +; +: to + ['] ' execute + (to-xt) + ; immediate + : is ( xt "wordname<>" -- ) parse-word $find if (to) Modified: trunk/openbios-devel/forth/device/device.fs ============================================================================== --- trunk/openbios-devel/forth/device/device.fs Fri Dec 7 15:18:41 2012 (r1076) +++ trunk/openbios-devel/forth/device/device.fs Fri Dec 7 15:28:07 2012 (r1077) @@ -189,3 +189,14 @@ free-mem then ; + +\ Redefine to word so that statements of the form "0 to active-package" +\ are supported for bootloaders that require it +: to + ['] ' execute + dup ['] active-package = if + drop active-package! + else + (to-xt) + then +; immediate

1 0

[commit] r1076 - trunk/openbios-devel/packages
by repository service 07 Dec '12

07 Dec '12

Author: mcayland Date: Fri Dec 7 15:18:41 2012 New Revision: 1076 URL: http://tracker.coreboot.org/trac/openbios/changeset/1076 Log: Rework mac-parts.c to use CHRP-compliant partition search, followed by Apple OF partition search. The confusion from the previous refactoring of mac-parts.c came from the fact that it must support searching for a boot partition using the algorithm specified in the OF CHRP bindings supplement, as well as Apple's brute-force partition-type search. This patch corrects mac-parts.c so that it will first attempt to find a CHRP boot partition, and if it does not exist or fails to boot, fall back to the first partition that would be considered valid by Apple's OF if one exists. 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 Nov 30 00:02:25 2012 (r1075) +++ trunk/openbios-devel/packages/mac-parts.c Fri Dec 7 15:18:41 2012 (r1076) @@ -51,10 +51,11 @@ char *str = my_args_copy(); char *argstr = strdup(""); char *parstr = strdup(""); - int bs, parnum=-1; + int bs, parnum=-1, apple_parnum=-1; + int parlist[2], parlist_size = 0; desc_map_t dmap; part_entry_t par; - int ret = 0; + int ret = 0, i = 0, j = 0; int want_bootcode = 0; phandle_t ph; ducell offs = 0, size = -1; @@ -161,101 +162,135 @@ DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); /* No partition was explicitly requested so let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { - SEEK( bs * parnum ); + for (i = 1; i <= __be32_to_cpu(par.pmMapBlkCnt); i++) { + SEEK( bs * i ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || + if ( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) - break; + continue; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + DPRINTF("found partition %d type: %s with status %x\n", i, par.pmPartType, __be32_to_cpu(par.pmPartStatus)); /* If we have a valid, allocated and readable partition... */ if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (long long)__be32_to_cpu(par.pmBootSize); - - goto found; - } else { - /* Otherwise we were passed a filename and path. So let's - choose the first partition with a valid filesystem */ - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); + /* Unfortunately Apple's OF implementation doesn't follow the OF PowerPC CHRP bindings + * and instead will brute-force boot the first valid partition it finds with a + * type of either "Apple_Boot", "Apple_HFS" or "DOS_FAT_". Here we store the id + * of the first partition that matches these criteria to use as a fallback later + * if required. */ - ph = POP_ph(); - if (ph) - goto found; + if (apple_parnum == -1 && + (strcmp(par.pmPartType, "Apple_Boot") == 0 || + strcmp(par.pmPartType, "Apple_HFS") == 0 || + strcmp(par.pmPartType, "DOS_FAT_") == 0)) { + apple_parnum = i; + + DPRINTF("Located Apple OF fallback partition %d\n", apple_parnum); + } + + /* If the partition is also bootable and the pmProcessor field matches "PowerPC" (insensitive + * match), then according to the CHRP bindings this is our chosen partition */ + for (j = 0; j < strlen(par.pmProcessor); j++) { + par.pmProcessor[j] = tolower(par.pmProcessor[j]); + } + + if ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && + strcmp(par.pmProcessor, "powerpc") == 0) { + parnum = i; + + DPRINTF("Located CHRP-compliant boot partition %d\n", parnum); } } } + + /* If we found a valid CHRP partition, add it to the list */ + if (parnum > 0) { + parlist[parlist_size++] = parnum; + } + /* If we found an Apple OF fallback partition, add it to the list */ + if (apple_parnum > 0 && apple_parnum != parnum) { + parlist[parlist_size++] = apple_parnum; + } + } else { /* Another partition was explicitly requested */ - SEEK( bs * parnum ); - READ( &par, sizeof(par) ); - - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - } - } - - /* If we couldn't find a partition, exit */ - if (size == -1) { - DPRINTF("Unable to automatically find partition!\n"); - goto out; + parlist[parlist_size++] = parnum; + + DPRINTF("Partition %d explicitly requested\n", parnum); } -found: - - ret = -1; - di->blocksize = (unsigned int)bs; - - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; + /* Attempt to use our CHRP partition, optionally followed by our Apple OF fallback partition */ + for (j = 0; j < parlist_size; j++) { + + /* Make sure our partition is valid */ + parnum = parlist[j]; + + DPRINTF("Selected partition %d to boot\n", parnum); + + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; - - /* We have a valid partition - so probe for a filesystem at the current offset */ - DPRINTF("mac-parts: about to probe for fs\n"); - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); - DPRINTF("mac-parts: done fs probe\n"); - - ph = POP_ph(); - if( ph ) { - DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); - di->filesystem_ph = ph; - - /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ - if (want_bootcode) - argstr = strdup(""); - - /* If we have been asked to open a particular file, interpose the filesystem package with - the passed filename as an argument */ - if (strlen(argstr)) { - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); - } - } else { - DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); + if(! ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable)) ) { + DPRINTF("Partition %d is not valid, allocated and readable\n", parnum); + goto out; + } + + ret = -1; + + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + if (want_bootcode) { + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); + } + + di->blocksize = (unsigned int)bs; + + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + /* We have a valid partition - so probe for a filesystem at the current offset */ + DPRINTF("mac-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("mac-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("mac-parts: filesystem found on partition %d with ph " FMT_ucellx " and args %s\n", parnum, ph, argstr); + di->filesystem_ph = ph; + + /* If the filename was %BOOT then it's not a real filename, so clear argstr before + attempting interpose */ + if (want_bootcode) { + argstr = strdup(""); + } + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } + + goto out; + } else { + DPRINTF("mac-parts: no filesystem found on partition %d; bypassing misc-files interpose\n", parnum); + } } - + free( str ); out:

1 0

[PATCH] Rework mac-parts.c to use CHRP-compliant partition search, followed by Apple OF partition search.
by Mark Cave-Ayland 07 Dec '12

07 Dec '12

The confusion from the previous refactoring of mac-parts.c came from the fact that it must support searching for a boot partition using the algorithm specified in the OF CHRP bindings supplement, as well as Apple's brute-force partition-type search. This patch corrects mac-parts.c so that it will first attempt to find a CHRP boot partition, and if it does not exist or fails to boot, fall back to the first partition that would be considered valid by Apple's OF. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/packages/mac-parts.c | 191 +++++++++++++++++++++-------------- 1 file changed, 113 insertions(+), 78 deletions(-) diff --git a/openbios-devel/packages/mac-parts.c b/openbios-devel/packages/mac-parts.c index a286870..9501bfd 100644 --- a/openbios-devel/packages/mac-parts.c +++ b/openbios-devel/packages/mac-parts.c @@ -51,10 +51,11 @@ macparts_open( macparts_info_t *di ) char *str = my_args_copy(); char *argstr = strdup(""); char *parstr = strdup(""); - int bs, parnum=-1; + int bs, parnum=-1, apple_parnum=-1; + int parlist[2], parlist_size = 0; desc_map_t dmap; part_entry_t par; - int ret = 0; + int ret = 0, i = 0, j = 0; int want_bootcode = 0; phandle_t ph; ducell offs = 0, size = -1; @@ -161,101 +162,135 @@ macparts_open( macparts_info_t *di ) DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); /* No partition was explicitly requested so let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { - SEEK( bs * parnum ); + for (i = 1; i <= __be32_to_cpu(par.pmMapBlkCnt); i++) { + SEEK( bs * i ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || + if ( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) - break; + continue; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + DPRINTF("found partition %d type: %s with status %x\n", i, par.pmPartType, __be32_to_cpu(par.pmPartStatus)); /* If we have a valid, allocated and readable partition... */ if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - - /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (long long)__be32_to_cpu(par.pmBootSize); - - goto found; - } else { - /* Otherwise we were passed a filename and path. So let's - choose the first partition with a valid filesystem */ - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); + + /* Unfortunately Apple's OF implementation doesn't follow the OF PowerPC CHRP bindings + * and instead will brute-force boot the first valid partition it finds with a + * type of either "Apple_Boot", "Apple_HFS" or "DOS_FAT_". Here we store the id + * of the first partition that matches these criteria to use as a fallback later + * if required. */ - ph = POP_ph(); - if (ph) - goto found; + if (apple_parnum == -1 && + (strcmp(par.pmPartType, "Apple_Boot") == 0 || + strcmp(par.pmPartType, "Apple_HFS") == 0 || + strcmp(par.pmPartType, "DOS_FAT_") == 0)) { + apple_parnum = i; + + DPRINTF("Located Apple OF fallback partition %d\n", apple_parnum); + } + + /* If the partition is also bootable and the pmProcessor field matches "PowerPC" (insensitive + * match), then according to the CHRP bindings this is our chosen partition */ + for (j = 0; j < strlen(par.pmProcessor); j++) { + par.pmProcessor[j] = tolower(par.pmProcessor[j]); + } + + if ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && + strcmp(par.pmProcessor, "powerpc") == 0) { + parnum = i; + + DPRINTF("Located CHRP-compliant boot partition %d\n", parnum); } } } + + /* If we found a valid CHRP partition, add it to the list */ + if (parnum > 0) { + parlist[parlist_size++] = parnum; + } + /* If we found an Apple OF fallback partition, add it to the list */ + if (apple_parnum > 0 && apple_parnum != parnum) { + parlist[parlist_size++] = apple_parnum; + } + } else { /* Another partition was explicitly requested */ - SEEK( bs * parnum ); - READ( &par, sizeof(par) ); - - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - } + parlist[parlist_size++] = parnum; + + DPRINTF("Partition %d explicitly requested\n", parnum); } - /* If we couldn't find a partition, exit */ - if (size == -1) { - DPRINTF("Unable to automatically find partition!\n"); + /* Attempt to use our CHRP partition, optionally followed by our Apple OF fallback partition */ + for (j = 0; j < parlist_size; j++) { + + /* Make sure our partition is valid */ + parnum = parlist[j]; + + DPRINTF("Selected partition %d to boot\n", parnum); + + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); + + if(! ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable)) ) { + DPRINTF("Partition %d is not valid, allocated and readable\n", parnum); goto out; + } + + ret = -1; + + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + if (want_bootcode) { + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); + } + + di->blocksize = (unsigned int)bs; + + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + /* We have a valid partition - so probe for a filesystem at the current offset */ + DPRINTF("mac-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("mac-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("mac-parts: filesystem found on partition %d with ph " FMT_ucellx " and args %s\n", parnum, ph, argstr); + di->filesystem_ph = ph; + + /* If the filename was %BOOT then it's not a real filename, so clear argstr before + attempting interpose */ + if (want_bootcode) { + argstr = strdup(""); + } + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } + + goto out; + } else { + DPRINTF("mac-parts: no filesystem found on partition %d; bypassing misc-files interpose\n", parnum); + } } - -found: - - ret = -1; - di->blocksize = (unsigned int)bs; - - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; - - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; - - /* We have a valid partition - so probe for a filesystem at the current offset */ - DPRINTF("mac-parts: about to probe for fs\n"); - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); - DPRINTF("mac-parts: done fs probe\n"); - - ph = POP_ph(); - if( ph ) { - DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); - di->filesystem_ph = ph; - - /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ - if (want_bootcode) - argstr = strdup(""); - - /* If we have been asked to open a particular file, interpose the filesystem package with - the passed filename as an argument */ - if (strlen(argstr)) { - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); - } - } else { - DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); - } - + free( str ); out: -- 1.7.10.4

2 2

testing Mac OS X boot on latest trunk (revision 1075)
by Amadeusz Sławiński 06 Dec '12

06 Dec '12

Current trunk (1075) lists some files and doesn't boot at all Welcome to OpenBIOS v1.0 built on Nov 30 2012 19:55 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> Not a bootable ELF image No valid state has been set by load or init-program ok 0 > dir cd:9,\ 73728 2002-07-18 08:21:48 Desktop DB 0 2002-07-18 08:21:49 Desktop DF 0 2002-07-18 08:21:49 Finder 0 2002-07-18 08:21:49 OSXBoot! 0 2002-07-18 08:21:50 System 1778 2002-07-18 08:21:49 Where_have_all_my_files_gone? ok 0 > boot cd:9,\\:tbxi No valid state has been set by load or init-program ok 0 > After testing with this patch: http://lists.openbios.org/pipermail/openbios/2011-August/006618.html I have better results Welcome to OpenBIOS v1.0 built on Nov 30 2012 20:00 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> Not a bootable ELF image No valid state has been set by load or init-program ok 0 > dir cd:9,\ 82 2002-07-24 17:47:43 ._Welcome to Mac OS X 6148 2002-07-31 23:59:42 .DS_Store 0 2002-07-31 23:59:37 .Trashes\ 0 2002-07-29 03:06:27 .vol\ 0 2002-07-30 10:00:25 Applications\ 0 2002-07-31 23:43:08 bin\ 5120 2002-07-31 23:59:40 Desktop DB 25410 2002-07-31 23:59:40 Desktop DF 0 2002-07-15 06:20:41 dev\ 11 2002-07-31 23:57:11 etc 0 2002-07-30 10:14:44 Library\ 11 2002-07-31 23:57:11 mach 3678188 2002-07-28 20:19:43 mach_kernel 0 2002-07-30 10:57:00 private\ 0 2002-07-31 23:41:16 sbin\ 0 2002-07-30 10:57:38 System\ 11 2002-07-31 23:58:55 tmp 0 2002-07-30 10:03:14 usr\ 11 2002-07-31 23:58:58 var 0 2002-07-29 03:06:27 Volumes\ 0 2002-07-30 11:07:00 Welcome to Mac OS X\ 0 2002-07-19 08:21:48 HFS+ Private Data\ ok 0 > boot cd:9,\\:tbxi call-method slw_update_keymap: exception -21 Here is also a listing of partitions on mine boot disk, # mac-fdisk /home/amade/emu/Mac\ OS\ 10.2\ $Disc\ 1$.img /home/amade/emu/Mac OS 10.2 (Disc 1).img Command (? for help): p /home/amade/emu/Mac OS 10.2 (Disc 1).img # type name length base ( size ) system /home/amade/emu/Mac OS 10.2 (Disc 1).img1 Apple_partition_map Apple 63 @ 1 ( 31.5k) Partition map /home/amade/emu/Mac OS 10.2 (Disc 1).img2 Apple_Driver43 Macintosh 56 @ 64 ( 28.0k) Driver 4.3 /home/amade/emu/Mac OS 10.2 (Disc 1).img3 Apple_Driver43_CD Macintosh 140 @ 120 ( 70.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img4 Apple_Void 0 @ 0 ( 0.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img5 Apple_Driver_ATAPI Macintosh 56 @ 260 ( 28.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img6 Apple_Driver_ATAPI Macintosh 140 @ 316 ( 70.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img7 Apple_Patches Patch Partition 512 @ 456 (256.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img8 Apple_Void 0 @ 0 ( 0.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img9 Apple_HFS Mac_OS_X 1278432 @ 968 (624.2M) HFS /home/amade/emu/Mac OS 10.2 (Disc 1).img10 Apple_Free 45656 @ 1279400 ( 22.3M) Free space Block size=2048, Number of Blocks=331264 DeviceType=0x1, DeviceId=0x1 Drivers- 1: @ 16 for 5, type=0x1 2: @ 30 for 25, type=0xffff 3: @ 65 for 5, type=0x701 4: @ 79 for 31, type=0xf8ff Command (? for help): Two similar (to me) things which probably still need fixing in filesystem handling are 1. "boot cd:,\\:tbxi" should do some kind of search through partitions 2. later in boot process it goes through partitions 0,1,2 seemingly from comments on GSOC patches expecting some of them to be ignored (http://asmblr.net/scrot/2012-11-30-211915_1366x768_scrot.png) screenshot is from bios with gsoc patches Also I wonder if "Still waiting for root device" problem which I have with gsoc patches, isn't caused by not going properly through partitions or even expecting them to be numbered differently (but those are just speculations) Amadeusz

4 15

[PATCH] Adds get-key-map to keyboard node
by Programmingkid 05 Dec '12

05 Dec '12

This patch adds the get-key-map word to the keyboard node. This patch is an improvement on the last get-key-map patch. It adds a keyboard node to /aliases and fixes a bug with the getKeyMap() function. If you wish to test out this patch, the program below will show you what key you pushed. The output will display hex values and text. The hex values in the middle tells you which key is being pushed. : myword { ; keyboardDevice } " keyboard" open-dev -> keyboardDevice begin " get-key-map" keyboardDevice $call-method 32 dump 10000 ms \ update speed again ; signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- drivers/adb_kbd.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 82 insertions(+), 4 deletions(-) diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index e38798a..e799704 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -42,11 +42,13 @@ keyboard_close(int *idx) } static void keyboard_read(void); +void getKeyMap(void); NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -545,7 +547,8 @@ void *adb_kbd_new (char *path, void *private) set_property(ph, "reg", (char *)&props, sizeof(props)); aliases = find_dev("/aliases"); - set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); + set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); + set_property(aliases, "keyboard", buf, strlen(buf) + 1); return kbd; } @@ -566,3 +569,78 @@ static void keyboard_read(void) } PUSH(i); } + + +// Returns the base to the exponent power +static int pow(int base, int exponent) +{ + int index, answer; + answer = base; + for(index = 1; index < exponent; index++) + { + answer = answer * base; + } + return answer; +} + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +void getKeyMap(void) +{ + int keyPushed, *keyMapArray, offset; + const int sizeOfArray = 8; + const int modifierKeyIndex = 7; + const int commandKeyValue = pow(2,28); + const int shiftKeyValue = pow(2,30); + const int theAKeyValue = pow(2,27); + + keyMapArray = (int *) malloc(sizeOfArray); + if(!keyMapArray) // if failed to allocate memory + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(0); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + { + PUSH((int)keyMapArray); // returns the address of keyMapArray + return; + } + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH((int) keyMapArray); +} \ No newline at end of file -- 1.7.5.4

2 10

Re: [OpenBIOS] Patch for auto partition selection
by Programmingkid 04 Dec '12

04 Dec '12

On Dec 4, 2012, at 1:48 PM, Blue Swirl wrote: > On Tue, Dec 4, 2012 at 1:25 AM, Programmingkid > <programmingkidx(a)gmail.com> wrote: >> >> On Dec 3, 2012, at 3:13 PM, Mark Cave-Ayland wrote: >> >> On 30/11/12 20:14, Programmingkid wrote: >> >> What do you mean when you say something is whitespace damaged? >> >> >> It's a general term for formatting changes that don't affect the patch, e.g. >> >> for (i = 0; i <= 10; i++) { >> >> to >> >> for (i = 0; i <= 10; i++) >> { > > Please take a look at this example for non-wanted style changes. Don't > just ignore what others are telling you. > >> >> It means that the patch includes non-functional changes which is generally >> frowned upon. >> >> What section do I not need? Could you give me the first and last line of >> this section? I need the actual text since the line number will probably not >> help if our files are different. >> >> >> See below. >> >> - } else { >> >> - /* Another partition was explicitly requested */ >> >> + } >> >> + >> >> + // if no partition and no file was selected - example: "dir cd:,\" >> >> + else if (parnum == -1) >> >> + { >> >> + // search for the first partition of type Apple_HFS or Apple_HFSX >> >> + for(parnum = 1; parnum<= __be32_to_cpu(par.pmMapBlkCnt); parnum++) >> >> + { >> >> + SEEK( bs * parnum ); >> >> + READ(&par, sizeof(par) ); >> >> + DPRINTF("found partition type: %s with status %x\n", >> par.pmPartType, __be32_to_cpu(par.pmPartStatus)); >> >> + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || >> strcmp(par.pmPartType, "Apple_HFSX") == 0) >> >> + { >> >> + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; >> >> + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; >> >> + goto found; >> >> + break; >> >> + } >> >> + } >> >> + } >> >> + >> >> + // Another partition was explicitly requested >> >> + else >> >> + { >> >> + >> >> >> ATB, >> >> Mark. >> >> >> >> Ok this patch removes the unneeded code and remotes the whitespace damage. >> >> signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> >> >> Index: trunk/openbios-devel/packages/mac-parts.c >> =================================================================== >> --- trunk/openbios-devel/packages/mac-parts.c (revision 1075) >> +++ trunk/openbios-devel/packages/mac-parts.c (working copy) >> @@ -164,16 +164,12 @@ >> for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { >> SEEK( bs * parnum ); >> READ( &par, sizeof(par) ); >> - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || >> - !__be32_to_cpu(par.pmPartBlkCnt) ) >> - break; >> - >> + >> DPRINTF("found partition type: %s with status %x\n", par.pmPartType, >> __be32_to_cpu(par.pmPartStatus)); >> >> >> >> - /* If we have a valid, allocated and readable partition... */ >> - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && >> - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && >> - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { >> + // If an Apple_HFS or Apple_HFSX partition was found >> + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, >> "Apple_HFSX") == 0) >> + { > > Here's one case where you have changed the brace style. > >> offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; >> size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; >> >> >> >> @@ -181,9 +177,11 @@ >> if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & >> kPartitionAUXIsBootValid)) { >> offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; >> size = (long long)__be32_to_cpu(par.pmBootSize); >> - >> goto found; >> - } else { >> + } >> + >> + else >> + { > > Another, don't change '} else {'. > >> /* Otherwise we were passed a filename and path. So let's >> choose the first partition with a valid filesystem */ >> DPUSH( offs ); >> @@ -196,9 +194,11 @@ >> } >> } >> } >> - >> - } else { >> - /* Another partition was explicitly requested */ >> + } >> + >> + // Another partition was explicitly requested > > And here you changed the comment style to C99. Don't do that. > >> + else >> + { > > Another unwanted change. > > Please take a more care to follow the style, consistency is important > in software projects. Ignoring review comments will lead to ignored > patches. > >> SEEK( bs * parnum ); >> READ( &par, sizeof(par) ); >> Here is an updated patch with the above issues fixed. Signed-off-by : John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/packages/mac-parts.c =================================================================== --- trunk/openbios-devel/packages/mac-parts.c (revision 1075) +++ trunk/openbios-devel/packages/mac-parts.c (working copy) @@ -164,16 +164,10 @@ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + /* If an Apple_HFS or Apple_HFSX partition was found */ + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; @@ -196,9 +190,7 @@ } } } - - } else { - /* Another partition was explicitly requested */ + } else { /* Another partition was explicitly requested */ SEEK( bs * parnum ); READ( &par, sizeof(par) );

2 1

Re: [OpenBIOS] [PATCH] PPC: Rework assignment of keyboard devalias.
by Mark Cave-Ayland 04 Dec '12

04 Dec '12

On 04/12/12 18:22, Blue Swirl wrote: >> The committed version was actually much smaller than this, as the string >> munging was required due to a separate bug for unit address during path >> resolution. >> >> I'd be quite keen to do the keyboard alias assignment as a separate pass, as >> I've used QEMU with multiple keyboards attached in some circumstances to >> work around driver issues. While the current algorithm is to pick the first >> keyboard device found, I'd like to think this could be controlled by >> parameters passed into QEMU/NVRAM someday. > > Something like -prom-env 'keyboard=/pci/isa/pckdb' or -prom-env > '/aliases/keyboard=/pci/isa/pckdb' should be easy to handle in > OpenBIOS. Yeah something like that to specify an override would be good. It's not on my immediate TODO list at the moment, although I'd be tempted to unify the current algorithm (which I committed to PPC only) across all architectures so that when the time comes, such a change becomes trivial. ATB, Mark.

1 0

Re: [OpenBIOS] Patch for auto partition selection
by Programmingkid 04 Dec '12

04 Dec '12

On Dec 3, 2012, at 3:13 PM, Mark Cave-Ayland wrote: > On 30/11/12 20:14, Programmingkid wrote: > >> What do you mean when you say something is whitespace damaged? > > It's a general term for formatting changes that don't affect the patch, e.g. > > for (i = 0; i <= 10; i++) { > > to > > for (i = 0; i <= 10; i++) > { > > It means that the patch includes non-functional changes which is generally frowned upon. > >> What section do I not need? Could you give me the first and last line of this section? I need the actual text since the line number will probably not help if our files are different. > > See below. > >>>> - } else { >>>> - /* Another partition was explicitly requested */ >>>> + } >>>> + >>>> + // if no partition and no file was selected - example: "dir cd:,\" >>>> + else if (parnum == -1) >>>> + { >>>> + // search for the first partition of type Apple_HFS or Apple_HFSX >>>> + for(parnum = 1; parnum<= __be32_to_cpu(par.pmMapBlkCnt); parnum++) >>>> + { >>>> + SEEK( bs * parnum ); >>>> + READ(&par, sizeof(par) ); >>>> + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); >>>> + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) >>>> + { >>>> + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; >>>> + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; >>>> + goto found; >>>> + break; >>>> + } >>>> + } >>>> + } >>>> + >>>> + // Another partition was explicitly requested >>>> + else >>>> + { >>>> + > > ATB, > > Mark. Ok this patch removes the unneeded code and remotes the whitespace damage. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/packages/mac-parts.c =================================================================== --- trunk/openbios-devel/packages/mac-parts.c (revision 1075) +++ trunk/openbios-devel/packages/mac-parts.c (working copy) @@ -164,16 +164,12 @@ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + // If an Apple_HFS or Apple_HFSX partition was found + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; @@ -181,9 +177,11 @@ if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; size = (long long)__be32_to_cpu(par.pmBootSize); - goto found; - } else { + } + + else + { /* Otherwise we were passed a filename and path. So let's choose the first partition with a valid filesystem */ DPUSH( offs ); @@ -196,9 +194,11 @@ } } } - - } else { - /* Another partition was explicitly requested */ + } + + // Another partition was explicitly requested + else + { SEEK( bs * parnum ); READ( &par, sizeof(par) );

2 1

Re: [OpenBIOS] [PATCH] PPC: Rework assignment of keyboard devalias.
by Mark Cave-Ayland 04 Dec '12

04 Dec '12

On 01/12/12 14:35, Blue Swirl wrote: > On Mon, Nov 26, 2012 at 12:13 AM, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk> wrote: >> Rather than simply copy the value of input-device, we scan the device >> tree for an entry with a device_type of keyboard and use that. This >> ensures that the keyboard alias always points to a physical keyboard >> device. > > Maybe I'm missing something, but other keyboard drivers (escc.c and > pc_kbd.c) just add the keyboard alias themselves, this should be > slightly faster because the scan is avoided. It's also only two lines > of code. The committed version was actually much smaller than this, as the string munging was required due to a separate bug for unit address during path resolution. I'd be quite keen to do the keyboard alias assignment as a separate pass, as I've used QEMU with multiple keyboards attached in some circumstances to work around driver issues. While the current algorithm is to pick the first keyboard device found, I'd like to think this could be controlled by parameters passed into QEMU/NVRAM someday. ATB, Mark.

2 1

Signed-off-by
by William Hahne 04 Dec '12

04 Dec '12

1 0

[PATCH] Adds filll word to dictionary
by Programmingkid 02 Dec '12

02 Dec '12

The filll word fills a region of memory with a 4 byte value. This word is different from fill because fill is used to fill a region of memory with a 1 byte value. This word is needed by bootx to boot Mac OS X. Here are some test results comparing Apple's implementation to mine. Apple's implementation: 0 > 100 buffer: mybuffer ok 0 > mybuffer 100 87654321 filll ok 0 > mybuffer 100 dump ffbc8800: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8810: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8820: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8830: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8840: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8850: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8860: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8870: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8880: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc8890: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc88a0: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc88b0: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc88c0: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc88d0: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc88e0: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| ffbc88f0: 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 |.eC!.eC!.eC!.eC!| My patch: 0 > mybuffer 100 87654321 filll ok 0 > mybuffer 100 dump fff771e0 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff771f0 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77200 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77210 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77220 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77230 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77240 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77250 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77260 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77270 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77280 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff77290 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff772a0 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff772b0 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff772c0 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! fff772d0 87 65 43 21 87 65 43 21 87 65 43 21 87 65 43 21 ?eC!?eC!?eC!?eC! The results are the same. This indicates the patch will work. After I applied this patch, bootx continued booting a little further than before. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: kernel/bootstrap.c =================================================================== --- kernel/bootstrap.c (revision 1067) +++ kernel/bootstrap.c (working copy) @@ -89,7 +89,7 @@ "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", - "$include", "$encode-file", "(debug", "(debug-off)" + "$include", "$encode-file", "(debug", "(debug-off)", "filll" }; /* Index: kernel/forth.c =================================================================== --- kernel/forth.c (revision 1067) +++ kernel/forth.c (working copy) @@ -1611,6 +1611,24 @@ } +// filll ( addr len long-number -- ) + +static void filll(void) +{ + int * location; + int length, fillNumber, index; + + fillNumber = POP(); + length = POP(); + location = (int *) POP(); + + for(index = 0; index <= length; index++) + { + location[index] = fillNumber; + } +} + + /* * unaligned-w@ ( addr -- w ) */ @@ -1963,4 +1981,5 @@ do_encode_file, /* $encode-file */ do_debug_xt, /* (debug */ do_debug_off, /* (debug-off) */ + filll, /* filll */ };

2 2

[PATCH] PPC: Rework assignment of keyboard devalias.
by Mark Cave-Ayland 01 Dec '12

01 Dec '12

Rather than simply copy the value of input-device, we scan the device tree for an entry with a device_type of keyboard and use that. This ensures that the keyboard alias always points to a physical keyboard device. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/ppc/qemu/qemu.fs | 36 +++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/qemu.fs b/openbios-devel/arch/ppc/qemu/qemu.fs index 0d691f7..29c4cf6 100644 --- a/openbios-devel/arch/ppc/qemu/qemu.fs +++ b/openbios-devel/arch/ppc/qemu/qemu.fs @@ -46,12 +46,38 @@ then ; -\ set the keyboard alias to stdin +variable keyboard-phandle 0 keyboard-phandle ! + +: (find-keyboard-device) ( phandle -- ) + recursive + >dn.child @ + begin ?dup while + dup dup " device_type" rot get-package-property 0= if + drop dup cstrlen + " keyboard" strcmp 0= if + dup to keyboard-phandle + then + then + (find-keyboard-device) + >dn.peer @ + repeat +; + +\ create the keyboard devalias :noname - active-package - " /aliases" find-device - input-device encode-string " keyboard" property - active-package! + device-tree @ (find-keyboard-device) + keyboard-phandle @ if + active-package + " /aliases" find-device + keyboard-phandle @ get-nodename + \ dictionary abused for temporary storage + here >r + " /" r@ 200 + tmpstrcat drop + keyboard-phandle @ >dn.parent @ get-package-path + r@ 240 + tmpstrcat r> 2drop + encode-string " keyboard" property + active-package! + then ; SYSTEM-initializer \ ------------------------------------------------------------------------- -- 1.7.10.4

2 1

Re: [OpenBIOS] Patch for auto partition selection
by Programmingkid 30 Nov '12

30 Nov '12

> > I've committed a fix for dir cd:,\ as r1072 as it seems that you are trying to solve 2 problems here. Please resubmit the part that changes the partition detection criteria (should now be very minimal) back to the openbios-devel list for review. > > > Kind regards, > > Mark. This patch adds a partition auto selection feature. It has been tested against r1075. This patch makes dir cd:,\ actually work. Index: packages/mac-parts.c =================================================================== --- packages/mac-parts.c (revision 1075) +++ packages/mac-parts.c (working copy) @@ -161,29 +161,29 @@ DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); /* No partition was explicitly requested so let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { + for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) + { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + // If an Apple_HFS or Apple_HFSX partition was found + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { + if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) + { offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; size = (long long)__be32_to_cpu(par.pmBootSize); - goto found; - } else { + } + + else + { /* Otherwise we were passed a filename and path. So let's choose the first partition with a valid filesystem */ DPUSH( offs ); @@ -196,9 +196,31 @@ } } } - - } else { - /* Another partition was explicitly requested */ + } + + // if no partition and no file was selected - example: "dir cd:,\" + else if (parnum == -1) + { + // search for the first partition of type Apple_HFS or Apple_HFSX + for(parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) + { + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + goto found; + break; + } + } + } + + // Another partition was explicitly requested + else + { + SEEK( bs * parnum ); READ( &par, sizeof(par) );

2 1

Re: [OpenBIOS] CIF for Filll patch
by Programmingkid 30 Nov '12

30 Nov '12

On Nov 30, 2012, at 9:13 AM, Mark Cave-Ayland wrote: > On 21/11/12 12:57, Programmingkid wrote: > >> Here is the CIF output I captured after adding FILLL. > > Thanks for this - the last RFC patch I just posted was because of this: > > of_client_interface: interpret 056136e4 00000001 00000640 fff73ed0 > interpret value depthbytes value rowbytes to active-package frame-buffer-adr value this-frame-buffer-adr : rect-setup >r >r rowbytes * swap depthbytes * + this-frame-buffer-adr + r> depthbytes * -rot r> ; : DRAW-RECTANGLE rect-setup 0 ?do 2dup 4 pick move 2 pick rowbytes d+ loop 3drop ; : FILL-RECTANGLE rect-setup rot depthbytes case 1 of dup 8 << or dup 10 << or endof 2 of dup 10 << or endof endcase -rot 0 ?do dup 3 pick 3 pick filll rowbytes + loop 3drop ; : READ-RECTANGLE rect-setup >r swap r> 0 ?do 2dup 4 pick move rowbytes 3 pick d+ loop 3drop ; this-frame-buffer-adr 0 to active-package ([4] -- [2]) > > ^^^^^^^^^^^^^^^^^^^ > > With this patch applied, do you get any further? I tried to compile the source code, but I saw this error: cc target/arch/x86/multiboot.o /bin/sh: i486-eabi-gcc: command not found It looks like a file is being included with the PPC target that shouldn't be included.

2 3

[RFC] [PATCH] Redefine "to" word in device.fs to allow the current package to be set like a standard value.
by Mark Cave-Ayland 30 Nov '12

30 Nov '12

BootX appears to be able to want to change the current package phandle by executing Forth statements in the form "<value> to active-package". This won't work correctly in OpenBIOS, since changing packages requires calling the active-package! word to perform additional housekeeping such as changing wordlists. The proposed solution here is to redefine "to" at the end of device.fs so that if package support is included, we perform an additional check on the destination xt to see if it matches that of active-package. If it does, then we manually invoke the active-package! word to select the new package. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/bootstrap/bootstrap.fs | 12 ++++++++---- openbios-devel/forth/device/device.fs | 11 +++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/openbios-devel/forth/bootstrap/bootstrap.fs b/openbios-devel/forth/bootstrap/bootstrap.fs index f295e4e..6878449 100644 --- a/openbios-devel/forth/bootstrap/bootstrap.fs +++ b/openbios-devel/forth/bootstrap/bootstrap.fs @@ -1052,17 +1052,21 @@ variable #instance 3 /n* + ! then ; - -: to - ['] ' execute + +: (to-xt) ( xt -- ) dup @ instance-cfa? state @ if swap ['] (lit) , , if ['] (ito) else ['] (to) then , else if (ito) else /n + ! then then - ; immediate +; +: to + ['] ' execute + (to-xt) + ; immediate + : is ( xt "wordname<>" -- ) parse-word $find if (to) diff --git a/openbios-devel/forth/device/device.fs b/openbios-devel/forth/device/device.fs index 4e025b9..562c919 100644 --- a/openbios-devel/forth/device/device.fs +++ b/openbios-devel/forth/device/device.fs @@ -189,3 +189,14 @@ variable device-tree free-mem then ; + +\ Redefine to word so that statements of the form "0 to active-package" +\ are supported for bootloaders that require it +: to + ['] ' execute + dup ['] active-package = if + drop active-package! + else + (to-xt) + then +; immediate -- 1.7.10.4

1 0

[commit] r1075 - trunk/openbios-devel/arch/ppc/qemu
by repository service 30 Nov '12

30 Nov '12

Author: mcayland Date: Fri Nov 30 00:02:25 2012 New Revision: 1075 URL: http://tracker.coreboot.org/trac/openbios/changeset/1075 Log: PPC: Rework assignment of keyboard devalias. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Fri Nov 30 00:02:22 2012 (r1074) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Fri Nov 30 00:02:25 2012 (r1075) @@ -46,12 +46,37 @@ then ; -\ set the keyboard alias to stdin +variable keyboard-phandle 0 keyboard-phandle ! + +: (find-keyboard-device) ( phandle -- ) + recursive + keyboard-phandle @ 0= if \ Return first match + >dn.child @ + begin ?dup while + dup dup " device_type" rot get-package-property 0= if + drop dup cstrlen + " keyboard" strcmp 0= if + dup to keyboard-phandle + then + then + (find-keyboard-device) + >dn.peer @ + repeat + else + drop + then +; + +\ create the keyboard devalias :noname - active-package - " /aliases" find-device - input-device encode-string " keyboard" property - active-package! + device-tree @ (find-keyboard-device) + keyboard-phandle @ if + active-package + " /aliases" find-device + keyboard-phandle @ get-package-path + encode-string " keyboard" property + active-package! + then ; SYSTEM-initializer \ -------------------------------------------------------------------------

1 0

[commit] r1074 - trunk/openbios-devel/forth/device
by repository service 30 Nov '12

30 Nov '12

Author: mcayland Date: Fri Nov 30 00:02:22 2012 New Revision: 1074 URL: http://tracker.coreboot.org/trac/openbios/changeset/1074 Log: Add a default "decode-unit" word for devices that don't implement their own. When a device does not implement its own "encode-unit" word, OpenBIOS currently supplies a default implementation that encodes a hex string to a single cell. This commit does the same for "decode-unit" ensuring that it is also possible to open a device path containing a unit address generated by a device that doesn't implement its own "encode-unit" word. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/pathres.fs Modified: trunk/openbios-devel/forth/device/pathres.fs ============================================================================== --- trunk/openbios-devel/forth/device/pathres.fs Sat Nov 24 15:43:11 2012 (r1073) +++ trunk/openbios-devel/forth/device/pathres.fs Fri Nov 30 00:02:22 2012 (r1074) @@ -177,28 +177,33 @@ \ 4.3.3 match child node \ +\ used if package lacks a decode-unit method +: def-decode-unit ( str len -- unitaddr ... ) + parse-hex +; + +: get-decode-unit-xt ( phandle -- xt ) + " decode-unit" rot find-method + 0= if ['] def-decode-unit then +; + : find-child ( sinfo -- phandle ) >r \ decode unit address string r@ >si.unit_addr 2@ dup if ( str len ) - " decode-unit" active-package find-method - if - depth 3 - >r execute depth r@ - r> swap - ( ... a_lo ... a_hi olddepth n ) - 4 min 0 max - dup r@ >si.unit_phys_len ! - ( ... a_lo ... a_hi olddepth n ) - r@ >si.unit_phys >r - begin 1- dup 0>= while - rot r> dup la1+ >r l!-be - repeat - r> 2drop - depth! - else - \ no decode-unit method... failure - -99 throw - then + active-package get-decode-unit-xt + depth 3 - >r execute depth r@ - r> swap + ( ... a_lo ... a_hi olddepth n ) + 4 min 0 max + dup r@ >si.unit_phys_len ! + ( ... a_lo ... a_hi olddepth n ) + r@ >si.unit_phys >r + begin 1- dup 0>= while + rot r> dup la1+ >r l!-be + repeat + r> 2drop + depth! else 2drop \ clear unit_phys

1 0

Bug in generated paths for CIF's package-to-path?
by Mark Cave-Ayland 28 Nov '12

28 Nov '12

Hi all, One of the reasons the previous posted patch for setting the keyboard devalias has to work with string concatenation is because of this oddity in get-package-path (the underlying word used by CIF's package-to-path): 0 > keyboard-phandle @ get-package-path ok 2 > type /pci@80000000/mac-io@4/via-cuda@16000/adb/keyboard@8 ok 0 > s" /pci@80000000/mac-io@4/via-cuda@16000/adb/keyboard@8" open-dev u. 0 ok Hmmmm. So the path we're returning is not valid. Some experimentation shows that the problem is due to the trailing @8 on the keyboard node: 0 > s" /pci@80000000/mac-io@4/via-cuda@16000/adb/keyboard" open-dev u. 7c5b33c ok 0 > keyboard-phandle @ push-package ok 0 > .properties name "keyboard" device_type "keyboard" reg 00000008 ok Now AFAICT one of two things is wrong here: 1) get-package-path should be fixed so that if a phandle belongs to a leaf node, the unit address is not included as part of the node name 2) open-dev should happily accept the trailing @8 on the keyboard node Does anyone know which one of these is the correct solution? Many thanks, Mark.

2 2

[commit] r1073 - trunk/openbios-devel/arch/ppc/qemu
by repository service 26 Nov '12

26 Nov '12

Author: mcayland Date: Sat Nov 24 15:43:11 2012 New Revision: 1073 URL: http://tracker.coreboot.org/trac/openbios/changeset/1073 Log: PPC: Add keyboard device alias as a duplicate of stdin. This is required when attempting to boot Mac OS X. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Nov 24 15:43:09 2012 (r1072) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Nov 24 15:43:11 2012 (r1073) @@ -46,6 +46,14 @@ then ; +\ set the keyboard alias to stdin +:noname + active-package + " /aliases" find-device + input-device encode-string " keyboard" property + active-package! +; SYSTEM-initializer + \ ------------------------------------------------------------------------- \ pre-booting \ -------------------------------------------------------------------------

3 7

[commit] r1072 - trunk/openbios-devel/packages
by repository service 24 Nov '12

24 Nov '12

Author: mcayland Date: Sat Nov 24 15:43:09 2012 New Revision: 1072 URL: http://tracker.coreboot.org/trac/openbios/changeset/1072 Log: Fix dir cd:,\ (no partition specified) when reading from Mac partitions. The existing checks in mac-parts,c were wrong; regardless of whether or not we have an argument string specified, if a partition is not specified then we must still search for the first valid partition. 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 Sat Nov 24 15:43:06 2012 (r1071) +++ trunk/openbios-devel/packages/mac-parts.c Sat Nov 24 15:43:09 2012 (r1072) @@ -140,7 +140,7 @@ * Implement partition selection as per the PowerPC Microprocessor CHRP bindings */ - if (str == NULL || parnum == 0) { + if (parnum == 0) { /* According to the spec, partition 0 as well as no arguments means the whole disk */ offs = (long long)0; size = (long long)__be32_to_cpu(dmap.sbBlkCount) * bs; @@ -156,12 +156,11 @@ ret = -1; goto out; - } else if (parnum == -1 && strlen(argstr)) { + } else if (parnum == -1) { DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); - /* No partition was explicitly requested, but an argstr was passed in. - So let's find a suitable partition... */ + /* No partition was explicitly requested so let's find a suitable partition... */ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) );

1 0

[commit] r1071 - in trunk/openbios-devel/forth: debugging lib
by repository service 24 Nov '12

24 Nov '12

Author: mcayland Date: Sat Nov 24 15:43:06 2012 New Revision: 1071 URL: http://tracker.coreboot.org/trac/openbios/changeset/1071 Log: Improve dir word by reducing complexity and adding some more diagnostics. Since the OF path resolution algorithm automatically passes anything following a ':' as an argument to the specified device, we don't need to bother with handling this ourselves. As a side effect, the auxiliary word split-path-device is no longer needed as we can isolate the path by doing a simple split on ','. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/forth/lib/split.fs Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Nov 23 16:50:43 2012 (r1070) +++ trunk/openbios-devel/forth/debugging/client.fs Sat Nov 24 15:43:06 2012 (r1071) @@ -126,12 +126,14 @@ : dir ( "{paths}<cr>" -- ) linefeed parse - split-path-device - open-dev dup 0= if + ascii , left-split + 2dup open-dev dup 0= if drop + cr ." Unable to locate device " type + 2drop exit then - -rot 2 pick + -rot 2drop -rot 2 pick " dir" rot ['] $call-method catch if 3drop Modified: trunk/openbios-devel/forth/lib/split.fs ============================================================================== --- trunk/openbios-devel/forth/lib/split.fs Fri Nov 23 16:50:43 2012 (r1070) +++ trunk/openbios-devel/forth/lib/split.fs Sat Nov 24 15:43:06 2012 (r1071) @@ -47,24 +47,3 @@ c@ r@ = if 1- then then r> drop ; - -\ split <param-text> into separate path and device strings -: split-path-device ( str len -- pathstr len devstr len ) - ascii , left-split 2 pick 0= if - \ No comma - so either <dev>:<id> or <dev>:<id><path> - 2dup ascii \ strchr 0= if - \ No backslash so just <dev> or <dev>:<id> - s" " 2swap \ ( pathstr len devstr len ) - else - \ Contains backslash, must be a <dev>:<id><path> - ascii : left-split \ ( pathstr len devstr len ) - then - - \ Remove RHS split (unused) - 4 roll drop - 4 roll drop - else - \ Contains comma so split is already correct - then -; -

1 0

[commit] r1070 - trunk/openbios-devel/arch/ppc
by repository service 23 Nov '12

23 Nov '12

Author: mcayland Date: Fri Nov 23 16:50:43 2012 New Revision: 1070 URL: http://tracker.coreboot.org/trac/openbios/changeset/1070 Log: The spin word is set by BootX when Mac OS X is booting. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Acked-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/ppc.fs Modified: trunk/openbios-devel/arch/ppc/ppc.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/ppc.fs Fri Nov 23 15:44:26 2012 (r1069) +++ trunk/openbios-devel/arch/ppc/ppc.fs Fri Nov 23 16:50:43 2012 (r1070) @@ -1,3 +1,6 @@ +\ ------------------------------------------------------------------------- +\ registers +\ ------------------------------------------------------------------------- 0 value %cr 0 value %ctr @@ -45,3 +48,10 @@ 0 value %sprg1 0 value %sprg2 0 value %sprg3 + +\ ------------------------------------------------------------------------- +\ other +\ ------------------------------------------------------------------------- + +\ Set by BootX when booting Mac OS X +defer spin

1 0

[commit] r1069 - trunk/openbios-devel/config/examples
by repository service 23 Nov '12

23 Nov '12

Author: mcayland Date: Fri Nov 23 15:44:26 2012 New Revision: 1069 URL: http://tracker.coreboot.org/trac/openbios/changeset/1069 Log: PPC32: Enable local variables for the PPC32 build. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Fri Nov 23 15:44:23 2012 (r1068) +++ trunk/openbios-devel/config/examples/ppc_config.xml Fri Nov 23 15:44:26 2012 (r1069) @@ -60,6 +60,7 @@ <option name="CONFIG_PPC_64BITSUPPORT" type="boolean" value="true"/> <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> <option name="CONFIG_RTAS" type="boolean" value="false"/> + <option name="CONFIG_LOCALS" type="boolean" value="true"/>  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>

1 0

[commit] r1068 - in trunk/openbios-devel/forth: bootstrap lib
by repository service 23 Nov '12

23 Nov '12

Author: mcayland Date: Fri Nov 23 15:44:23 2012 New Revision: 1068 URL: http://tracker.coreboot.org/trac/openbios/changeset/1068 Log: Implementation of Forth local variables for OpenBIOS. Some bootloaders, particularly OS X, execute Forth strings that make use of Forth local variables. This patch provides an implementation that allows OpenBIOS to execute such code. A couple of examples are included below: : diff.squares { A B -- A*A-B*B } A A * B B * - ; : myword { ; cat dog } 4 -> cat 5 -> dog cat \ cat's value pushed onto stack ( - cat) dog \ dog's value pushed onto stack (cat - cat dog ) + cr ." Total animals = " . cr ; Since the Forth locals stack and temporary dictionary take up extra space, the locals implementation is protected by a new CONFIG_LOCALS build variable. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/forth/lib/locals.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/lib/build.xml Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 21 20:14:06 2012 (r1067) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Fri Nov 23 15:44:23 2012 (r1068) @@ -49,6 +49,10 @@ defer context 0 value vocabularies? +defer locals-end +0 value locals-dict +variable locals-dict-buf + \ \ 7.3.7 Flag constants \ @@ -925,6 +929,11 @@ ; : $find ( name-str name-len -- xt true | name-str name-len false ) + locals-dict 0<> if + locals-dict-buf @ find-wordlist ?dup if + exit + then + then vocabularies? if #order @ 0 ?do i cells context + @ @@ -1426,6 +1435,10 @@ ; : ; + locals-dict 0<> if + 0 ['] locals-dict /n + ! + ['] locals-end , + then ['] (semis) , reveal ['] [ execute ; immediate Modified: trunk/openbios-devel/forth/lib/build.xml ============================================================================== --- trunk/openbios-devel/forth/lib/build.xml Sun Oct 21 20:14:06 2012 (r1067) +++ trunk/openbios-devel/forth/lib/build.xml Fri Nov 23 15:44:23 2012 (r1068) @@ -16,6 +16,7 @@ <object source="split.fs"/> <object source="lists.fs"/> <object source="64bit.fs"/> + <object source="locals.fs"/> </dictionary> </build> Added: trunk/openbios-devel/forth/lib/locals.fs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/forth/lib/locals.fs Fri Nov 23 15:44:23 2012 (r1068) @@ -0,0 +1,197 @@ +\ tag: local variables +\ +\ Copyright (C) 2012 Mark Cave-Ayland +\ +\ See the file "COPYING" for further information about +\ the copyright and warranty status of this work. +\ + +[IFDEF] CONFIG_LOCALS + +\ Init local variable stack +variable locals-var-stack +here 200 cells allot locals-var-stack ! + +\ Set initial stack pointer +\ +\ Stack looks like this: +\ ... (sp n-2) local1 ... localm-1 localm (sp n-1) <-- sp + +locals-var-stack @ value locals-var-sp +locals-var-sp locals-var-stack @ ! + +0 value locals-var-count +0 value locals-flags + +here 200 cells allot locals-dict-buf ! + +8 constant #locals + +: (local1) locals-var-sp @ /n + ; +: (local2) locals-var-sp @ 2 cells + ; +: (local3) locals-var-sp @ 3 cells + ; +: (local4) locals-var-sp @ 4 cells + ; +: (local5) locals-var-sp @ 5 cells + ; +: (local6) locals-var-sp @ 6 cells + ; +: (local7) locals-var-sp @ 7 cells + ; +: (local8) locals-var-sp @ 8 cells + ; + +: local1@ (local1) @ ; +: local2@ (local2) @ ; +: local3@ (local3) @ ; +: local4@ (local4) @ ; +: local5@ (local5) @ ; +: local6@ (local6) @ ; +: local7@ (local7) @ ; +: local8@ (local8) @ ; + +: local1! (local1) ! ; +: local2! (local2) ! ; +: local3! (local3) ! ; +: local4! (local4) ! ; +: local5! (local5) ! ; +: local6! (local6) ! ; +: local7! (local7) ! ; +: local8! (local8) ! ; + +create locals-read-table +['] local1@ , +['] local2@ , +['] local3@ , +['] local4@ , +['] local5@ , +['] local6@ , +['] local7@ , +['] local8@ , + +create locals-write-table +['] local1! , +['] local2! , +['] local3! , +['] local4! , +['] local5! , +['] local6! , +['] local7! , +['] local8! , + + +: locals-push ( n -- ) + locals-var-sp /n + to locals-var-sp + locals-var-sp ! +; + +: locals-0-push ( -- ) + 0 locals-push +; + +: (apply-local-flags) ( lfa -- ) + 1 - dup c@ locals-flags or swap c! +; + +: locals-no-pop? ( lfa -- ? ) + 1 - c@ 8 and 0<> +; + +: locals-drop \ Destroy current stack frame + locals-var-sp @ to locals-var-sp +; + +['] locals-drop to locals-end + +: (local-init) ( str len -- ) + header 1 , \ DOCOL + ['] (lit) , ['] noop , \ read-xt + ['] (lit) , ['] noop , \ write-xt + ['] 2drop , \ do nothing + ['] (lit) , + here 5 cells - , + ['] @ , ['] , , \ store read-xt + ['] (semis) , + reveal + immediate + last @ (apply-local-flags) +; + +: (local-noop) ( str len -- ) + 2drop +; + +\ Word called when consuming a local variable +defer (local) + +: } ( C: current latest here -- ) + here! latest ! current ! \ Switch back to normal dict + locals-dict-buf @ to locals-dict \ Make locals-dict visible to $find + 0 to locals-var-count + ['] locals-var-sp , \ save previous sp on rstack + ['] >r , + locals-dict @ \ ( last -- ) + begin + ?dup 0<> + while + >r + locals-var-count /n * + locals-read-table + @ r@ 3 cells + ! \ set read-xt + locals-var-count /n * + locals-write-table + @ r@ 5 cells + ! \ set write-xt + locals-var-count 1+ to locals-var-count + r@ locals-no-pop? if + ['] locals-0-push , \ initialise with 0 + else + ['] locals-push , \ initialise from stack + then + r> @ \ next lfa + repeat + ['] r> , + ['] locals-push , \ write previous sp +; immediate + +: { ( C: -- current latest here ) + current @ latest @ here + ['] (local-init) to (local) + 0 to locals-flags + 0 to locals-var-count + locals-dict-buf @ 200 cells 0 fill \ Zero out temporary dictionary + locals-dict-buf @ current ! \ Switch to locals dictionary + locals-dict-buf @ /n + here! + + begin + parse-word + 2dup s" }" strcmp 0= if + 2drop + ['] } execute -1 + else + 2dup s" ;" strcmp 0= if + 2drop + 8 to locals-flags 0 \ Don't init from stack + else + 2dup s" |" strcmp 0= if + 2drop + 8 to locals-flags 0 \ Don't init from stack + else + 2dup s" --" strcmp 0= if + 2drop + ['] (local-noop) to (local) 0 + else + locals-var-count #locals < if + (local) 0 \ accept local + else + s" maximum locals used ignoring " type type cr 0 + then + locals-var-count 1+ to locals-var-count + then + then + then + then + until +; immediate + +: -> ( n -- ) + parse-word $find if + 4 cells + @ , + else + s" unable to find word " type type + then +; immediate + +[THEN]

1 0

CIF for Filll patch
by Programmingkid 21 Nov '12

21 Nov '12

Here is the CIF output I captured after adding FILLL. >> ============================================================= >> OpenBIOS 1.0 [Nov 19 2012 20:51] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Nov 19 2012 20:51 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> finddevice("/openprom") = 0xfff69f4c >> getprop(0xfff69f4c, "model", 0x0565f68c, 255) = 15 >> 0x0565f68c 4f 70 65 6e 46 69 72 6d 77 61 72 65 20 33 00 __ OpenFirmware 3. >> peer(0x00000000) = 0xfff69d8c >> getprop(0xfff69d8c, "#address-cells", 0x056579d0, 4) = 4 >> 0x056579d0 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> peer(0x00000000) = 0xfff69d8c >> getprop(0xfff69d8c, "#size-cells", 0x056579d4, 4) = 4 >> 0x056579d4 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> of_client_interface: interpret 05616674 >> interpret hex unselect-dev " /packages" find-device new-device " sl_words" device-name : open true ; : close ; 0 value outputLevel : slw_set_output_level dup 0= if 0 stdout ! then to outputLevel ; : slw_emit 2 outputLevel <= if emit else drop then ; : slw_cr 2 outputLevel <= if cr then ; 0 value keyboardIH 20 buffer: keyMap : slw_init_keymap to keyboardIH keyMap dup 20 0 fill ; : slw_update_keymap { ; dpth } depth -> dpth keyboardIH if " get-key-map" keyboardIH $call-method depth dpth - 1 = if 20 then 4 / 0 do dup i 4 * + l@ keyMap i 4 * + tuck l@ or swap l! loop drop then ; 0 value screenIH 0 value cursorAddr 0 value cursorX 0 value cursorY 0 value cursorW 0 value cursorH 0 value cursorFrames 0 value cursorPixelSize 0 value cursorStage 0 value cursorTime 0 value cursorDelay : slw_spin screenIH 0<> cursorAddr 0<> and if get-msecs dup cursorTime - cursorDelay >= if to cursorTime slw_update_keymap cursorStage 1+ cursorFrames mod dup to cursorStage handle_calls return: 00000000 07c5b8e0 >> finddevice("/options") = 0xfff6a0f4 >> finddevice("/chosen") = 0xfff6a16c >> of_client_interface: interpret 056133e4 >> interpret dev /chosen new-device " memory-map" device-name active-package device-end ([1] -- [2]) >> handle_calls return: 00000000 fff77c8c >> getprop(0xfff6a16c, "mmu", 0x056579ec, 4) = 4 >> 0x056579ec 07 c5 a8 2c __ __ __ __ __ __ __ __ __ __ __ __ .Ũ, >> getprop(0xfff6a16c, "memory", 0x056579f0, 4) = 4 >> 0x056579f0 07 c5 ae 58 __ __ __ __ __ __ __ __ __ __ __ __ .ŮX >> peer(0x00000000) = 0xfff69d8c >> of_client_interface: interpret 05616db8 fff69d8c 0000000a 056131d4 >> interpret get-package-property if 0 0 then ([4] -- [3]) >> handle_calls return: 00000000 00000019 fff76f6c >> getprop(0xfff6a16c, "stdout", 0x056579f4, 4) = 4 >> 0x056579f4 07 c5 af 5c __ __ __ __ __ __ __ __ __ __ __ __ .ů\ >> instance-to-package(0x07c5af5c) = 0xfff76640 >> getprop(0xfff6a16c, "stdin", 0x056579f8, 4) = 4 >> 0x056579f8 07 c5 b0 64 __ __ __ __ __ __ __ __ __ __ __ __ .Űd >> instance-to-package(0x07c5b064) = 0xfff76640 >> getprop(0xfff76640, "name", 0x0565f81c, 31) = 5 >> 0x0565f81c 63 68 2d 62 00 __ __ __ __ __ __ __ __ __ __ __ ch-b. >> open("keyboard") = 0x07c5bc88 >> of_client_interface: call-method 05616d78 07c5b8e0 07c5bc88 >> call-method slw_init_keymap ([3] -- [2]) >> handle_calls return: 00000000 fff77754 >> of_client_interface: call-method 05616d88 07c5b8e0 >> call-method slw_update_keymap ([2] -- [1]) >> handle_calls return: 00000000 >> getprop(0xfff6a0f4, "security-mode", 0x0565f83c, 32) = -1 >> of_client_interface: call-method 05616d60 07c5b8e0 00000000 >> call-method slw_set_output_level ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 07c5b8e0 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 07c5b8e0 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 0000004d >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000063 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 0000004f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000053 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000058 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 0000004c >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 0000006f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000064 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000065 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 07c5b8e0 00000072 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 07c5b8e0 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> claim(0x05000000, 4194304, 0) = 0x05000000 >> claim(0x05400000, 2097152, 0) = 0x05400000 >> claim(0x04000000, 16777216, 0) = 0x04000000 >> claim(0x00004000, 67092480, 0) = 0x00004000 >> peer(0x00000000) = 0xfff69d8c >> child(0xfff69d8c) = 0xfff69ea8 >> getprop(0xfff69ea8, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff69ea8) = 0x00000000 >> peer(0xfff69ea8) = 0xfff69f4c >> getprop(0xfff69f4c, "device_type", 0x056569c8, 4095) = 8 >> 0x056569c8 42 6f 6f 74 52 4f 4d 00 __ __ __ __ __ __ __ __ BootROM. >> child(0xfff69f4c) = 0xfff6fd0c >> getprop(0xfff6fd0c, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff6fd0c) = 0x00000000 >> peer(0xfff6fd0c) = 0x00000000 >> peer(0xfff69f4c) = 0xfff6a0f4 >> getprop(0xfff6a0f4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff6a0f4) = 0x00000000 >> peer(0xfff6a0f4) = 0xfff6a16c >> getprop(0xfff6a16c, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff6a16c) = 0xfff77c8c >> getprop(0xfff77c8c, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff77c8c) = 0x00000000 >> peer(0xfff77c8c) = 0x00000000 >> peer(0xfff6a16c) = 0xfff6a250 >> getprop(0xfff6a250, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff6a250) = 0xfff6a2f4 >> getprop(0xfff6a2f4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff6a2f4) = 0x00000000 >> peer(0xfff6a2f4) = 0x00000000 >> peer(0xfff6a250) = 0xfff6fa00 >> getprop(0xfff6fa00, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff6fa00) = 0xfff70b14 >> getprop(0xfff70b14, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff70b14) = 0x00000000 >> peer(0xfff70b14) = 0xfff70c54 >> getprop(0xfff70c54, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff70c54) = 0x00000000 >> peer(0xfff70c54) = 0xfff718c4 >> getprop(0xfff718c4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff718c4) = 0x00000000 >> peer(0xfff718c4) = 0xfff724b4 >> getprop(0xfff724b4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff724b4) = 0x00000000 >> peer(0xfff724b4) = 0xfff72808 >> getprop(0xfff72808, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff72808) = 0x00000000 >> peer(0xfff72808) = 0xfff72aa8 >> getprop(0xfff72aa8, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff72aa8) = 0x00000000 >> peer(0xfff72aa8) = 0xfff72d44 >> getprop(0xfff72d44, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff72d44) = 0x00000000 >> peer(0xfff72d44) = 0xfff72f7c >> getprop(0xfff72f7c, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff72f7c) = 0x00000000 >> peer(0xfff72f7c) = 0xfff731b4 >> getprop(0xfff731b4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff731b4) = 0x00000000 >> peer(0xfff731b4) = 0xfff733ec >> getprop(0xfff733ec, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff733ec) = 0x00000000 >> peer(0xfff733ec) = 0xfff73624 >> getprop(0xfff73624, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff73624) = 0x00000000 >> peer(0xfff73624) = 0xfff73858 >> getprop(0xfff73858, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff73858) = 0x00000000 >> peer(0xfff73858) = 0xfff73924 >> getprop(0xfff73924, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff73924) = 0x00000000 >> peer(0xfff73924) = 0xfff739ec >> getprop(0xfff739ec, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff739ec) = 0x00000000 >> peer(0xfff739ec) = 0xfff775b4 >> getprop(0xfff775b4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff775b4) = 0x00000000 >> peer(0xfff775b4) = 0x00000000 >> peer(0xfff6fa00) = 0xfff716c4 >> getprop(0xfff716c4, "device_type", 0x056569c8, 4095) = -1 >> child(0xfff716c4) = 0xfff77040 >> getprop(0xfff77040, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 63 70 75 00 __ __ __ __ __ __ __ __ __ __ __ __ cpu. >> child(0xfff77040) = 0x00000000 >> peer(0xfff77040) = 0x00000000 >> peer(0xfff716c4) = 0xfff717c4 >> getprop(0xfff717c4, "device_type", 0x056569c8, 4095) = 7 >> 0x056569c8 6d 65 6d 6f 72 79 00 __ __ __ __ __ __ __ __ __ memory. >> child(0xfff717c4) = 0x00000000 >> peer(0xfff717c4) = 0xfff73ab8 >> getprop(0xfff73ab8, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 70 63 69 00 __ __ __ __ __ __ __ __ __ __ __ __ pci. >> child(0xfff73ab8) = 0xfff73ed0 >> getprop(0xfff73ed0, "device_type", 0x056569c8, 4095) = 8 >> 0x056569c8 64 69 73 70 6c 61 79 00 __ __ __ __ __ __ __ __ display. >> child(0xfff73ed0) = 0x00000000 >> peer(0xfff73ed0) = 0xfff743a4 >> getprop(0xfff743a4, "device_type", 0x056569c8, 4095) = 8 >> 0x056569c8 6e 65 74 77 6f 72 6b 00 __ __ __ __ __ __ __ __ network. >> child(0xfff743a4) = 0x00000000 >> peer(0xfff743a4) = 0xfff74780 >> getprop(0xfff74780, "device_type", 0x056569c8, 4095) = 8 >> 0x056569c8 70 63 69 2d 69 64 65 00 __ __ __ __ __ __ __ __ pci-ide. >> child(0xfff74780) = 0xfff74bbc >> getprop(0xfff74bbc, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 61 74 61 00 __ __ __ __ __ __ __ __ __ __ __ __ ata. >> child(0xfff74bbc) = 0xfff74d3c >> getprop(0xfff74d3c, "device_type", 0x056569c8, 4095) = 6 >> 0x056569c8 62 6c 6f 63 6b 00 __ __ __ __ __ __ __ __ __ __ block. >> child(0xfff74d3c) = 0x00000000 >> peer(0xfff74d3c) = 0x00000000 >> peer(0xfff74bbc) = 0xfff75108 >> getprop(0xfff75108, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 61 74 61 00 __ __ __ __ __ __ __ __ __ __ __ __ ata. >> child(0xfff75108) = 0x00000000 >> peer(0xfff75108) = 0x00000000 >> peer(0xfff74780) = 0xfff75288 >> getprop(0xfff75288, "device_type", 0x056569c8, 4095) = 7 >> 0x056569c8 6d 61 63 2d 69 6f 00 __ __ __ __ __ __ __ __ __ mac-io. >> child(0xfff75288) = 0xfff75768 >> getprop(0xfff75768, "device_type", 0x056569c8, 4095) = 9 >> 0x056569c8 76 69 61 2d 63 75 64 61 00 __ __ __ __ __ __ __ via-cuda. >> child(0xfff75768) = 0xfff75984 >> getprop(0xfff75984, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 61 64 62 00 __ __ __ __ __ __ __ __ __ __ __ __ adb. >> child(0xfff75984) = 0xfff75aec >> getprop(0xfff75aec, "device_type", 0x056569c8, 4095) = 9 >> 0x056569c8 6b 65 79 62 6f 61 72 64 00 __ __ __ __ __ __ __ keyboard. >> child(0xfff75aec) = 0x00000000 >> peer(0xfff75aec) = 0xfff75d14 >> getprop(0xfff75d14, "device_type", 0x056569c8, 4095) = 6 >> 0x056569c8 6d 6f 75 73 65 00 __ __ __ __ __ __ __ __ __ __ mouse. >> child(0xfff75d14) = 0x00000000 >> peer(0xfff75d14) = 0x00000000 >> peer(0xfff75984) = 0xfff75ea0 >> getprop(0xfff75ea0, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 72 74 63 00 __ __ __ __ __ __ __ __ __ __ __ __ rtc. >> child(0xfff75ea0) = 0x00000000 >> peer(0xfff75ea0) = 0x00000000 >> peer(0xfff75768) = 0xfff76080 >> getprop(0xfff76080, "device_type", 0x056569c8, 4095) = 6 >> 0x056569c8 6e 76 72 61 6d 00 __ __ __ __ __ __ __ __ __ __ nvram. >> child(0xfff76080) = 0x00000000 >> peer(0xfff76080) = 0xfff762a0 >> getprop(0xfff762a0, "device_type", 0x056569c8, 4095) = 5 >> 0x056569c8 65 73 63 63 00 __ __ __ __ __ __ __ __ __ __ __ escc. >> child(0xfff762a0) = 0xfff763a8 >> getprop(0xfff763a8, "device_type", 0x056569c8, 4095) = 7 >> 0x056569c8 73 65 72 69 61 6c 00 __ __ __ __ __ __ __ __ __ serial. >> child(0xfff763a8) = 0x00000000 >> peer(0xfff763a8) = 0xfff76640 >> getprop(0xfff76640, "device_type", 0x056569c8, 4095) = 7 >> 0x056569c8 73 65 72 69 61 6c 00 __ __ __ __ __ __ __ __ __ serial. >> child(0xfff76640) = 0x00000000 >> peer(0xfff76640) = 0x00000000 >> peer(0xfff762a0) = 0xfff768ac >> getprop(0xfff768ac, "device_type", 0x056569c8, 4095) = 4 >> 0x056569c8 61 74 61 00 __ __ __ __ __ __ __ __ __ __ __ __ ata. >> child(0xfff768ac) = 0xfff76b54 >> getprop(0xfff76b54, "device_type", 0x056569c8, 4095) = 6 >> 0x056569c8 62 6c 6f 63 6b 00 __ __ __ __ __ __ __ __ __ __ block. >> child(0xfff76b54) = 0x00000000 >> peer(0xfff76b54) = 0x00000000 >> peer(0xfff768ac) = 0x00000000 >> peer(0xfff75288) = 0x00000000 >> parent(0xfff73ed0) = 0xfff73ab8 >> peer(0xfff73ab8) = 0x00000000 >> parent(0xfff73ab8) = 0xfff69d8c >> peer(0xfff69d8c) = 0x00000000 >> parent(0xfff69d8c) = 0x00000000 >> finddevice("/chaos/control") = 0xffffffff >> finddevice("screen") = 0xfff76640 >> of_client_interface: interpret 0561366c >> interpret " _screen-ihandle" $find if execute else 0 then ([1] -- [2]) >> interpret '" _screen-ihandle" $find if execute else 0 then': possible argument error (-1--2) got 2 >> handle_calls return: 00000000 00000000 >> package-to-path(0xfff73ed0, 0x0565f5ac, 255) = 24 >> 0x0565f5ac 2f 70 63 69 40 38 30 30 30 30 30 30 30 2f 51 45 /pci@80000000/QE >> 0x0565f5bc 4d 55 2c 56 47 41 40 31 __ __ __ __ __ __ __ __ MU,VGA@1 >> open("/pci@80000000/QEMU,VGA@1:0") = 0x07c5bcf4 >> getprop(0xfff73ed0, "display-type", 0x0565f6bc, 31) = -1 >> getprop(0xfff73ed0, "address", 0x0562aba4, 4) = 4 >> 0x0562aba4 80 00 00 00 __ __ __ __ __ __ __ __ __ __ __ __ .... >> getprop(0xfff73ed0, "width", 0x0562aba8, 4) = 4 >> 0x0562aba8 00 00 03 20 __ __ __ __ __ __ __ __ __ __ __ __ ... >> getprop(0xfff73ed0, "height", 0x0562abac, 4) = 4 >> 0x0562abac 00 00 02 58 __ __ __ __ __ __ __ __ __ __ __ __ ...X >> getprop(0xfff73ed0, "depth", 0x0562abb0, 4) = 4 >> 0x0562abb0 00 00 00 0f __ __ __ __ __ __ __ __ __ __ __ __ .... >> getprop(0xfff73ed0, "linebytes", 0x0562abb4, 4) = 4 >> 0x0562abb4 00 00 06 40 __ __ __ __ __ __ __ __ __ __ __ __ ...@ >> of_client_interface: interpret 056136e4 00000001 00000640 fff73ed0 >> interpret value depthbytes value rowbytes to active-package frame-buffer-adr value this-frame-buffer-adr : rect-setup >r >r rowbytes * swap depthbytes * + this-frame-buffer-adr + r> depthbytes * -rot r> ; : DRAW-RECTANGLE rect-setup 0 ?do 2dup 4 pick move 2 pick rowbytes d+ loop 3drop ; : FILL-RECTANGLE rect-setup rot depthbytes case 1 of dup 8 << or dup 10 << or endof 2 of dup 10 << or endof endcase -rot 0 ?do dup 3 pick 3 pick filll rowbytes + loop 3drop ; : READ-RECTANGLE rect-setup >r swap r> 0 ?do 2dup 4 pick move rowbytes 3 pick d+ loop 3drop ; this-frame-buffer-adr 0 to active-package ([4] -- [2]) >> handle_calls return: 00000000 80000000 >> of_client_interface: call-method 05613620 07c5bcf4 00000258 00000320 00000000 00000000 00000001 >> call-method fill-rectangle ([7] -- [1]) >> handle_calls return: 00000000 >> getprop(0xfff6a16c, "bootpath", 0x056567c8, 255) = 12 >> 0x056567c8 63 64 3a 2c 5c 5c 3a 74 62 78 69 00 __ __ __ __ cd:,\\:tbxi. >> finddevice("cd:,\\:tbxi") = 0xfff74d3c >> getprop(0xfff74d3c, "device_type", 0x0565f7bc, 31) = 6 >> 0x0565f7bc 62 6c 6f 63 6b 00 __ __ __ __ __ __ __ __ __ __ block. >> getprop(0xfff6a16c, "bootargs", 0x056568c8, 256) = 1 >> 0x056568c8 00 __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ . >> setprop(0xfff6a16c, "rootpath", 0x056568c8, 19) >> 0x056568c8 63 64 3a 30 2c 5c 5c 6d 61 63 68 5f 6b 65 72 6e cd:0,\\mach_kern >> 0x056568d8 65 6c 00 __ __ __ __ __ __ __ __ __ __ __ __ __ el. >> = 19 >> setprop(0xfff73ed0, "AAPL,boot-display", 0x00000000, 0) >> = 0 >> of_client_interface: call-method 05613610 07c5bcf4 00000080 00000080 000000ec 00000150 05617280 >> call-method draw-rectangle ([7] -- [1])

1 0

Mac OS X support
by Amadeusz Sławiński 16 Nov '12

16 Nov '12

Seeing as there are people who want work on Max OS X (ppc) support and to speed up their work, so they won't redundantly search for stuff which needs to get implemented and so they can spend time on implementing it further. There was some work done already during GSOC 2011, which didn't get applied (due to not being finished? / missing signed-offs). Anyway some time ago I tried to apply those patches and got Mac OS X to start booting, you can see description and some screenshots at this address: http://www.emaculation.com/forum/viewtopic.php?f=1&t=7047 Links to those patches with my comments here: I tried them with latest tree, mixing some current stuff from mailing list (mainly trying some filesystem things). http://lists.openbios.org/pipermail/openbios/2011-August/006653.html dummy get-key-map http://lists.openbios.org/pipermail/openbios/2011-August/006615.html http://lists.openbios.org/pipermail/openbios/2011-August/006616.html http://lists.openbios.org/pipermail/openbios/2011-August/006618.html file-system / partitioning stuff - may need some changes due to recent patches http://lists.openbios.org/pipermail/openbios/2011-August/006617.html after "Call kernel!" it stops drawing to screen http://lists.openbios.org/pipermail/openbios/2011-August/006619.html local forth variables, I tested new implementation (from few days ago) and it also works http://lists.openbios.org/pipermail/openbios/2011-August/006620.html I think I stumbled upon it not booting without this one, but currently can't reproduce http://lists.openbios.org/pipermail/openbios/2011-August/006651.html 0 > boot cd:\\:tbxi >> openbios panic: Unexpected exception fff26500 http://lists.openbios.org/pipermail/openbios/2011-August/006623.html for drawing apple logo (from my tests it seems badly positioned but it may just want some other -g option to qemu) https://lists.nongnu.org/archive/html/qemu-devel/2011-08/msg01418.html I can confirm that it stops after "COLOR video console at 0x80000000 (800x600x32) without this I will certainly test any new patches that appear ;) Amadeusz

3 6

Re: [OpenBIOS] OpenBIOS v1.1
by Programmingkid 15 Nov '12

15 Nov '12

On Nov 14, 2012, at 4:35 AM, Mark Cave-Ayland wrote: > On 14/11/12 02:39, Programmingkid wrote: > >> It is probably a lot of stuff. The get-key-map word is one of them. I'm going to have to put bootx under the microscope to see what else is the problem. > > Well may I make a suggestion? At the moment, our ability to help is limited because you are the only person with a copy of OS X. > > It would make more sense rather than simply stating "I need to do X, Y and Z" on the mailing list, that you post sections of log file to the mailing list so that people who know more about Open Firmware can make a better judgment as to what is the best way forward. > > In particular, I'd expect you to be posting sections of log file with CIF debugging enabled so you can see exactly what Forth is being executed and whether or not it is failing. > > The other alternative is for someone to send me a copy of OS X bought from Ebay or similar... This will help you: http://www.ebay.com/itm/Apple-Mac-OS-X-Jaguar-Version-10-2-Install-Discs-Ma… Here is the debug output from enabling DEBUG_CIF: 0 > boot cd:,\\:tbxi >> finddevice("/openprom") = 0xfff48f3c >> getprop(0xfff48f3c, "model", 0x0565f68c, 255) = 15 >> 0x0565f68c 4f 70 65 6e 46 69 72 6d 77 61 72 65 20 33 00 __ OpenFirmware 3. >> peer(0x00000000) = 0xfff48d7c >> getprop(0xfff48d7c, "#address-cells", 0x056579d0, 4) = 4 >> 0x056579d0 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> peer(0x00000000) = 0xfff48d7c >> getprop(0xfff48d7c, "#size-cells", 0x056579d4, 4) = 4 >> 0x056579d4 00 00 00 01 __ __ __ __ __ __ __ __ __ __ __ __ .... >> of_client_interface: interpret 05616674 >> interpret hex unselect-dev " /packages" find-device new-device " sl_words" device-name : open true ; : close ; 0 value outputLevel : slw_set_output_level dup 0= if 0 stdout ! then to outputLevel ; : slw_emit 2 outputLevel <= if emit else drop then ; : slw_cr 2 outputLevel <= if cr then ; 0 value keyboardIH 20 buffer: keyMap : slw_init_keymap to keyboardIH keyMap dup 20 0 fill ; : slw_update_keymap { ; dpth } depth -> dpth keyboardIH if " get-key-map" keyboardIH $call-method depth dpth - 1 = if 20 then 4 / 0 do dup i 4 * + l@ keyMap i 4 * + tuck l@ or swap l! loop drop then ; 0 value screenIH 0 value cursorAddr 0 value cursorX 0 value cursorY 0 value cursorW 0 value cursorH 0 value cursorFrames 0 value cursorPixelSize 0 value cursorStage 0 value cursorTime 0 value cursorDelay : slw_spin screenIH 0<> cursorAddr 0<> and if get-msecs dup cursorTime - cursorDelay >= if to cursorTime slw_update_keymap cursorStage 1+ cursorFrames mod dup to cursorStage handle_calls return: 00000000 1fc5b2f0 >> finddevice("/options") = 0xfff490e4 >> finddevice("/chosen") = 0xfff4915c >> of_client_interface: interpret 056133e4 >> interpret dev /chosen new-device " memory-map" device-name active-package device-end ([1] -- [2]) >> handle_calls return: 00000000 fff56864 >> getprop(0xfff4915c, "mmu", 0x056579ec, 4) = 4 >> 0x056579ec 1f c5 a8 2c __ __ __ __ __ __ __ __ __ __ __ __ .Ũ, >> getprop(0xfff4915c, "memory", 0x056579f0, 4) = 4 >> 0x056579f0 1f c5 ae 58 __ __ __ __ __ __ __ __ __ __ __ __ .ŮX >> peer(0x00000000) = 0xfff48d7c >> of_client_interface: interpret 05616db8 fff48d7c 0000000a 056131d4 >> interpret get-package-property if 0 0 then ([4] -- [3]) >> handle_calls return: 00000000 00000019 fff55b44 >> getprop(0xfff4915c, "stdout", 0x056579f4, 4) = 4 >> 0x056579f4 1f c5 af 5c __ __ __ __ __ __ __ __ __ __ __ __ .ů\ >> instance-to-package(0x1fc5af5c) = 0xfff555e4 >> getprop(0xfff4915c, "stdin", 0x056579f8, 4) = 4 >> 0x056579f8 1f c5 b0 64 __ __ __ __ __ __ __ __ __ __ __ __ .Űd >> instance-to-package(0x1fc5b064) = 0xfff555e4 >> getprop(0xfff555e4, "name", 0x0565f81c, 31) = 5 >> 0x0565f81c 63 68 2d 62 00 __ __ __ __ __ __ __ __ __ __ __ ch-b. >> open("keyboard") = 0x00000000 >> open("kbd") = 0x00000000 >> of_client_interface: call-method 05616d78 1fc5b2f0 00000000 >> call-method slw_init_keymap ([3] -- [2]) >> handle_calls return: 00000000 fff5632c >> of_client_interface: call-method 05616d88 1fc5b2f0 >> call-method slw_update_keymap ([2] -- [1]) >> handle_calls return: 00000000 >> getprop(0xfff490e4, "security-mode", 0x0565f83c, 32) = -1 >> of_client_interface: call-method 05616d60 1fc5b2f0 00000000 >> call-method slw_set_output_level ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 1fc5b2f0 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 1fc5b2f0 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 0000004d >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000063 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 0000004f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000053 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000058 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000020 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 0000004c >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 0000006f >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000061 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000064 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000065 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c78 1fc5b2f0 00000072 >> call-method slw_emit ([3] -- [1]) >> handle_calls return: 00000000 >> of_client_interface: call-method 05613c70 1fc5b2f0 >> call-method slw_cr ([2] -- [1]) >> handle_calls return: 00000000 >> claim(0x05000000, 4194304, 0) = 0x05000000 >> claim(0x05400000, 2097152, 0) = 0x05400000 >> claim(0x04000000, 16777216, 0) = 0x04000000 >> claim(0x00004000, 67092480, 0) = 0x00004000 The first thing that bothers me is this: >> open("keyboard") = 0x00000000 >> open("kbd") = 0x00000000 Bootx can't open the keyboard node and call any of its methods. This is something to fix. I would fix it myself, but I couldn't find any documentation on how the DECLARE_NODE() method works. On a side note, the partition selection patch I sent you appears to be ready to commit. It is the patch that has made the most difference. Because of it, the Mac OS actually beings to start booting when I use the boot word.

3 3

[PATCH] adds spin word to dictionary
by Programmingkid 14 Nov '12

14 Nov '12

This patch is a replacement for the last spin patch. The spin word has been moved to another file because of compilation issues. The spin word is set by bootx when Mac OS X is booting. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/forth/system/main.fs =================================================================== --- trunk/openbios-devel/forth/system/main.fs (revision 1067) +++ trunk/openbios-devel/forth/system/main.fs (working copy) @@ -58,3 +58,6 @@ outer-interpreter ; + +\ Set by Bootx when booting Mac OS X +defer spin \ No newline at end of file

1 0

[PATCH] have switch-arch tell you compiler name
by Programmingkid 13 Nov '12

13 Nov '12

This patch adds a feature to switch-arch so it tells you the names of the compilers is it looking for. I had just installed a cross compiler and was confused as to why switch-arch wouldn't detect it. This feature helped me figure out that the problem was with the name of the compiler I was using. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: /Users/misbah/Desktop/openbios/trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- /Users/misbah/Desktop/openbios/trunk/openbios-devel/config/scripts/switch-arch (revision 1067) +++ /Users/misbah/Desktop/openbios/trunk/openbios-devel/config/scripts/switch-arch (working copy) @@ -99,6 +99,7 @@ { for TARGET in ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- do + echo "Trying compiler ${TARGET}gcc" if type ${TARGET}gcc > /dev/null 2>&1 then return

2 1

[PATCH] adds spin word to dictionary
by Programmingkid 13 Nov '12

13 Nov '12

This patch adds the word 'spin' to the dictionary. It is defer instance that is set by Bootx while booting Mac OS X. I kept it in the ppc.fs file because this file is only used on PowerPC targets. Index: trunk/openbios-devel/arch/ppc/ppc.fs =================================================================== --- trunk/openbios-devel/arch/ppc/ppc.fs (revision 1067) +++ trunk/openbios-devel/arch/ppc/ppc.fs (working copy) @@ -45,3 +45,6 @@ 0 value %sprg1 0 value %sprg2 0 value %sprg3 + +\ Set by BootX to boot Mac OS X +defer spin \ No newline at end of file

2 1

About the local variable patch
by Programmingkid 13 Nov '12

13 Nov '12

I ran Mark's local variable patch thru all these test and it past. : myword { ; dog cat } 4 -> dog 33 -> cat cr ." dog = " dog . cr ." cat = " cat . ; 4 : myword2 { hamster } cr ." hamster = " hamster . ; 8 : myword3 { car ; truck } 5 -> truck cr ." truck = " truck . cr ." car = " car . ; 9 10 : myword4 { bevus butthead ; homer } cr ." bevus = " bevus . 3 -> homer cr ." homer = " homer . cr ." butthead = " butthead . ; 100 1 do I I 1 + myword4 loop : myword6 { ; bart } 19 -> bart cr ." bart in myword6 = " bart . ; : myword5 { ; bart } 10 -> bart myword6 cr ." bart in myword5 = " bart . ; Good job :)

2 1

[PATCH 1/2] Implementation of Forth local variables for OpenBIOS.
by Mark Cave-Ayland 08 Nov '12

08 Nov '12

Some bootloaders, particularly OS X, execute Forth strings that make use of Forth local variables. This patch provides an implementation that allows OpenBIOS to execute such code. A couple of examples are included below: : diff.squares { A B -- A*A-B*B } A A * B B * - ; : myword { ; cat dog } 4 -> cat 5 -> dog cat \ cat's value pushed onto stack ( - cat) dog \ dog's value pushed onto stack (cat - cat dog ) + cr ." Total animals = " . cr ; Since the Forth locals stack and temporary dictionary take up extra space, the locals implementation is protected by a new CONFIG_LOCALS build variable. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/bootstrap/bootstrap.fs | 13 ++ openbios-devel/forth/lib/build.xml | 1 + openbios-devel/forth/lib/locals.fs | 197 +++++++++++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 openbios-devel/forth/lib/locals.fs diff --git a/openbios-devel/forth/bootstrap/bootstrap.fs b/openbios-devel/forth/bootstrap/bootstrap.fs index 08683f0..f295e4e 100644 --- a/openbios-devel/forth/bootstrap/bootstrap.fs +++ b/openbios-devel/forth/bootstrap/bootstrap.fs @@ -49,6 +49,10 @@ variable #order 0 #order ! defer context 0 value vocabularies? +defer locals-end +0 value locals-dict +variable locals-dict-buf + \ \ 7.3.7 Flag constants \ @@ -925,6 +929,11 @@ variable #out 0 #out ! ; : $find ( name-str name-len -- xt true | name-str name-len false ) + locals-dict 0<> if + locals-dict-buf @ find-wordlist ?dup if + exit + then + then vocabularies? if #order @ 0 ?do i cells context + @ @@ -1426,6 +1435,10 @@ false value capital-hex? ; : ; + locals-dict 0<> if + 0 ['] locals-dict /n + ! + ['] locals-end , + then ['] (semis) , reveal ['] [ execute ; immediate diff --git a/openbios-devel/forth/lib/build.xml b/openbios-devel/forth/lib/build.xml index 8c353ff..34eee40 100644 --- a/openbios-devel/forth/lib/build.xml +++ b/openbios-devel/forth/lib/build.xml @@ -16,6 +16,7 @@ <object source="split.fs"/> <object source="lists.fs"/> <object source="64bit.fs"/> + <object source="locals.fs"/> </dictionary> </build> diff --git a/openbios-devel/forth/lib/locals.fs b/openbios-devel/forth/lib/locals.fs new file mode 100644 index 0000000..e697383 --- /dev/null +++ b/openbios-devel/forth/lib/locals.fs @@ -0,0 +1,197 @@ +\ tag: local variables +\ +\ Copyright (C) 2012 Mark Cave-Ayland +\ +\ See the file "COPYING" for further information about +\ the copyright and warranty status of this work. +\ + +[IFDEF] CONFIG_LOCALS + +\ Init local variable stack +variable locals-var-stack +here 200 cells allot locals-var-stack ! + +\ Set initial stack pointer +\ +\ Stack looks like this: +\ ... (sp n-2) local1 ... localm-1 localm (sp n-1) <-- sp + +locals-var-stack @ value locals-var-sp +locals-var-sp locals-var-stack @ ! + +0 value locals-var-count +0 value locals-flags + +here 200 cells allot locals-dict-buf ! + +8 constant #locals + +: (local1) locals-var-sp @ /n + ; +: (local2) locals-var-sp @ 2 cells + ; +: (local3) locals-var-sp @ 3 cells + ; +: (local4) locals-var-sp @ 4 cells + ; +: (local5) locals-var-sp @ 5 cells + ; +: (local6) locals-var-sp @ 6 cells + ; +: (local7) locals-var-sp @ 7 cells + ; +: (local8) locals-var-sp @ 8 cells + ; + +: local1@ (local1) @ ; +: local2@ (local2) @ ; +: local3@ (local3) @ ; +: local4@ (local4) @ ; +: local5@ (local5) @ ; +: local6@ (local6) @ ; +: local7@ (local7) @ ; +: local8@ (local8) @ ; + +: local1! (local1) ! ; +: local2! (local2) ! ; +: local3! (local3) ! ; +: local4! (local4) ! ; +: local5! (local5) ! ; +: local6! (local6) ! ; +: local7! (local7) ! ; +: local8! (local8) ! ; + +create locals-read-table +['] local1@ , +['] local2@ , +['] local3@ , +['] local4@ , +['] local5@ , +['] local6@ , +['] local7@ , +['] local8@ , + +create locals-write-table +['] local1! , +['] local2! , +['] local3! , +['] local4! , +['] local5! , +['] local6! , +['] local7! , +['] local8! , + + +: locals-push ( n -- ) + locals-var-sp /n + to locals-var-sp + locals-var-sp ! +; + +: locals-0-push ( -- ) + 0 locals-push +; + +: (apply-local-flags) ( lfa -- ) + 1 - dup c@ locals-flags or swap c! +; + +: locals-no-pop? ( lfa -- ? ) + 1 - c@ 8 and 0<> +; + +: locals-drop \ Destroy current stack frame + locals-var-sp @ to locals-var-sp +; + +['] locals-drop to locals-end + +: (local-init) ( str len -- ) + header 1 , \ DOCOL + ['] (lit) , ['] noop , \ read-xt + ['] (lit) , ['] noop , \ write-xt + ['] 2drop , \ do nothing + ['] (lit) , + here 5 cells - , + ['] @ , ['] , , \ store read-xt + ['] (semis) , + reveal + immediate + last @ (apply-local-flags) +; + +: (local-noop) ( str len -- ) + 2drop +; + +\ Word called when consuming a local variable +defer (local) + +: } ( C: current latest here -- ) + here! latest ! current ! \ Switch back to normal dict + locals-dict-buf @ to locals-dict \ Make locals-dict visible to $find + 0 to locals-var-count + ['] locals-var-sp , \ save previous sp on rstack + ['] >r , + locals-dict @ \ ( last -- ) + begin + ?dup 0<> + while + >r + locals-var-count /n * + locals-read-table + @ r@ 3 cells + ! \ set read-xt + locals-var-count /n * + locals-write-table + @ r@ 5 cells + ! \ set write-xt + locals-var-count 1+ to locals-var-count + r@ locals-no-pop? if + ['] locals-0-push , \ initialise with 0 + else + ['] locals-push , \ initialise from stack + then + r> @ \ next lfa + repeat + ['] r> , + ['] locals-push , \ write previous sp +; immediate + +: { ( C: -- current latest here ) + current @ latest @ here + ['] (local-init) to (local) + 0 to locals-flags + 0 to locals-var-count + locals-dict-buf @ 200 cells 0 fill \ Zero out temporary dictionary + locals-dict-buf @ current ! \ Switch to locals dictionary + locals-dict-buf @ /n + here! + + begin + parse-word + 2dup s" }" strcmp 0= if + 2drop + ['] } execute -1 + else + 2dup s" ;" strcmp 0= if + 2drop + 8 to locals-flags 0 \ Don't init from stack + else + 2dup s" |" strcmp 0= if + 2drop + 8 to locals-flags 0 \ Don't init from stack + else + 2dup s" --" strcmp 0= if + 2drop + ['] (local-noop) to (local) 0 + else + locals-var-count #locals < if + (local) 0 \ accept local + else + s" maximum locals used ignoring " type type cr 0 + then + locals-var-count 1+ to locals-var-count + then + then + then + then + until +; immediate + +: -> ( n -- ) + parse-word $find if + 4 cells + @ , + else + s" unable to find word " type type + then +; immediate + +[THEN] -- 1.7.10.4

1 1

[PATCH] Adds the get-key-map word to the keyboard node.
by Programmingkid 06 Nov '12

06 Nov '12

The get-key-map word is used by Bootx to determine which key is being held down at startup time. Since the Command key can't be detected in QEMU, the Control key is used instead. If the user holds down Control-v while Mac OS X starts up in QEMU, get-key-map will report that Command-v is being held down. Allowing the user to have Mac OS X to boot up in Verbose mode. I was able to verify that this word works when I tested it out in the file forth.c, but I don't know how to access this word here in the adb_kbd.c file. Comments, suggestions, and commits are always welcomed. --- drivers/adb_kbd.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 77 insertions(+), 3 deletions(-) diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index e38798a..82382d5 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -42,11 +42,13 @@ keyboard_close(int *idx) } static void keyboard_read(void); +void getKeyMap(void); NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -566,3 +568,75 @@ static void keyboard_read(void) } PUSH(i); } + + +// Returns the base to the exponent power +static int pow(int base, int exponent) +{ + int index, answer; + answer = base; + for(index = 1; index < exponent; index++) + { + answer = answer * base; + } + return answer; +} + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +void getKeyMap(void) +{ + int keyPushed, *keyMapArray, offset; + const int sizeOfArray = 8; + const int modifierKeyIndex = 7; + const int commandKeyValue = pow(2,28); + const int shiftKeyValue = pow(2,30); + const int theAKeyValue = pow(2,27); + + keyMapArray = (char *) malloc(sizeOfArray); + if(!keyMapArray) + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(NULL); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + PUSH(keyMapArray); // returns the address of keyMapArray + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH(keyMapArray); +} \ No newline at end of file -- 1.7.5.4

3 8

Forgot the signed-of-by line
by Programmingkid 05 Nov '12

05 Nov '12

signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- drivers/adb_kbd.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 77 insertions(+), 3 deletions(-) diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index e38798a..82382d5 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -42,11 +42,13 @@ keyboard_close(int *idx) } static void keyboard_read(void); +void getKeyMap(void); NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -566,3 +568,75 @@ static void keyboard_read(void) } PUSH(i); } + + +// Returns the base to the exponent power +static int pow(int base, int exponent) +{ + int index, answer; + answer = base; + for(index = 1; index < exponent; index++) + { + answer = answer * base; + } + return answer; +} + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +void getKeyMap(void) +{ + int keyPushed, *keyMapArray, offset; + const int sizeOfArray = 8; + const int modifierKeyIndex = 7; + const int commandKeyValue = pow(2,28); + const int shiftKeyValue = pow(2,30); + const int theAKeyValue = pow(2,27); + + keyMapArray = (char *) malloc(sizeOfArray); + if(!keyMapArray) + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(NULL); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + PUSH(keyMapArray); // returns the address of keyMapArray + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH(keyMapArray); +} \ No newline at end of file -- 1.7.5.4

2 2

About the keyboard device
by Programmingkid 02 Nov '12

02 Nov '12

Can a keyboard node word be accessed in OpenBIOS? If so, how?

2 3

Adding to the device tree
by Programmingkid 02 Nov '12

02 Nov '12

How would I add a device to the device tree, and be able to open that device using open-dev? I am trying to add "/pseudo-hid/keyboard" to the device tree. I need to test out a new keyboard word that I am adding.

2 2

[PATCH] Adds spin to dictionary. Needed by bootx to boot Mac OS X.
by Programmingkid 01 Nov '12

01 Nov '12

This patch adds the spin word to the dictionary. It is used by bootx during startup to boot Mac OS X. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/ppc.fs | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/ppc/ppc.fs b/arch/ppc/ppc.fs index ae1f640..830b61a 100644 --- a/arch/ppc/ppc.fs +++ b/arch/ppc/ppc.fs @@ -45,3 +45,7 @@ 0 value %sprg1 0 value %sprg2 0 value %sprg3 + + +\ Set by bootx during startup +defer spin -- 1.7.5.4

2 1

Patch for auto partition selection
by Programmingkid 01 Nov '12

01 Nov '12

This patch implements the auto partition selection feature. It makes commands like these works: "dir cd:,\" and "boot cd:,\\:tbxi". Any progress with the local variable patch? --- packages/mac-parts.c | 180 ++++++++++++++++++++++++++++---------------------- 1 files changed, 102 insertions(+), 78 deletions(-) diff --git a/packages/mac-parts.c b/packages/mac-parts.c index 18e4aa3..7e32423 100644 --- a/packages/mac-parts.c +++ b/packages/mac-parts.c @@ -34,7 +34,7 @@ do { printk("MAC-PARTS: " fmt , ##args); } while (0) typedef struct { xt_t seek_xt, read_xt; ucell offs_hi, offs_lo; - ucell size_hi, size_lo; + ucell size_hi, size_lo; unsigned int blocksize; phandle_t filesystem_ph; } macparts_info_t; @@ -58,15 +58,15 @@ macparts_open( macparts_info_t *di ) int want_bootcode = 0; phandle_t ph; ducell offs = 0, size = -1; - + DPRINTF("macparts_open '%s'\n", str ); - + /* - Arguments that we accept: - id: [0-7] - [(id)][,][filespec] - */ - + Arguments that we accept: + id: [0-7] + [(id)][,][filespec] + */ + if( str ) { if ( !strlen(str) ) parnum = -1; @@ -74,52 +74,52 @@ macparts_open( macparts_info_t *di ) /* 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; } } - + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); - + DPRINTF("want_bootcode %d\n", want_bootcode); DPRINTF("macparts_open %d\n", parnum); - + di->filesystem_ph = 0; di->read_xt = find_parent_method("read"); di->seek_xt = find_parent_method("seek"); - + SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) goto out; - + /* partition maps might support multiple block sizes; in this case, * pmPyPartStart is typically given in terms of 512 byte blocks. */ @@ -133,121 +133,145 @@ macparts_open( macparts_info_t *di ) SEEK( bs ); if( READ(&par, sizeof(par)) != sizeof(par) ) goto out; - if (__be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE) + if (__be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE) goto out; - + /* * Implement partition selection as per the PowerPC Microprocessor CHRP bindings */ - - if (str == NULL || parnum == 0) { - /* According to the spec, partition 0 as well as no arguments means the whole disk */ + + if (parnum == 0) { + /* According to the spec, partition 0 means the whole disk */ offs = (long long)0; size = (long long)__be32_to_cpu(dmap.sbBlkCount) * bs; - + di->blocksize = (unsigned int)bs; - + di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - + di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; - + ret = -1; goto out; - - } else if (parnum == -1 && strlen(argstr)) { - + + } + + // if not partition, but a file was specified - example: boot cd:,\\:tbxi + else if (parnum == -1 && strlen(argstr)) + { DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); - + /* No partition was explicitly requested, but an argstr was passed in. - So let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { + So let's find a suitable partition... */ + for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) + { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + + // If an Apple_HFS or Apple_HFSX partition was found + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - + /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { + if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) + { offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; size = (long long)__be32_to_cpu(par.pmBootSize); - + goto found; - } else { + } + + else + { /* Otherwise we were passed a filename and path. So let's - choose the first partition with a valid filesystem */ + choose the first partition with a valid filesystem */ DPUSH( offs ); PUSH_ih( my_parent() ); parword("find-filesystem"); - + ph = POP_ph(); if (ph) goto found; } } } - - } else { + + } + + // if no partition and no file was selected - example: "dir cd:,\" + else if (parnum == -1) + { + // search for the first partition of type Apple_HFS or Apple_HFSX + for(parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) + { + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + goto found; + break; + } + } + } + + else { /* Another partition was explicitly requested */ SEEK( bs * parnum ); READ( &par, sizeof(par) ); - + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; } } - + /* If we couldn't find a partition, exit */ if (size == -1) { DPRINTF("Unable to automatically find partition!\n"); goto out; } - + found: - + ret = -1; di->blocksize = (unsigned int)bs; - + di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - + di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; - + /* We have a valid partition - so probe for a filesystem at the current offset */ DPRINTF("mac-parts: about to probe for fs\n"); DPUSH( offs ); PUSH_ih( my_parent() ); parword("find-filesystem"); DPRINTF("mac-parts: done fs probe\n"); - + ph = POP_ph(); if( ph ) { DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); di->filesystem_ph = ph; - + /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ + attempting interpose */ if (want_bootcode) argstr = strdup(""); - + /* If we have been asked to open a particular file, interpose the filesystem package with - the passed filename as an argument */ + the passed filename as an argument */ if (strlen(argstr)) { push_str( argstr ); PUSH_ph( ph ); @@ -256,9 +280,9 @@ found: } else { DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); } - + free( str ); - + out: PUSH( ret ); } @@ -268,7 +292,7 @@ static void macparts_probe( macparts_info_t *dummy ) { desc_map_t *dmap = (desc_map_t*)cell2pointer(POP()); - + DPRINTF("macparts_probe %x ?= %x\n", dmap->sbSig, DESC_MAP_SIGNATURE); if( __be16_to_cpu(dmap->sbSig) != DESC_MAP_SIGNATURE ) RET(0); @@ -280,7 +304,7 @@ static void macparts_get_info( macparts_info_t *di ) { DPRINTF("macparts_get_info"); - + PUSH( -1 ); /* no type */ PUSH( di->offs_lo ); PUSH( di->offs_hi ); @@ -307,21 +331,21 @@ macparts_seek(macparts_info_t *di ) { long long pos = DPOP(); long long offs, size; - + DPRINTF("macparts_seek %llx:\n", pos); - + /* Seek is invalid if we reach the end of the device */ size = ((ducell)di->size_hi << BITS) | di->size_lo; if (pos > size) RET( -1 ); - + /* Calculate the seek offset for the parent */ offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; offs += pos; DPUSH(offs); - + DPRINTF("macparts_seek parent offset %llx:\n", offs); - + call_package(di->seek_xt, my_parent()); } @@ -330,7 +354,7 @@ static void macparts_read(macparts_info_t *di ) { DPRINTF("macparts_read\n"); - + /* Pass the read back up to the parent */ call_package(di->read_xt, my_parent()); } @@ -348,8 +372,8 @@ static void macparts_dir( macparts_info_t *di ) { /* On PPC Mac, the first partition chosen according to the CHRP boot - specification (i.e. marked as bootable) may not necessarily contain - a valid FS */ + specification (i.e. marked as bootable) may not necessarily contain + a valid FS */ if ( di->filesystem_ph ) { PUSH( my_self() ); push_str("dir"); -- 1.7.5.4

2 3

Detecting command key
by Programmingkid 31 Oct '12

31 Oct '12

What word in Open Firmware can be used to detect the command key being pushed? Something that isn't get-key-map. I have tried key, but it didn't work.

2 1

[commit] r1067 - trunk/openbios-devel/fs/hfsplus
by repository service 21 Oct '12

21 Oct '12

Author: mcayland Date: Sun Oct 21 20:14:06 2012 New Revision: 1067 URL: http://tracker.coreboot.org/trac/openbios/changeset/1067 Log: amd64: Fix compilation from last commit to implement "dir" word for HFS+ filesystem. UInt64 is always defined as long long, so use %lld in the printf format string rather than PRId64 which can change size depending upon platform. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 7 17:26:53 2012 (r1066) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 21 20:14:06 2012 (r1067) @@ -551,7 +551,7 @@ if (r.record.type == HFSP_FILE) { /* Grab the file entry */ hfsp_cat_file *file = &r.record.u.file; - forth_printf("% 10" PRId64 " ", file->data_fork.total_size); + forth_printf("% 10lld ", file->data_fork.total_size); print_date(file->create_date); forth_printf(" %s\n", name); found = -1;

1 0

Status on partition problem
by Programmingkid 21 Oct '12

21 Oct '12

I have tracked down some issues with the file mac-files.c. The one big issue is with a variable called str. It isn't set properly. When I type this command "dir cd:9,\Utilities", str should be set to "9,\Utilities". argstr should then be set to "\Utilities". This does not happen. Instead str is set to "9". I traced the issue with a function called my_args_copy(). That led me to a forth word called my-args. I'm not sure what this word does, or where it is defined. Reading some of the comments in various files, someone thinks that if no partition is specified, it means the whole disk is selected. My plan is to change this so that is no partition is selected, it means to select the first Apple_HFS or Apple_HSFX partition. If someone wants to use an entire disk, they have to explicitly specify it by using zero as the partition number. This fix should make automatically selecting a partition work. Hope this makes sense.

2 1

Re: [OpenBIOS] About HFS+ support
by Programmingkid 15 Oct '12

15 Oct '12

I did some research with Apple's Open Firmware implementation and found out something that might make fixing the auto partition selection system work. What Apple's Open Firmware does when a command like "dir hd:,\" is entered is it selects the partition that has the lowest partition number, and displays its files. What I did was partitioned a hard drive into three different partitions, then ran the "dir hd:,\" command. I have verified that the lowest numbered partition is selected by default. The other two partitions can be selected by doing this "dir hd:10,\" and "dir hd:11,\". Is there any more information that is needed to fix the auto selection system?

3 7

Re: [OpenBIOS] About HFS+ support
by Mark Cave-Ayland 12 Oct '12

12 Oct '12

On 12/10/12 20:59, Programmingkid wrote: [CC to list] >> On 12/10/12 18:25, Programmingkid wrote: >> >>> I did some research with Apple's Open Firmware implementation and found out something that might make fixing the auto partition selection system work. What Apple's Open Firmware does when a command like "dir hd:,\" is entered is it selects the partition that has the lowest partition number, and displays its files. >>> >>> What I did was partitioned a hard drive into three different partitions, then ran the "dir hd:,\" command. I have verified that the lowest numbered partition is selected by default. The other two partitions can be selected by doing this "dir hd:10,\" and "dir hd:11,\". Is there any more information that is needed to fix the auto selection system? >> >> Do any of them have a system partition on? > > If you mean have an operating system on them, all three partitions have Mac OS X installed on them. > >> The reason I ask is that because on some of the debug traces you've sent me, a filesystem has been identified on the Apple_Driver43_CD partition. Therefore there must be some other logic involved with Apple's Open Firmware in order for it to locate the partition containing the installer. > > When you say the installer, I am guessing you mean the boot loader. > > For CD's, there is usually one partition that has the files on it. I think a simple algorithm for finding the right partition is to select the first partition that is of the type APPLE_HFS or APPLE_HFSX. Perhaps the algorithm really is that simple? For PearPC I found the following which suggests this is exactly what they do: http://old.nabble.com/Problems-booting-from-Panther-DVD-p104313.html I'd be interested to hear from people who have OF experience with Macs to confirm if this is the case or not. Have you coded up a suitable patch in OpenBIOS to test? ATB, Mark.

2 1

[PATCH] Adds local variable support to OpenBIOS. Local variable implementation is based on Apple's local variable support in Open Firmware.
by Programmingkid 09 Oct '12

09 Oct '12

This patch has been improved from the last patch. Local variable code now is in its own file. The Array word has also been greatly simplified. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- forth/bootstrap/interpreter.fs | 51 +++- forth/util/build.xml | 1 + forth/util/locals.fs | 531 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 569 insertions(+), 14 deletions(-) create mode 100644 forth/util/locals.fs diff --git a/forth/bootstrap/interpreter.fs b/forth/bootstrap/interpreter.fs index 5187058..9221cdc 100644 --- a/forth/bootstrap/interpreter.fs +++ b/forth/bootstrap/interpreter.fs @@ -40,26 +40,20 @@ \ 7.3.9.2.4 Miscellaneous dictionary \ -\ interpreter. This word checks whether the interpreted word -\ is a word in dictionary or a number. It honours compile mode -\ and immediate/compile-only words. -: interpret - 0 >in ! - begin - parse-word dup 0> \ was there a word at all? - while - $find +\ Most of the old version of interpret +: old-interpret ( addr len -- ) + $find if dup flags? 0<> state @ 0= or if execute else - , \ compile mode && !immediate + , \ Compile mode && !immediate then - else \ word is not known. maybe it's a number + else \ Word is not known. maybe it's a number 2dup $number if - span @ >in ! \ if we encountered an error, don't continue parsing + span @ >in ! \ If we encountered an error, don't continue parsing type 3a emit -13 throw else @@ -70,9 +64,38 @@ depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then +; + + +Defer lfind-defer +false VALUE using-locals + +\ The refactored interpret - supports local variables +: interpret ( -- ) + 0 >in ! + begin + parse-word ( addr len ) + dup ( addr len len1 ) + 0> ( addr len flag ) \ Was there a word at all? + while ( addr len ) + using-locals true = IF ( addr len ) \ If local variables are being used + 2dup ( addr len addr1 len1 ) + lfind-defer ( addr len flag ) + not IF ( addr len ) \ If symbol is not a local variable + old-interpret ( ) + ELSE \ Else clean up the stack + 2drop ( ) + THEN + + ELSE \ If not using local variables + old-interpret ( addr len -- ) + THEN + repeat - 2drop - ; + 2drop \ Removes the addr len pair if the loop ends at the WHILE word +; + + : refill ( -- ) ib #ib @ expect 0 >in ! ; diff --git a/forth/util/build.xml b/forth/util/build.xml index 4839d2c..d10f35a 100644 --- a/forth/util/build.xml +++ b/forth/util/build.xml @@ -11,6 +11,7 @@ <dictionary name="openbios" target="forth"> <object source="util.fs"/> <object source="pci.fs"/> + <object source="locals.fs"/>  diff --git a/forth/util/locals.fs b/forth/util/locals.fs new file mode 100644 index 0000000..22a6f55 --- /dev/null +++ b/forth/util/locals.fs @@ -0,0 +1,531 @@ +\ File: locals.fs +\ Description: Adds local variable support to OpenBIOS. This is Apple's local variable specification. + + +\ Creates an array variable +: ARRAY ( cellCount -- ) + + \ Compile-time behavior + CREATE CELLS ALLOT ( cellCount -- ) \ Creates and initializes the instance + + \ Run-time behavior + DOES> ( index addr ) + + SWAP CELLS + ( index addr -- addr1 ) \ Calculates address to return +; + + +\ Declare the local-base-address VALUE +0 VALUE local-base-address + +\ Returns the base address used for the local words +: get-base-address ( - addr ) + local-base-address +; + +\ Sets the base address used for the local words +: set-base-address ( addr - ) + TO local-base-address +; + + +\ Sets the first local variable's value +: Local0! ( x - ) + 0 CELLS get-base-address + ! +; + +\ Sets the second local variable's value +: Local1! ( x - ) + 1 CELLS get-base-address + ! +; + +\ Sets the third local variable's value +: Local2! ( x - ) + 2 CELLS get-base-address + ! +; + +\ Sets the fourth local variable's value +: Local3! ( x - ) + 3 CELLS get-base-address + ! +; + +\ Sets the fifth local variable's value +: Local4! ( x - ) + 4 CELLS get-base-address + ! +; + +\ Sets the sixth local variable's value +: Local5! ( x - ) + 5 CELLS get-base-address + ! +; + +\ Sets the seventh local variable's value +: Local6! ( x - ) + 6 CELLS get-base-address + ! +; + +\ Sets the eighth local variable's value +: Local7! ( x - ) + 7 CELLS get-base-address + ! +; + +\ Sets the ninth local variable's value +: Local8! ( x - ) + 8 CELLS get-base-address + ! +; + +\ Sets the tenth local variable's value +: Local9! ( x - ) + 9 CELLS get-base-address + ! +; + +\ Sets the eleventh local variable's value +: Local10! ( x - ) + 10 CELLS get-base-address + ! +; + +\ Sets the twelfth local variable's value +: Local11! ( x - ) + 11 CELLS get-base-address + ! +; + + +\ **** Calculates the needed amount of memory for local variables **** +0 value variableCount +: calculate-needed-memory ( - n ) + 0 TO variableCount + >in @ \ Keep track of where the pointer was + + begin + parse-word + 0= if \ If there is no more text to parse + drop + true + else + dup " ;" comp + 0= if \ If the semicolon is encountered + drop \ Drop the duplicated address + false + else + " }" comp + 0= if \ If '}' character is encountered + true \ End loop because '}' marks end of local variables + else + variableCount 1 + TO variableCount + false + then + then + then + until + + >in ! \ Reset the pointer + variableCount CELLS +; + + +\ **** allocates the memory for local variables **** +: allocate-memory ( n - addr ) + alloc-mem dup 0= if + drop + cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr + then +; + + + +\ Declares the size of the local variable table +48 CONSTANT #local-table-elements + +\ Declare the local variable table +#local-table-elements ARRAY local-variable-table + +\ Keeps track of end of array +0 VALUE #filled-local-table-elements + +\ Clears the local variable table +: init-local-table ( - ) + + \ Free all the dynamically allocated memory + #filled-local-table-elements 0 ?do + I 3 + local-variable-table @ ( addr ) + free-mem ( ) + 4 +loop + + 0 local-variable-table #local-table-elements erase + 0 TO #filled-local-table-elements +; + +\ Adds a local variable symbol to the local variable table +: add-local ( addr len order initflag - ) + depth 4 < if + cr ." The stack needs at least 4 values to add a local variable." cr + exit + then + + \ Add to the end of the table + #filled-local-table-elements 0 + local-variable-table ! \ initflag + #filled-local-table-elements 1 + local-variable-table ! \ order + #filled-local-table-elements 2 + local-variable-table ! \ len + #filled-local-table-elements 3 + local-variable-table ! \ addr + + \ Allocate memory for the symbol + #filled-local-table-elements 2 + local-variable-table @ ( length ) + alloc-mem ( memaddr ) + dup ( memaddr memaddr ) + dup ( memaddr memaddr memaddr ) + + \ Called only when memaddr = 0 + 0= if ( memaddr memaddr ) + cr ." Failed to allocate memory in add-local!" cr ( memaddr memaddr ) + then + + \ Copy local variable name to a safe location + #filled-local-table-elements 3 + local-variable-table @ ( memaddr memaddr addr ) + swap ( memaddr addr memaddr ) + #filled-local-table-elements 2 + local-variable-table @ ( memaddr addr memaddr length ) + move ( memaddr ) + #filled-local-table-elements 3 + local-variable-table ! ( ) + + \ Increment #filled-local-table-elements + #filled-local-table-elements 4 + TO #filled-local-table-elements +; + +\ Prints the local variable table +: print-local-table + + #filled-local-table-elements 0= if + cr ." No variables loaded" cr + exit + then + + #filled-local-table-elements 0 ?do + cr ." Variable name: " + I 3 + local-variable-table @ + I 2 + local-variable-table @ + type + + ." Order: " + I 1 + local-variable-table @ . + + ." Init Flag: " + I 0 + local-variable-table @ . + 4 +loop +; + +\ Finds a local variable symbol in the local variable table +\ Returns its order or -1 on failure +: get-order ( addr len - order ) + \ If the address and length are missing + depth 2 < if + cr ." Address and length are required on the stack to use get-order!" cr + -1 throw \ Ends execution + then + + #filled-local-table-elements 0 ?do + over ( addr len addr ) + I 3 + ( addr len addr addrindex ) + local-variable-table @ ( addr len addr addr1 ) + 2 pick ( addr len addr addr1 len ) + + \ Check if lengths of two strings are the same length + dup ( addr len addr addr1 len len ) + I 2 + local-variable-table @ ( addr len addr addr1 len len len1) + = if ( addr len addr addr1 len ) \ If lengths are equal + comp ( addr len flag) + 0= if ( addr len flag ) \ If the symbol is found + 2drop ( ) + I 1 + local-variable-table @ ( order ) + unloop + exit + then + + else \ If the lengths are different + 3drop ( addr len ) + then + + \ Increment the index by 4 + 4 +loop + 2drop ( addr len - ) + -1 \ Returns -1 for the order if the symbol is not found +; + + +\ **** read the local variables in the input stream **** +0 VALUE use-top-stack-value +0 VALUE index +0 VALUE local-variable-memory + +: read-local-variables ( "char" - ) + 0 TO index + true TO use-top-stack-value + + begin + parse-word ( addr len ) + dup ( addr len len ) + 0> ( addr len flag ) + while ( addr len ) + 2dup ( addr len addr len ) + drop ( addr len addr ) + " }" ( addr len addr addr len ) + comp ( addr len flag ) + 0= if ( addr len ) \ If end of local variables + drop ( addr ) + drop ( ) + exit ( ) + then + + 2dup ( addr len addr len ) + drop ( addr len addr ) + " ;" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ If not using top stack value for local variables + false TO use-top-stack-value ( addr len ) + 2drop ( ) + else \ Add local variable to table + index use-top-stack-value ( addr len order use-top-stack-value ) + add-local ( ) + index 1 + TO index \ Increment index + then + + repeat + drop ( addr ) + drop ( ) +; + + +\ Sets the stack size +1000 CONSTANT max-stack-size + +\ Declare the local stack +max-stack-size ARRAY local-stack + +\ Declare the stack top pointer +0 VALUE local-stack-top + +\ Adds to the top of the local stack +: push-local-stack ( x - L:x ) + local-stack-top max-stack-size 1 - > + if + cr ." Local stack overflow!" cr + max-stack-size TO local-stack-top \ Sets local-stack-top back to the max size + then + local-stack-top local-stack ! ( x - ) + local-stack-top 1 + TO local-stack-top +; + + +\ Removes the top local stack value and places it into the data stack +: pop-local-stack ( L:x - x ) + local-stack-top 1 - TO local-stack-top \ Decrement local-stack-top + local-stack-top 0< if \ If popping too many items + cr ." Local stack underflow!" cr + 0 TO local-stack-top \ Sets local-stack-top back to zero + abort + then + local-stack-top local-stack @ +; + + +\ ***** sets up local variables ****** +: { ( -- ) + init-local-table + calculate-needed-memory ( memorySize ) + allocate-memory ( memorySize - addr ) + TO local-variable-memory ( ) + read-local-variables ( ) + TRUE TO using-locals + + \ Add code to the current definition + + \ Saves the old base address + postpone get-base-address + postpone push-local-stack + + \ Sets the base address to this definition's reserved memory + local-variable-memory + postpone literal + postpone set-base-address + + \ Add code to initialize the variables if needed + 0 #filled-local-table-elements 4 - ?do + I 0 + local-variable-table @ ( flag ) \ Get the init flag + true ( flag true ) + = ( flag1 ) + if + I 4 / ( variable number ) + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + then + -4 +loop + +; immediate \ Declares this word as a compiler directive + + + +\ Sets values for local variables +: -> ( - ) + parse-word ( addr len ) + get-order ( order ) + dup ( order order ) + -1 = ( order flag ) + + if \ If the symbol isn't found + cr ." Symbol is not a local variable! " cr + drop ( ) + exit + then + + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + +; immediate + + +\ Returns the first local variable's value +: Local0@ + 0 CELLS get-base-address + @ +; + +\ Returns the second local variable's value +: Local1@ + 1 CELLS get-base-address + @ +; + +\ Returns the third local variable's value +: Local2@ + 2 CELLS get-base-address + @ +; + +\ Returns the fourth local variable's value +: Local3@ + 3 CELLS get-base-address + @ +; + +\ Returns the fifth local variable's value +: Local4@ + 4 CELLS get-base-address + @ +; + +\ Returns the sixth local variable's value +: Local5@ + 5 CELLS get-base-address + @ +; + +\ Returns the seventh local variable's value +: Local6@ + 6 CELLS get-base-address + @ +; + +\ Returns the eighth local variable's value +: Local7@ + 7 CELLS get-base-address + @ +; + +\ Returns the ninth local variable's value +: Local8@ + 8 CELLS get-base-address + @ +; + +\ Returns the tenth local variable's value +: Local9@ + 9 CELLS get-base-address + @ +; + +\ Returns the eleventh local variable's value +: Local10@ + 10 CELLS get-base-address + @ +; + +\ Returns the twelfth local variable's value +: Local11@ + 11 CELLS get-base-address + @ +; + + +\ Determines if a symbol is a local variable +\ Returns true if the symbol is a local variable, false otherwise +: LFIND ( addr len - flag ) + depth 2 < if \ If the address and length are not on the stack + exit + then + + get-order ( addr len - n ) + dup ( n n1 ) + -1 = if ( n ) \ If the symbol isn't a local variable + drop ( ) + false ( flag ) + + else \ If the symbol is a local variable + case ( n ) + 0 of ['] Local0@ , endof + 1 of ['] Local1@ , endof + 2 of ['] Local2@ , endof + 3 of ['] Local3@ , endof + 4 of ['] Local4@ , endof + 5 of ['] Local5@ , endof + 6 of ['] Local6@ , endof + 7 of ['] Local7@ , endof + 8 of ['] Local8@ , endof + 9 of ['] Local9@ , endof + 10 of ['] Local10@ , endof + 11 of ['] Local11@ , endof + + \ Default case + cr ." Could not compile local variable!" cr + TRUE ( flag ) + exit + + endcase + + ." compiled " \ Display this text when entering a local variable symbol + true ( flag ) + then +; + + +\ Redefine colon to clean up after { +: ; + using-locals TRUE = + if + FALSE TO using-locals + postpone pop-local-stack + postpone set-base-address + then + postpone ; +; immediate + +' lfind is lfind-defer \ Makes lfind work in INTERPRET \ No newline at end of file -- 1.7.5.4

2 1

Re: [OpenBIOS] About HFS+ support
by Programmingkid 09 Oct '12

09 Oct '12

On Oct 9, 2012, at 1:11 PM, Mark Cave-Ayland wrote: > On 09/10/12 03:31, Programmingkid wrote: > >> I'm not familiar with how file systems work, but maybe you can make sense of this output. This is what I see when I enabled the debug macro. > > Hmmm. According to that, I'd guess that it's found a filesystem it recognises, but then when it repeats the same seek at found: then it fails the second time around? > > I'm afraid you'll need to poke around a bit more/adding debugging DPRINTF statements to figure out exactly what's happening. > > BTW you should try and keep on the list wherever possible, since there may be some people with Apple partition knowledge on there who could help out. > Ok. I will CC our info later to the list. We can find out the name of each partition, so can't we just select the partition that is named APPLE_HFS, or APPLE_HFSX?

2 3

[PATCH] Adds the get-time word to the dictionary. Used to obtain the date and time.
by Programmingkid 09 Oct '12

09 Oct '12

Signed-of-by: John Arbuckle <programmingkidx(a)gmail.com> --- forth/system/main.fs | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/forth/system/main.fs b/forth/system/main.fs index 122ab1f..09c08d3 100644 --- a/forth/system/main.fs +++ b/forth/system/main.fs @@ -58,3 +58,10 @@ variable DIAG-list outer-interpreter ; + + +\ Returns the time ( -- second minute hour day month year ) +: get-time ( -- ) + s" rtc" s" get-time" execute-device-method + 0= ABORT" Sorry but the rtc node was not found" +; \ No newline at end of file -- 1.7.5.4

1 0

Issue with server
by Programmingkid 08 Oct '12

08 Oct '12

On the page http://www.openfirmware.info/OpenBIOS, the link "most current snapshot" does not work. This is the error message that is displayed: Trac detected an internal error: SubversionException: ("Can't open file '/srv/svn/repositories/openbios/db/revs/0/695': Too many open files", 24)

2 1

Re: [OpenBIOS] [PATCH] Adds the get-time word to the dictionary. It returns the current time and date on the stack.
by Programmingkid 07 Oct '12

07 Oct '12

On Oct 4, 2012, at 3:30 PM, openbios-request(a)openbios.org wrote: > > Message: 4 > Date: Mon, 24 Sep 2012 23:40:27 +0100 > From: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] [PATCH] Adds the get-time word to the > dictionary. It returns the current time and date on the stack. > Message-ID: <5060E15B.3020103(a)ilande.co.uk> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 23/09/12 22:57, Programmingkid wrote: > >> Made a few changes to the patch. Thank you Tarl for your suggestions. >> >> Signed-Off-By: John Arbuckle<programmingkidx(a)gmail.com> >> >> --- >> forth/system/main.fs | 22 ++++++++++++++++++++++ >> 1 files changed, 22 insertions(+), 0 deletions(-) >> >> diff --git a/forth/system/main.fs b/forth/system/main.fs >> index 122ab1f..16d4829 100644 >> --- a/forth/system/main.fs >> +++ b/forth/system/main.fs >> @@ -58,3 +58,25 @@ variable DIAG-list >> >> outer-interpreter >> ; >> + >> +\ Returns the time ( -- second minute hour day month year ) >> +: get-time >> + " rtc" open-dev ( device ) >> + dup ( device device ) >> + >> + 0= if \ if the real-time clock isn't available >> + drop ( ) >> + true ( flag ) >> + cr >> + abort" Sorry but get-time isn't available for your system. " >> + then >> + >> + " get-time" ( device addr len ) >> + rot ( addr len device ) >> + dup ( addr len device device ) >> +>r ( addr len device ) ( R: device ) >> + $call-method ( addr len device -- second minute hour day month year ) ( R: device ) >> + r> ( device ) ( R: ) >> + close-dev ( device -- ) >> +; >> + > > While I'm not objecting to this patch in principle, I find it quite > unusual that Apple would place a word with the same arguments in the > global namespace. In particular, I see references like this which > suggest it is not required: > http://hints.macworld.com/article.php?story=20060814075952448. > > Can you give some more context as to why the get-time word in the rtc > node cannot be used? I was trying out some source code I found in the book "Mac OS X Internals" on page 320. When I typed get-time, the word was not found in the dictionary. So I thought I could make a contribution by adding this word to the dictionary. A little later I found out the word was a part of the rtc node. I figure adding this word to the dictionary might help the next person who might be reading this book and trying out some of the source code in it.

2 1

[PATCH 1/3] Fix bug related to opening backup volumes in libhfsp's volume_open().
by Mark Cave-Ayland 07 Oct '12

07 Oct '12

The existing code in hfsp_volume.c tries to locate the alternate volume header at the block vol->maxblocks - 2. Currently for unwrapped HFS+ volumes, vol->maxblocks is never set from the main volume header once it is located and so it tries to find the backup volume at the (dummy) block 3 which inevitably fails. On a secondary note until towards the end of the function, volume_open() assumes the block size is 512 bytes. Therefore once we determine the size of the volume from the main volume header in blocks, we need to convert it from the block size indicated in the volume header to a fixed 512 byte block size in order for the alternate volume header to be located correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/fs/hfsplus/hfsp_volume.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openbios-devel/fs/hfsplus/hfsp_volume.c b/openbios-devel/fs/hfsplus/hfsp_volume.c index 802d700..e6d9d60 100644 --- a/openbios-devel/fs/hfsplus/hfsp_volume.c +++ b/openbios-devel/fs/hfsplus/hfsp_volume.c @@ -171,7 +171,9 @@ volume_read_wrapper(volume * vol, hfsp_vh* vh) UInt16 signature; char buf[vol->blksize]; char *p = buf; - + int ret; + UInt64 vol_size; + if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here return -1; @@ -202,7 +204,14 @@ volume_read_wrapper(volume * vol, hfsp_vh* vh) } else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ p = buf; // Restore to begin of block - return volume_readbuf(vh, p); + ret = volume_readbuf(vh, p); + if( !ret ) { + /* When reading the initial partition we must use 512 byte blocks */ + vol_size = vh->blocksize * vh->total_blocks; + vol->maxblocks = vol_size / HFSP_BLOCKSZ; + } + + return ret; } else HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); fail: -- 1.7.10.4

3 8

[commit] r1066 - trunk/openbios-devel/fs/hfsplus
by repository service 07 Oct '12

07 Oct '12

Author: mcayland Date: Sun Oct 7 17:26:53 2012 New Revision: 1066 URL: http://tracker.coreboot.org/trac/openbios/changeset/1066 Log: Add initial implementation of "dir" word for HFS+ filesystems. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 7 17:26:49 2012 (r1065) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 7 17:26:53 2012 (r1066) @@ -437,14 +437,147 @@ PUSH(pointer2cell(volname)); } +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) +{ + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); +} + +static void +print_date(uint32_t sec) +{ + unsigned int second, minute, hour, month, day, year; + int current; + const int *days; + + second = sec % 60; + sec /= 60; + + minute = sec % 60; + sec /= 60; + + hour = sec % 24; + sec /= 24; + + year = sec * 100 / 36525; + sec -= year * 36525 / 100; + year += 1904; + + days = is_leap(year) ? days_month_leap : days_month; + + current = 0; + month = 0; + while (month < 12) { + if (sec <= current + days[month]) { + break; + } + current += days[month]; + month++; + } + month++; + + day = sec - current + 1; + + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + year, month, day, hour, minute, second); +} + /* static method, ( pathstr len ihandle -- ) */ static void hfsp_files_dir( hfsp_info_t *dummy ) { - forth_printf("dir method not implemented for HFS+ filesystem\n"); - POP(); - POP(); - POP(); + ihandle_t ih = POP_ih(); + char *path = pop_fstr_copy(); + int fd, found; + volume *vol; + record rec, r, folrec; + char name[256], *curfol, *tmppath; + + fd = open_ih(ih); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } + + vol = malloc( sizeof(volume) ); + if (volume_open(vol, fd)) { + free( path ); + close_io( fd ); + RET( 0 ); + } + + /* First move to the specified folder */ + tmppath = strdup(path); + record_init_root( &rec, &vol->catalog ); + record_init_parent( &r, &rec ); + + /* Remove initial \ or / */ + curfol = strsep(&tmppath, "\\//"); + curfol = strsep(&tmppath, "\\//"); + forth_printf("\n"); + + while (curfol && strlen(curfol)) { + found = 0; + do { + if (r.record.type == HFSP_FOLDER) { + unicode_uni2asc(name, &r.key.name, sizeof(name)); + + if (!strcmp(name, curfol)) { + folrec = r; + found = -1; + } + } + } while ( !record_next(&r) ); + + if (!found) { + forth_printf("Unable to locate path %s on filesystem\n", path); + goto done; + } else { + record_init_parent( &r, &folrec ); + } + + curfol = strsep(&tmppath, "\\//"); + } + + /* Output the directory contents */ + found = 0; + do { + unicode_uni2asc(name, &r.key.name, sizeof(name)); + + if (r.record.type == HFSP_FILE) { + /* Grab the file entry */ + hfsp_cat_file *file = &r.record.u.file; + forth_printf("% 10" PRId64 " ", file->data_fork.total_size); + print_date(file->create_date); + forth_printf(" %s\n", name); + found = -1; + } + + if (r.record.type == HFSP_FOLDER) { + /* Grab the directory entry */ + hfsp_cat_folder *folder = &r.record.u.folder; + forth_printf(" 0 "); + print_date(folder->create_date); + forth_printf(" %s\\\n", name); + found = -1; + } + + } while ( !record_next(&r) ); + + if (!found) { + forth_printf(" (Empty folder)\n"); + } + +done: + volume_close(vol); + free(vol); + free(path); + if (tmppath) + free(tmppath); } /* static method, ( pos.d ih -- flag? ) */

1 0

[commit] r1065 - trunk/openbios-devel/fs/hfsplus
by repository service 07 Oct '12

07 Oct '12

Author: mcayland Date: Sun Oct 7 17:26:49 2012 New Revision: 1065 URL: http://tracker.coreboot.org/trac/openbios/changeset/1065 Log: Fix HFS+ display for non-ASCII characters. Replace any non-ASCII characters with a ? to prevent display errors when converting from Unicode filenames. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c Sun Oct 7 17:26:46 2012 (r1064) +++ trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c Sun Oct 7 17:26:49 2012 (r1065) @@ -43,7 +43,10 @@ /* might be unrepresentable (or too complicated for us) */ if( ustr[0] || !ustr[1] ) continue; - *astr++ = ustr[1]; + if( ustr[1] < 0x20 || ustr[1] >= 0x7f ) + *astr++ = '?'; + else + *astr++ = ustr[1]; len++; } *astr = 0;

1 0

[commit] r1064 - trunk/openbios-devel/fs/hfsplus
by repository service 07 Oct '12

07 Oct '12

Author: mcayland Date: Sun Oct 7 17:26:46 2012 New Revision: 1064 URL: http://tracker.coreboot.org/trac/openbios/changeset/1064 Log: Fix bug related to opening backup volumes in libhfsp's volume_open(). The existing code in hfsp_volume.c tries to locate the alternate volume header at the block vol->maxblocks - 2. Currently for unwrapped HFS+ volumes, vol->maxblocks is never set from the main volume header once it is located and so it tries to find the backup volume at the (dummy) block 3 which inevitably fails. On a secondary note until towards the end of the function, volume_open() assumes the block size is 512 bytes. Therefore once we determine the size of the volume from the main volume header in blocks, we need to convert it from the block size indicated in the volume header to a fixed 512 byte block size in order for the alternate volume header to be located correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Tue Aug 21 00:29:42 2012 (r1063) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Sun Oct 7 17:26:46 2012 (r1064) @@ -171,7 +171,9 @@ UInt16 signature; char buf[vol->blksize]; char *p = buf; - + int ret; + UInt64 vol_size; + if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here return -1; @@ -202,7 +204,14 @@ } else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ p = buf; // Restore to begin of block - return volume_readbuf(vh, p); + ret = volume_readbuf(vh, p); + if( !ret ) { + /* When reading the initial partition we must use 512 byte blocks */ + vol_size = vh->blocksize * vh->total_blocks; + vol->maxblocks = vol_size / HFSP_BLOCKSZ; + } + + return ret; } else HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); fail:

1 0

Re: [OpenBIOS] [PATCH] Adds the get-time word to the dictionary. Used to obtain the current time.
by Programmingkid 06 Oct '12

06 Oct '12

On Oct 4, 2012, at 3:30 PM, openbios-request(a)openbios.org wrote: > Message: 5 > Date: Tue, 25 Sep 2012 16:03:20 +0200 > From: Segher Boessenkool <segher(a)kernel.crashing.org> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] [PATCH] Adds the get-time word to the > dictionary. Used to obtain the current time. > Message-ID: <21F2BBE0-1211-44F5-8C20-8148431F682A(a)kernel.crashing.org> > Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed > >> : get-time >> " rtc" open-dev ( ihandle ) >> ?dup 0= if >> cr abort" Sorry but no rtc node is present on this system" >> then ( ihandle ) >>> r " get-time" r@ $call-method ( <returned args - 6 of em? >> Yikes > ) >> r> close-dev ( <returned args> ) >> ; > > : get-time > s" rtc" s" get-time" execute-device-method > 0= ABORT" Sorry but no rtc node is present on this system" ; > > (note that ABORT" takes a flag as input), but better is > > : get-time > s" rtc" s" get-time" execute-device-method > 0= IF fake-some-sort-of-plausible-time-1970-or-so THEN ; > > which is pretty much what Apple's OF does. execute-device-method > is not the same thing as open-dev followed by $call-method: it > does not call "open" in the instance for the device itself (you > only need that for devices that can have multiple clients at the > same time and need to keep state for each client; or when instead > you need to prevent concurrent access from multiple clients, by > having the second open fail). > > > Segher I honestly see no reason to replace open-dev with execute-device-method. My original patch is just fine.

2 1

Reducing QEMU's CPU usage
by Programmingkid 29 Sep '12

29 Sep '12

Is there a way to make QEMU not use 100% of the CPU time when OpenBIOS is just at the console? My guess is OpenBIOS is in some kind of loop, polling the keyboard for events, when it should probably be interrupt based. Anybody have a clue as to what we need to change?

2 1

[PATCH] Adds the get-time word to the dictionary. Used to obtain the current time.
by Programmingkid 25 Sep '12

25 Sep '12

The get-time word is a word that is used to obtain the current time. It is used on Apple's Open Firmware. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- forth/system/main.fs | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/forth/system/main.fs b/forth/system/main.fs index 122ab1f..6867cf3 100644 --- a/forth/system/main.fs +++ b/forth/system/main.fs @@ -58,3 +58,24 @@ variable DIAG-list outer-interpreter ; + +\ Returns the time ( -- second minute hour day month year ) +: get-time + " get-time" ( addr len ) + " rtc" open-dev ( addr len device ) + dup ( addr len device device ) + + 0= if \ if the real-time clock isn't available + cr + 3drop ( ) + true ( flag ) + abort" Sorry but get-time isn't available for your system. " + then + + dup ( addr len device device ) + >R ( addr len device ) ( R: device ) + $call-method ( addr len device -- ) ( R: device ) + R> ( device ) ( R: ) + close-dev ( device -- ) +; + -- 1.7.5.4

3 2

[PATCH] Adds the get-time word to the dictionary. It returns the current time and date on the stack.
by Programmingkid 25 Sep '12

25 Sep '12

Made a few changes to the patch. Thank you Tarl for your suggestions. Signed-Off-By: John Arbuckle <programmingkidx(a)gmail.com> --- forth/system/main.fs | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/forth/system/main.fs b/forth/system/main.fs index 122ab1f..16d4829 100644 --- a/forth/system/main.fs +++ b/forth/system/main.fs @@ -58,3 +58,25 @@ variable DIAG-list outer-interpreter ; + +\ Returns the time ( -- second minute hour day month year ) +: get-time + " rtc" open-dev ( device ) + dup ( device device ) + + 0= if \ if the real-time clock isn't available + drop ( ) + true ( flag ) + cr + abort" Sorry but get-time isn't available for your system. " + then + + " get-time" ( device addr len ) + rot ( addr len device ) + dup ( addr len device device ) + >r ( addr len device ) ( R: device ) + $call-method ( addr len device -- second minute hour day month year ) ( R: device ) + r> ( device ) ( R: ) + close-dev ( device -- ) +; + -- 1.7.5.4

2 1

Re: [OpenBIOS] [PATCH 3/3] Add initial implementation of "dir" word for HFS+ filesystems.
by Programmingkid 25 Sep '12

25 Sep '12

On Sep 20, 2012, at 1:32 PM, openbios-request(a)openbios.org wrote: > Message: 4 > Date: Tue, 18 Sep 2012 16:31:40 +0100 > From: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> > To: openbios(a)openbios.org > Cc: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> > Subject: [OpenBIOS] [PATCH 3/3] Add initial implementation of "dir" > word for HFS+ filesystems. > Message-ID: > <1347982300-14648-3-git-send-email-mark.cave-ayland(a)ilande.co.uk> > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> > --- > openbios-devel/fs/hfsplus/hfsp_fs.c | 140 ++++++++++++++++++++++++++++++++++- > 1 file changed, 136 insertions(+), 4 deletions(-) > > diff --git a/openbios-devel/fs/hfsplus/hfsp_fs.c b/openbios-devel/fs/hfsplus/hfsp_fs.c > index 83e4d8d..4cc6ddc 100644 > --- a/openbios-devel/fs/hfsplus/hfsp_fs.c > +++ b/openbios-devel/fs/hfsplus/hfsp_fs.c > @@ -437,14 +437,146 @@ hfsp_files_volume_name( hfsp_info_t *mi ) > PUSH(pointer2cell(volname)); From the output you shown us, it looks like the patch works. Those were the files that were on the image file I sent you. I wanted to test it out myself but I couldn't apply your patch. Probably something I did wrong. I suggest applying the patches. They look good.

2 1

local variable patch
by Programmingkid 23 Sep '12

23 Sep '12

I sent my local variable support patch in a few weeks ago and was wondering if someone could commit it.

1 0

Re: [OpenBIOS] Viewing files on HFS volume
by Programmingkid 21 Sep '12

21 Sep '12

On Sep 20, 2012, at 1:32 PM, openbios-request(a)openbios.org wrote: > Okay I've got it - looks like volume_open() currently gets confused when > trying to open a volume where the block size is not 512 bytes (in the > case of your CD image it is 4096 bytes). I have now implemented a basic > dir word (patch to follow shortly) which gives the following output > against your image: > > > Welcome to OpenBIOS v1.0 built on Sep 18 2012 15:11 > > 0 > dir cd:2,\ > 6148 2012-09-11 13:41:40 .DS_Store > 0 2012-09-11 13:41:20 .fseventsd\ > 0 2012-09-11 13:41:20 .HFS+ Private Directory Data?\ > 0 2012-09-11 13:42:08 .TemporaryItems\ > 0 2012-09-11 13:41:20 .Trashes\ > 0 2012-09-11 13:41:40 Folder 1\ > 0 2012-09-11 13:41:44 Folder 2\ > 29 2012-09-11 13:42:08 readme.txt > 0 2012-09-11 13:41:20 HFS+ Private Data\ > ok > 0 > dir cd:2,\.fseventsd > 294 2012-09-11 13:42:57 0000000007c7a66b > 36 2012-09-11 13:41:20 fseventsd-uuid > ok > 0 > dir cd:2,\Folder 1 > (Empty folder) > ok > 0 > dir cd:2,\Folder 2 > (Empty folder) > ok > 0 > dir cd:2,\Folder 3 > Unable to locate path \Folder 3 on filesystem > ok > > > Note that we don't (yet) do autolocation of partitions which is why the > cd:2 notation is needed to manually point towards the second partition > on the CD. Please test and let me know how you get on with your original > Apple CD. > > > ATB, > > Mark. Thank you so much for finally fixing this word. I will test out the patch in a couple of days.

1 0

Obtaining the time
by Programmingkid 21 Sep '12

21 Sep '12

I want to access the time in OpenBIOS. Is there a word to do this already? If not, is there a way to access the time directly from the clock on QEMU using the Macintosh target?

1 0

Assertion of an OP on the fedora users list
by JD 20 Sep '12

20 Sep '12

This is from a thread "UEFI bootkit" on fedora-users mailing list ------------------------- On 09/20/2012 05:09 AM, Alan Cox wrote: > The required information for almost all X86 devices is not available. > You can't build an open firmware for most x86 platforms from public > information. > > Alan ------------------------- Is the above assertion true?

2 3

Re: [OpenBIOS] [Qemu-ppc] FreeBSD powerpc issue
by Andreas Tobler 20 Sep '12

20 Sep '12

--------- Original Message -------- From: The OpenBIOS Mailinglist <openbios(a)openbios.org> To: Andreas Tobler <andreast(a)fgznet.ch> Cc: The OpenBIOS Mailinglist <openbios(a)openbios.org>, qemu-ppc List <qemu-ppc(a)nongnu.org>, Andreas Färber <afaerber(a)suse.de>, Segher Boessenkool <segher(a)kernel.crashing.org> Subject: Re: [OpenBIOS] [Qemu-ppc] FreeBSD powerpc issue Date: 20/09/12 11:37 > > On 31.08.2012, at 22:40, Andreas Tobler wrote: > > > On 27.08.12 23:51, Alexander Graf wrote: > >> > >> > >> On 27.08.2012, at 13:43, Segher Boessenkool <segher(a)kernel.crashing.org> wrote: > >> > >>>>>> How do I flush the TLB? > >>>>> > >>>>> tlbie, and perhaps tlbsync. > >>>> > >>>> The QEMU TLB only caches existing translations, never misses. > >>> > >>> I'm not sure what you mean here? No PowerPC hardware that I know of > >>> stores a "this address doesn't go anywhere" tag in the TLB, either > >>> (I don't think the architecture allows that even). > >>> > >>> I also don't see what it has to do with the problem. The scenario > >>> what we think is happening: the CPU has translations for the OF code > >>> space in its TLB, because it has run it before. The kernel removes > >>> the translations but doesn't do TLBIE on those. On real hardware, > >>> the TLB entries are still used. What does QEMU do? > >> > >> Ah, I see. It depends. QEMU doesn't provide any guarantees that the TLB survives basically. We don't flush it often for book3s, but it can still happen. Maybe try to put a printf into the tlb flush handler function? > > > > Sorry for the delay, was sick for the past days :( > > > > You suggest to add some printf's, am I right to do that in the cputlb.c tlb_flush()? If not, where did you mean to do that? > > Yup. tlb_flush_page and/or tlb_flush. Ok. I'll play in this direction. > > > And on a side note, are/were there successful boot results from other OS's than linux with qemu and OpenBIOS on powerpc? > > Phew. With a bunch of hacks I've had Mac OS X booted into its kernel where it was happily churning along until it realized that I'm trying to run it on machine that was too old (g3 beige support got dropped as early as 10.3 iirc). > > Apart from that, I'm not aware of any successful boots. Maybe haiku? I got haiku boot until some sort of shell access. But I didn't bother to play around with it. For me it was important to see that it does not access OF after running the kernel. This is in contrary to FreeBSD where we try to access OF after the kernel has taken over MM. So I need some sort of mapping or/and call-back stuff to know where I (kernel) can call the OF routines after the kernel has taken over MM. Thank you for the response. (And sorry for the formatting, web-mail...) Andreas

1 0

Re: [OpenBIOS] [Qemu-ppc] FreeBSD powerpc issue
by Alexander Graf 20 Sep '12

20 Sep '12

On 25.08.2012, at 03:05, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Sat, Aug 25, 2012 at 9:47 AM, Andreas TObler <andreast(a)fgznet.ch> wrote: >> On 08/25/12 11:00, Blue Swirl wrote: >>> >>> On Fri, Aug 24, 2012 at 9:45 PM, Andreas Tobler <andreast(a)fgznet.ch> >>> wrote: >>>> >>>> Hello, >>>> >>>> I'm trying to get FreeBSD powerpc running with qemu. >>>> So far it loads the fbsd loader and the loader loads the kernel. >>>> The kernel starts booting but it hangs in an endless loop. It tries to >>>> print >>>> out a fatal_trap but it looks like the 'of' doesn't work properly >>>> (anymore?) >>>> at this stage. >>>> >>>> I have a remote debugger attached to the kernel and I can see where it >>>> hangs. But I can not figure out what caused the fatal trap here. >>>> >>>> An 'info registers' in qemu shows the srr0=fff025a4, this, as I >>>> understand, >>>> points to of_client_callback from OpenBIOS. (objdump -dS >>>> openbios-qemu.nostrip gives me this.) >>>> >>>> qemu is on 1.1.90, iow, a git snapshot from yesterday with OpenBIOS from >>>> 19th of aug. >>>> >>>> Is there a possibilty to 'debug' the OpenBIOS somehow? >>> >>> >>> CCing OpenBIOS list too. >>> >>> We have a built-in debugger in OpenBIOS (maybe not well documented). >>> Then there's DEBUG_CIF in libopenbios/client.c and it should be >>> possible to add debugging print statements to forth/system/ciface.fs >>> too. >> >> >> Oh, thank you. I'll take a look when I'm back on the machine. >> >> >>>> I'm not sure whether it is a kernel issue or an OpenBIOS issue. >>> >>> >>> The problem could be that there's a MMU fault when the kernel calls >>> OpenBIOS, maybe because OpenBIOS is no longer mapped (MMU disabled?) >>> and then the above debugging would not help. >> >> >> Hm, from the FreeBSD kernel code view, I passed several 'of' calls to read >> the memory regions etc. to map memory. That said, OB is working fine for the >> start. >> I'm not sure where it happens, the fault above. It might be when I start to >> call 'of' again after I have started the MMU on the FreeBSD kernel side. >> >> So, to my understanding, you say it might be an MMU fault, that OB is no >> longer mapped? Who would be the responsible for this mapping, the FreeBSD >> kernel or OB? > > Assuming that SRR0 is the fault address (I'm not so familiar with > PPC), SRR0 is the fault IP. So if the fault at hand is an instruction fetch fault, yes, that would be the address at fault. If it's a data fault you would have to check DAR for the address it faults in. It might also help to boot the guest with -d in_asm,cpu,int and check out /tmp/qemu.log afterwards. Search for the IP that faulted and see why exactly it did. Alex > since it's pointing to the low level entry point this could make > sense. > > At least on Sparc, the kernel should save the original MMU mappings > and restore them on point of entry to OpenBIOS. Alternatively, you > could try to arrange the code so that after you take control of MMU, > OpenBIOS is not used anymore. For example, Linux builds an internal > model of the Open Firmware tree and does not use the OF calls for OF > tree lookup after the initial probe. I'd suppose NetBSD and OpenBSD > kernel code could be used for reference since they work on PPC (real > machines at least, I haven't tried on QEMU). > >> >> Thanks a lot! >> Andreas >

4 15

Re: [OpenBIOS] Viewing files on HFS volume
by Programmingkid 18 Sep '12

18 Sep '12

On Sep 10, 2012, at 10:59 PM, openbios-request(a)openbios.org wrote: > Message: 7 > Date: Sun, 09 Sep 2012 23:33:13 +0100 > From: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Viewing files on HFS volume > Message-ID: <504D1929.3050107(a)ilande.co.uk> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 06/09/12 13:47, Programmingkid wrote: > >> I am trying to open a Macintosh CD in OpenBIOS. When I use this command to view the files: dir cd:\, I receive an error message stating that mac-parts could not determine the file system on the disc. Has any one been able to view files on a HFS disc? > > IIRC there was a bug reported in the HFS partition calculation code in > OpenBIOS (possibly my fault after some refactoring?). It shouldn't be > too difficult to fix, but if you're struggling then I don't mind taking > a look if you can supply a test image. Here is the test image you requested. It is a CD image I created in Disk Utility. I couldn't make a HFS volume, so I had to settle with an HFS+ volume. I did test it out and QEMU gave me the same error I saw with an Apple supplied CD. Thanks for helping.

2 2

OpenBIOS Array implementation
by Programmingkid 14 Sep '12

14 Sep '12

You commented on my local variable code a while back. I have remade the Array implementation it uses. Let me know what you think. \ ****** new version ********* : ARRAY ( cellCount -- ) \ Compile-time behavior CREATE CELLS ALLOT ( cellCount -- ) \ Creates and initializes the instance \ Run-time behavior DOES> ( index addr ) SWAP CELLS + ( index addr -- addr1 ) \ Calculates address to return ;

2 1

drawing words?
by Programmingkid 11 Sep '12

11 Sep '12

Is it possible to add graphic words that can draw shapes to OpenBIOS? Does OpenBIOS have these words already? I was studying Apple's implementation when I discovered these drawing words.

3 3

PowerPC MMU translations property
by Andreas Tobler 10 Sep '12

10 Sep '12

Hi, I'm trying to understand how the 'translations' entry (/cpus/PowerPC,G4 for example) for PPC is created. Or is it taken from a template? When I use qemu and enter into OF I see translations only up to 80000000-800eb000. When I compare with a real PowerBook G4 I see some more above 800eb000, for example one which I'm looking for in OpenBIOS for the OF mapping: 0xff8000000-0xffc00000 -> 0x3fc00000-0x40000000 This mapping describes the OF code mapping/translation of this particular PowerBook. In the code I was not able to understand the mechanics, so a hint on how to read would really be appreciated. Thanks, Andreas

2 1

Viewing files on HFS volume
by Programmingkid 10 Sep '12

10 Sep '12

I am trying to open a Macintosh CD in OpenBIOS. When I use this command to view the files: dir cd:\, I receive an error message stating that mac-parts could not determine the file system on the disc. Has any one been able to view files on a HFS disc?

2 1

Suggestion for building OpenBIOS
by Programmingkid 10 Sep '12

10 Sep '12

I was building OpenBIOS when I had an idea. What if we had each file that was being compiled displayed in the console. I am sure most people here have seen how QEMU does this when it is being built. It displays the action it is currently doing with the file it is doing the action on. So if it is compiling C source code, you would see CC file.c. This should be what happens when compiling OpenBIOS. It would give the user some idea what is going on. Is this feature something we could implement in OpenBIOS?

3 2

Re: [OpenBIOS] Fwd: [PATCH] Adds local variable support to OpenBIOS.
by Programmingkid 02 Sep '12

02 Sep '12

On Sep 1, 2012, at 7:51 PM, openbios-request(a)openbios.org wrote: > Message: 2 > Date: Fri, 31 Aug 2012 13:40:58 -0500 > From: Tarl Neustaedter <tarl-b2(a)tarl.net> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Fwd: [PATCH] Adds local variable support to > OpenBIOS. > Message-ID: <5041053A.90303(a)tarl.net> > Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" > > On 2012-Aug-31 09:50 , Programmingkid wrote: >> >> Are you saying my-variable is better than myVariable? > > Yes. I have changed all my code from camelCase to hyphens. > >> How do global variables get you in trouble in recursion? Do you have >> an example? > > Not off-hand, we learn to avoid doing that. To construct one - let's > take a method doing recursion properly, and break it: > > \ Correct way, using stack manipulation > : fibonacci ( fib -- return ) recursive > dup 2 >= if ( fib ) > dup 1- fibonnaci ( fib fib-1 ) > swap 2 - fibonnaci ( fib-1 fib-2 ) > + ( fib ) > then ( fib ) > ; > > \ Incorrect way - using variable "fib", which will get overwritten > during recursion > 0 value fib; > : fibonnaci ( fib -- return ) recursive > to fib \ to avoid stack manipulation > fib 2 < if > fib exit > then > fib 1- fibonnaci ( fib-1) > fib 2 - fibonnaci ( fib-1 fib-2 ) > + ( fib ) > ; There is nothing to worry about. All the global variables in my code are only used at compile- time - not during runtime.

1 0

[PATCH] Adds local variable support to OpenBIOS - one of the key ingredients needed to boot Mac OS X.
by Programmingkid 02 Sep '12

02 Sep '12

Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- forth/bootstrap/interpreter.fs | 50 +++- forth/util/util.fs | 544 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 580 insertions(+), 14 deletions(-) diff --git a/forth/bootstrap/interpreter.fs b/forth/bootstrap/interpreter.fs index 5187058..769633f 100644 --- a/forth/bootstrap/interpreter.fs +++ b/forth/bootstrap/interpreter.fs @@ -40,26 +40,20 @@ \ 7.3.9.2.4 Miscellaneous dictionary \ -\ interpreter. This word checks whether the interpreted word -\ is a word in dictionary or a number. It honours compile mode -\ and immediate/compile-only words. -: interpret - 0 >in ! - begin - parse-word dup 0> \ was there a word at all? - while - $find +\ Most of the old version of interpret +: old-interpret ( addr len -- ) + $find if dup flags? 0<> state @ 0= or if execute else - , \ compile mode && !immediate + , \ Compile mode && !immediate then - else \ word is not known. maybe it's a number + else \ Word is not known. maybe it's a number 2dup $number if - span @ >in ! \ if we encountered an error, don't continue parsing + span @ >in ! \ If we encountered an error, don't continue parsing type 3a emit -13 throw else @@ -70,9 +64,37 @@ depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then +; + + +Defer lfind-defer +false VALUE using-locals + +\ The refactored interpret - supports local variables +: interpret ( -- ) + 0 >in ! + begin + parse-word ( addr len ) + dup ( addr len len1 ) + 0> ( addr len flag ) \ Was there a word at all? + while ( addr len ) + using-locals true = IF ( addr len ) \ If local variables are being used + 2dup ( addr len addr1 len1 ) + lfind-defer ( addr len flag ) + not IF ( addr len ) \ If symbol is not a local variable + old-interpret ( ) + ELSE \ Else clean up the stack + 2drop ( ) + THEN + + ELSE \ If not using local variables + old-interpret ( addr len -- ) + THEN + repeat - 2drop - ; + 2drop \ Removes the addr len pair if the loop ends at the WHILE word +; + : refill ( -- ) ib #ib @ expect 0 >in ! ; diff --git a/forth/util/util.fs b/forth/util/util.fs index 6f549bf..529b722 100644 --- a/forth/util/util.fs +++ b/forth/util/util.fs @@ -93,3 +93,547 @@ 2dup " tell" is-relay 2drop ; + + +\ ------------------------------------------------------------------------- +\ Local Variable Support +\ ------------------------------------------------------------------------- + +\ Creates an array variable +: ARRAY ( cellCount - ) + DEPTH 0< IF + CR ." Please specify an array size." CR + abort + THEN + + \ Compile-time behavior + CREATE CELLS ALLOT \ Creates and initializes the instance + + DOES> + + \ Run-time behavior + DEPTH 2 < IF + CR ." Please specify an index number." CR + drop \ Removes the address of the array instance + -1 throw \ Stop normal execution after error + THEN + + SWAP CELLS + \ Calculates address to return +; immediate + + +\ Declare the local-base-address VALUE +0 VALUE local-base-address + +\ Returns the base address used for the local words +: get-base-address ( - addr ) + local-base-address +; + +\ Sets the base address used for the local words +: set-base-address ( addr - ) + TO local-base-address +; + + +\ Sets the first local variable's value +: Local0! ( x - ) + 0 CELLS get-base-address + ! +; + +\ Sets the second local variable's value +: Local1! ( x - ) + 1 CELLS get-base-address + ! +; + +\ Sets the third local variable's value +: Local2! ( x - ) + 2 CELLS get-base-address + ! +; + +\ Sets the fourth local variable's value +: Local3! ( x - ) + 3 CELLS get-base-address + ! +; + +\ Sets the fifth local variable's value +: Local4! ( x - ) + 4 CELLS get-base-address + ! +; + +\ Sets the sixth local variable's value +: Local5! ( x - ) + 5 CELLS get-base-address + ! +; + +\ Sets the seventh local variable's value +: Local6! ( x - ) + 6 CELLS get-base-address + ! +; + +\ Sets the eighth local variable's value +: Local7! ( x - ) + 7 CELLS get-base-address + ! +; + +\ Sets the ninth local variable's value +: Local8! ( x - ) + 8 CELLS get-base-address + ! +; + +\ Sets the tenth local variable's value +: Local9! ( x - ) + 9 CELLS get-base-address + ! +; + +\ Sets the eleventh local variable's value +: Local10! ( x - ) + 10 CELLS get-base-address + ! +; + +\ Sets the twelfth local variable's value +: Local11! ( x - ) + 11 CELLS get-base-address + ! +; + + +\ **** Calculates the needed amount of memory for local variables **** +0 value variableCount +: calculate-needed-memory ( - n ) + 0 TO variableCount + >in @ \ Keep track of where the pointer was + + begin + parse-word + 0= if \ If there is no more text to parse + drop + true + else + dup " ;" comp + 0= if \ If the semicolon is encountered + drop \ Drop the duplicated address + false + else + " }" comp + 0= if \ If '}' character is encountered + true \ End loop because '}' marks end of local variables + else + variableCount 1 + TO variableCount + false + then + then + then + until + + >in ! \ Reset the pointer + variableCount CELLS +; + + +\ **** allocates the memory for local variables **** +: allocate-memory ( n - addr ) + alloc-mem dup 0= if + drop + cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr + then +; + + + +\ Declares the size of the local variable table +48 CONSTANT #local-table-elements + +\ Declare the local variable table +#local-table-elements ARRAY local-variable-table + +\ Keeps track of end of array +0 VALUE #filled-local-table-elements + +\ Clears the local variable table +: init-local-table ( - ) + + \ Free all the dynamically allocated memory + #filled-local-table-elements 0 ?do + I 3 + local-variable-table @ ( addr ) + free-mem ( ) + 4 +loop + + 0 local-variable-table #local-table-elements erase + 0 TO #filled-local-table-elements +; + +\ Adds a local variable symbol to the local variable table +: add-local ( addr len order initflag - ) + depth 4 < if + cr ." The stack needs at least 4 values to add a local variable." cr + exit + then + + \ Add to the end of the table + #filled-local-table-elements 0 + local-variable-table ! \ initflag + #filled-local-table-elements 1 + local-variable-table ! \ order + #filled-local-table-elements 2 + local-variable-table ! \ len + #filled-local-table-elements 3 + local-variable-table ! \ addr + + \ Allocate memory for the symbol + #filled-local-table-elements 2 + local-variable-table @ ( length ) + alloc-mem ( memaddr ) + dup ( memaddr memaddr ) + dup ( memaddr memaddr memaddr ) + + \ Called only when memaddr = 0 + 0= if ( memaddr memaddr ) + cr ." Failed to allocate memory in add-local!" cr ( memaddr memaddr ) + then + + \ Copy local variable name to a safe location + #filled-local-table-elements 3 + local-variable-table @ ( memaddr memaddr addr ) + swap ( memaddr addr memaddr ) + #filled-local-table-elements 2 + local-variable-table @ ( memaddr addr memaddr length ) + move ( memaddr ) + #filled-local-table-elements 3 + local-variable-table ! ( ) + + \ Increment #filled-local-table-elements + #filled-local-table-elements 4 + TO #filled-local-table-elements +; + +\ Prints the local variable table +: print-local-table + + #filled-local-table-elements 0= if + cr ." No variables loaded" cr + exit + then + + #filled-local-table-elements 0 ?do + cr ." Variable name: " + I 3 + local-variable-table @ + I 2 + local-variable-table @ + type + + ." Order: " + I 1 + local-variable-table @ . + + ." Init Flag: " + I 0 + local-variable-table @ . + 4 +loop +; + +\ Finds a local variable symbol in the local variable table +\ Returns its order or -1 on failure +: get-order ( addr len - order ) + \ If the address and length are missing + depth 2 < if + cr ." Address and length are required on the stack to use get-order!" cr + -1 throw \ Ends execution + then + + #filled-local-table-elements 0 ?do + over ( addr len addr ) + I 3 + ( addr len addr addrindex ) + local-variable-table @ ( addr len addr addr1 ) + 2 pick ( addr len addr addr1 len ) + + \ Check if lengths of two strings are the same length + dup ( addr len addr addr1 len len ) + I 2 + local-variable-table @ ( addr len addr addr1 len len len1) + = if ( addr len addr addr1 len ) \ If lengths are equal + comp ( addr len flag) + 0= if ( addr len flag ) \ If the symbol is found + 2drop ( ) + I 1 + local-variable-table @ ( order ) + unloop + exit + then + + else \ If the lengths are different + 3drop ( addr len ) + then + + \ Increment the index by 4 + 4 +loop + 2drop ( addr len - ) + -1 \ Returns -1 for the order if the symbol is not found +; + + +\ **** read the local variables in the input stream **** +0 VALUE use-top-stack-value +0 VALUE index +0 VALUE local-variable-memory + +: read-local-variables ( "char" - ) + 0 TO index + true TO use-top-stack-value + + begin + parse-word ( addr len ) + dup ( addr len len ) + 0> ( addr len flag ) + while ( addr len ) + 2dup ( addr len addr len ) + drop ( addr len addr ) + " }" ( addr len addr addr len ) + comp ( addr len flag ) + 0= if ( addr len ) \ If end of local variables + drop ( addr ) + drop ( ) + exit ( ) + then + + 2dup ( addr len addr len ) + drop ( addr len addr ) + " ;" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ If not using top stack value for local variables + false TO use-top-stack-value ( addr len ) + 2drop ( ) + else \ Add local variable to table + index use-top-stack-value ( addr len order use-top-stack-value ) + add-local ( ) + index 1 + TO index \ Increment index + then + + repeat + drop ( addr ) + drop ( ) +; + + +\ Sets the stack size +1000 CONSTANT max-stack-size + +\ Declare the local stack +max-stack-size ARRAY local-stack + +\ Declare the stack top pointer +0 VALUE local-stack-top + +\ Adds to the top of the local stack +: push-local-stack ( x - L:x ) + local-stack-top max-stack-size 1 - > + if + cr ." Local stack overflow!" cr + max-stack-size TO local-stack-top \ Sets local-stack-top back to the max size + then + local-stack-top local-stack ! ( x - ) + local-stack-top 1 + TO local-stack-top +; + + +\ Removes the top local stack value and places it into the data stack +: pop-local-stack ( L:x - x ) + local-stack-top 1 - TO local-stack-top \ Decrement local-stack-top + local-stack-top 0< if \ If popping too many items + cr ." Local stack underflow!" cr + 0 TO local-stack-top \ Sets local-stack-top back to zero + abort + then + local-stack-top local-stack @ +; + + +\ ***** sets up local variables ****** +: { ( -- ) + init-local-table + calculate-needed-memory ( memorySize ) + allocate-memory ( memorySize - addr ) + TO local-variable-memory ( ) + read-local-variables ( ) + TRUE TO using-locals + + \ Add code to the current definition + + \ Saves the old base address + postpone get-base-address + postpone push-local-stack + + \ Sets the base address to this definition's reserved memory + local-variable-memory + postpone literal + postpone set-base-address + + \ Add code to initialize the variables if needed + 0 #filled-local-table-elements 4 - ?do + I 0 + local-variable-table @ ( flag ) \ Get the init flag + true ( flag true ) + = ( flag1 ) + if + I 4 / ( variable number ) + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + then + -4 +loop + +; immediate \ Declares this word as a compiler directive + + + +\ Sets values for local variables +: -> ( - ) + parse-word ( addr len ) + get-order ( order ) + dup ( order order ) + -1 = ( order flag ) + + if \ If the symbol isn't found + cr ." Symbol is not a local variable! " cr + drop ( ) + exit + then + + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + +; immediate + + +\ Returns the first local variable's value +: Local0@ + 0 CELLS get-base-address + @ +; + +\ Returns the second local variable's value +: Local1@ + 1 CELLS get-base-address + @ +; + +\ Returns the third local variable's value +: Local2@ + 2 CELLS get-base-address + @ +; + +\ Returns the fourth local variable's value +: Local3@ + 3 CELLS get-base-address + @ +; + +\ Returns the fifth local variable's value +: Local4@ + 4 CELLS get-base-address + @ +; + +\ Returns the sixth local variable's value +: Local5@ + 5 CELLS get-base-address + @ +; + +\ Returns the seventh local variable's value +: Local6@ + 6 CELLS get-base-address + @ +; + +\ Returns the eighth local variable's value +: Local7@ + 7 CELLS get-base-address + @ +; + +\ Returns the ninth local variable's value +: Local8@ + 8 CELLS get-base-address + @ +; + +\ Returns the tenth local variable's value +: Local9@ + 9 CELLS get-base-address + @ +; + +\ Returns the eleventh local variable's value +: Local10@ + 10 CELLS get-base-address + @ +; + +\ Returns the twelfth local variable's value +: Local11@ + 11 CELLS get-base-address + @ +; + + +\ Determines if a symbol is a local variable +\ Returns true if the symbol is a local variable, false otherwise +: LFIND ( addr len - flag ) + depth 2 < if \ If the address and length are not on the stack + exit + then + + get-order ( addr len - n ) + dup ( n n1 ) + -1 = if ( n ) \ If the symbol isn't a local variable + drop ( ) + false ( flag ) + + else \ If the symbol is a local variable + case ( n ) + 0 of ['] Local0@ , endof + 1 of ['] Local1@ , endof + 2 of ['] Local2@ , endof + 3 of ['] Local3@ , endof + 4 of ['] Local4@ , endof + 5 of ['] Local5@ , endof + 6 of ['] Local6@ , endof + 7 of ['] Local7@ , endof + 8 of ['] Local8@ , endof + 9 of ['] Local9@ , endof + 10 of ['] Local10@ , endof + 11 of ['] Local11@ , endof + + \ Default case + cr ." Could not compile local variable!" cr + TRUE ( flag ) + exit + + endcase + + ." compiled " \ Display this text when entering a local variable symbol + true ( flag ) + then +; + + +\ Redefine colon to clean up after { +: ; + using-locals TRUE = + if + FALSE TO using-locals + postpone pop-local-stack + postpone set-base-address + then + postpone ; +; immediate + +' lfind is lfind-defer \ Makes lfind work in INTERPRET + -- 1.7.5.4

1 0

Fwd: [PATCH] Adds local variable support to OpenBIOS.
by Programmingkid 31 Aug '12

31 Aug '12

On Aug 28, 2012, at 2:50 AM, openbios-request(a)openbios.org wrote: > Message: 1 > Date: Mon, 27 Aug 2012 21:18:08 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] [PATCH] Adds local variable support to > OpenBIOS. > Message-ID: <503C1C50.408(a)tarl.net> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > [...] > > >>> >>> And don't use CamelCase. >> >> Is this some official naming convention, or your own taste? > > In general (at least in the 1275 world), Forth is case-insensitive. The > rare cases where it is made case sensitive (there are a couple in Sun's > Openboot - see dropins.src) make use of mixed case very painful. The > general standard is that methods and variables are lower case, defined > constants and structure offsets are upper case. In some code, even they > are lower case. > > Mixed-case is generally confined to comments. Are you saying my-variable is better than myVariable? > >>> Factor this? You shouldn't ever use a variable that is used as a temp >>> inside a word. >> >> I'm not sure why you suggest this. It is just such a pain having to >> deal with the stack. > > Because using a global variable gets you in trouble in recursion or when > the same code is called at alarm level. As for stack being a pain, yes, > that's forth. Stack manipulation as a way of life. Personally, I prefer > "2over nip" rather than "2 pick" :-) How do global variables get you in trouble in recursion? Do you have an example? I am not familiar with this alarm level. Could you explain what it is? > >>>> +48 CONSTANT localTableSize >>>> + >>>> +\ Declare the local variable table >>>> +localTableSize ARRAY localVariableTable >>> >>> You have 48 but can only access 12? >> >> That is four fields per local variable: 48 / 4 = 12. > > At a minimum, any derived constants should be derived explicitly. Like: > > 12 constant #local-variables \ Feels right. If you need more, add > more code after Locals11. > 4 constant /local-variable \ Datastructures require four cells > #local-variables /local-variable * constant locals-table-size \ Size in > cells, not bytes. > > Ah. That points out another convention. When mashing together multiple > words for a method or variable name, we tend to use dashes as separators > (and please, don't use underscores. There is someone I know who *mixes* > underscores and dashes in variable names!). Another is that sizes of > things are usually /object (such as /n, /l, ...) and counts of objects > are usually #object. Ok. Sounds reasonable. > >> >>> >>>> +: getLocalRecordCount >>>> +arrayCount 4 / >>>> +; >>> >>> Oh. Use a struct? >> >> The little documentation on struct I found did not indicate it was a >> better replacement for Array. > > Struct will allow you define what the four separate words used in each > local variable entry are used for. If you use structs, I'd expect to see > something like: > > struct > /n field >LOCAL-INIT > /n field >LOCAL-ORDER > /n field >LOCAL-LEN > /n field >LOCAL-ADDR > constant /local-variable > 12 constant #local-variables > /local-variable #local-variables constant locals-table-size > > Note that the above provides the table size in bytes, rather than cells. > > To use the above (assuming you are still using alloc-mem), you'd see > something like: > > locals-table-size alloc-mem ( table ) > #local-variables 0 do ( table ) > i /local-variable * ( table entry ) > 0 over >LOCAL-INIT ! ( table entry ) > 0 over >LOCAL-ORDER ! ( table entry ) > 0 over >LOCAL-LEN ! ( table entry ) > 0 swap >LOCAL-ADDR ! ( table ) > loop ( table ) That looks very unfriendly. There is no way I am using structs.

2 1

Re: [OpenBIOS] [PATCH] Adds local variable support to OpenBIOS.
by Programmingkid 28 Aug '12

28 Aug '12

On Aug 27, 2012, at 4:44 PM, openbios-request(a)openbios.org wrote: > Message: 4 > Date: Mon, 27 Aug 2012 22:35:40 +0200 > From: Segher Boessenkool <segher(a)kernel.crashing.org> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] [PATCH] Adds local variable support to > OpenBIOS. > Message-ID: <F74BFA60-0824-49A9-B592-D6862E0ACFB7(a)kernel.crashing.org> > Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed > > Let me comment on the code, independently of if I think using local > var names is a good idea at all. > >> + DEPTH 0= IF >> + CR ." Please specify an array size." CR >> + EXIT >> + THEN > > You shouldn't blindly continue when you detect an error; use ABORT > instead, or ABORT" since you want to print something. Thanks for catching this. It has been corrected. > > Don't check stack depth, it is useless. It doesn't work when you > forgot to pass a parameter but there is other stuff on the stack > already (the common case). Your check also doesn't work if there > is a negative number of parameters on the stack (the next most > common case...) > > Just kill this part. I don't think ignoring all possible error situations is better than handing a few of them. > >> + CREATE CELL * ALLOT \ creates and initializes the instance > > CELL * is CELLS (which is a standard Forth word, CELL is not). Thanks for letting me know about CELL. I have changed them all to CELLS > >> + DEPTH 2 < IF >> + CR ." Please specify an index number." CR >> + drop \ removes the address of the array instance >> + -1 throw \ stop normal execution after error >> + THEN > > -1 THROW is ABORT > Same thing here, just kill this code. The error handling makes the word more user friendly. Having it fail and leaving the user clueless why doesn't sound right. > >> +; immediate > > Defining words should not be immediate in most cases, including here. > >> +\ Declare the local-base-address VALUE >> +0 VALUE local-base-address >> + >> +\ returns the base address used for the local words >> +: getBaseAddress ( - addr ) >> + local-base-address >> +; > > : really-get-base-address getBaseAddress ; > : really-really-get-base-address really-get-base-address ; > > And don't use CamelCase. Is this some official naming convention, or your own taste? > >> +\ Sets the first local variable's value >> +: Local0! ( x - ) >> + 0 CELL * getBaseAddress + ! >> +; > > You can do something smarter than this... > >> +\ Sets the twelfth local variable's value >> +: Local11! ( x - ) >> + 11 CELL * getBaseAddress + ! >> +; > > ...why stop at 11? As far as I know, Apple's code only uses two local variables at most. I figured 12 local variables per word should be enough. > >> +: calculateNeededMemory ( "char" - n ) >> + 0 TO variableCount >> + >in @ \ keep track of where the pointer was >> + >> + begin >> + parse-word >> + 0= if \ if there is no more text to parse >> + drop >> + true >> + else >> + dup " ;" comp >> + 0= if \ if the semicolon is encountered >> + drop \ drop the duplicated address >> + false >> + else >> + " }" comp >> + 0= if \ if '}' character is encountered >> + true \ end loop because '}' marks end of local variables >> + else >> + variableCount 1 + TO variableCount >> + false >> + then >> + then >> + then >> + until >> + >> + >in ! \ reset the pointer >> + variableCount CELL * >> +; > > Factor this? You shouldn't ever use a variable that is used as a temp > inside a word. I'm not sure why you suggest this. It is just such a pain having to deal with the stack. > >> +: allocateMemory ( n - addr ) >> + alloc-mem dup 0= if >> + drop >> + cr cr 10 spaces abort" Failed to allocate memory for local >> variables!" cr cr >> + then >> +; > > alloc-mem is way too slow to be used on every function call. Statically > allocate a locals stack, or put it on an existing stack, or something > like that. I agree. That is why it is only used at compile time. > >> +\ Declares the size of the local variable table >> +48 CONSTANT localTableSize >> + >> +\ Declare the local variable table >> +localTableSize ARRAY localVariableTable > > You have 48 but can only access 12? That is four fields per local variable: 48 / 4 = 12. > >> +: getLocalRecordCount >> + arrayCount 4 / >> +; > > Oh. Use a struct? The little documentation on struct I found did not indicate it was a better replacement for Array. > > I'll stop here. There are two good ways to implement locals (or > anything else, really): 1) Make it _simple_: you can do locals > in about 20 or 30 lines of code. 60 is fine, too. 2) Make it > efficient: don't allocate from a heap, don't run much code on > the hot paths. This will be much smaller code as well, but > perhaps trickier to understand. What is a hot path? > > Segher

3 3

[PATCH] Adds local variable support to OpenBIOS.
by Programmingkid 28 Aug '12

28 Aug '12

Here is the patch for local variable support. I have made several improvements to the code using the feedback I received. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com>. --- forth/bootstrap/interpreter.fs | 42 ++- forth/util/util.fs | 567 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 597 insertions(+), 12 deletions(-) diff --git a/forth/bootstrap/interpreter.fs b/forth/bootstrap/interpreter.fs index 5187058..3be9f0c 100644 --- a/forth/bootstrap/interpreter.fs +++ b/forth/bootstrap/interpreter.fs @@ -40,16 +40,9 @@ \ 7.3.9.2.4 Miscellaneous dictionary \ -\ interpreter. This word checks whether the interpreted word -\ is a word in dictionary or a number. It honours compile mode -\ and immediate/compile-only words. - -: interpret - 0 >in ! - begin - parse-word dup 0> \ was there a word at all? - while - $find +\ most of the old version of interpret +: oldInterpret + $find if dup flags? 0<> state @ 0= or if execute @@ -70,9 +63,34 @@ depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then - repeat +; + + +Defer mydefer +false VALUE usingLocals + +\ The refactored interpret - supports local variables +: interpret + 0 >in ! + begin + parse-word dup 0> ( addr len flag ) \ was there a word at all? + while ( addr len ) + + usingLocals true = if ( addr len ) \ if local variables are being used + mydefer ( addr len flag ) + not if ( ) \ if symbol is not a local variable + oldInterpret + then + + else \ if not using local variables + oldInterpret + then + + repeat 2drop - ; +; + + : refill ( -- ) ib #ib @ expect 0 >in ! ; diff --git a/forth/util/util.fs b/forth/util/util.fs index 6f549bf..3f5bb21 100644 --- a/forth/util/util.fs +++ b/forth/util/util.fs @@ -93,3 +93,570 @@ 2dup " tell" is-relay 2drop ; + + +\ ------------------------------------------------------------------------- +\ Local Variable Support +\ ------------------------------------------------------------------------- + +\ Creates an array variable +: ARRAY ( cellCount - ) + DEPTH 0< IF + CR ." Please specify an array size." CR + abort + THEN + + \ Compile-time behavior + CREATE CELLS ALLOT \ creates and initializes the instance + + DOES> + + \ Run-time behavior + DEPTH 2 < IF + CR ." Please specify an index number." CR + drop \ removes the address of the array instance + -1 throw \ stop normal execution after error + THEN + + SWAP CELLS + \ Calculates address to return +; immediate + + +\ Declare the local-base-address VALUE +0 VALUE local-base-address + +\ returns the base address used for the local words +: getBaseAddress ( - addr ) + local-base-address +; + +\ sets the base address used for the local words +: setBaseAddress ( addr - ) + TO local-base-address +; + + +\ Sets the first local variable's value +: Local0! ( x - ) + 0 CELLS getBaseAddress + ! +; + +\ Sets the second local variable's value +: Local1! ( x - ) + 1 CELLS getBaseAddress + ! +; + +\ Sets the third local variable's value +: Local2! ( x - ) + 2 CELLS getBaseAddress + ! +; + +\ Sets the fourth local variable's value +: Local3! ( x - ) + 3 CELLS getBaseAddress + ! +; + +\ Sets the fifth local variable's value +: Local4! ( x - ) + 4 CELLS getBaseAddress + ! +; + +\ Sets the sixth local variable's value +: Local5! ( x - ) + 5 CELLS getBaseAddress + ! +; + +\ Sets the seventh local variable's value +: Local6! ( x - ) + 6 CELLS getBaseAddress + ! +; + +\ Sets the eighth local variable's value +: Local7! ( x - ) + 7 CELLS getBaseAddress + ! +; + +\ Sets the ninth local variable's value +: Local8! ( x - ) + 8 CELLS getBaseAddress + ! +; + +\ Sets the tenth local variable's value +: Local9! ( x - ) + 9 CELLS getBaseAddress + ! +; + +\ Sets the eleventh local variable's value +: Local10! ( x - ) + 10 CELLS getBaseAddress + ! +; + +\ Sets the twelfth local variable's value +: Local11! ( x - ) + 11 CELLS getBaseAddress + ! +; + + +\ **** Calculates the needed amount of memory for local variables **** +0 value variableCount +: calculateNeededMemory ( "char" - n ) + 0 TO variableCount + >in @ \ keep track of where the pointer was + + begin + parse-word + 0= if \ if there is no more text to parse + drop + true + else + dup " ;" comp + 0= if \ if the semicolon is encountered + drop \ drop the duplicated address + false + else + " }" comp + 0= if \ if '}' character is encountered + true \ end loop because '}' marks end of local variables + else + variableCount 1 + TO variableCount + false + then + then + then + until + + >in ! \ reset the pointer + variableCount CELLS +; + + +\ **** allocates the memory for local variables **** +: allocateMemory ( n - addr ) + alloc-mem dup 0= if + drop + cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr + then +; + + + +\ Declares the size of the local variable table +48 CONSTANT localTableSize + +\ Declare the local variable table +localTableSize ARRAY localVariableTable + +\ Keeps track of end of array +0 VALUE arrayCount + +\ gets the number of records in the local variable table +: getLocalRecordCount + arrayCount 4 / +; + +\ Clears the local variable table +: initLocalTable ( - ) + + \ free all the dynamically allocated memory + arrayCount 0 ?do + I 3 + localVariableTable @ ( addr ) + free-mem ( ) + 4 +loop + + 0 localVariableTable localTableSize erase + 0 TO arrayCount +; + +\ Adds a local variable symbol to the local variable table +: addLocal ( addr len order initflag - ) + depth 4 < if + cr ." The stack needs at least 4 values to add a local variable." cr + exit + then + + \ add to the table + arrayCount 0 + localVariableTable ! \ initflag + arrayCount 1 + localVariableTable ! \ order + arrayCount 2 + localVariableTable ! \ len + arrayCount 3 + localVariableTable ! \ addr + + \ allocate memory for the symbol + arrayCount 2 + localVariableTable @ ( length ) + alloc-mem ( memaddr ) + dup ( memaddr memaddr ) + dup ( memaddr memaddr memaddr ) + + \ called only when memaddr = 0 + 0= ( memaddr memaddr flag ) + if + cr ." Failed to allocate memory in addLocal!" cr ( memaddr memaddr ) + then + + \ copy local variable name to a safe location + arrayCount 3 + localVariableTable @ ( memaddr memaddr addr ) + swap ( memaddr addr memaddr ) + arrayCount 2 + localVariableTable @ ( memaddr addr memaddr length ) + move ( memaddr ) + arrayCount 3 + localVariableTable ! ( ) + + \ increment arrayCount + arrayCount 4 + TO arrayCount +; + +\ prints the local variable table +: printLocalTable + + arrayCount 0= if + cr ." No variables loaded" cr + exit + then + + arrayCount 0 ?do + cr ." Variable name: " + I 3 + localVariableTable @ + I 2 + localVariableTable @ + type + + ." Order: " + I 1 + localVariableTable @ . + + ." Init Flag: " + I 0 + localVariableTable @ . + 4 + +loop +; + +\ Finds a local variable symbol in the local variable table +\ Returns its order or -1 on failure +: getOrder ( addr len - order ) + \ if the address and length are missing + depth 2 < if + cr ." Address and length are required on the stack to use getOrder!" cr + -1 throw \ ends execution + then + + arrayCount 0 ?do + over ( addr len addr ) + I 3 + ( addr len addr addrindex ) + localVariableTable @ ( addr len addr addr1 ) + 2 pick ( addr len addr addr1 len ) + + \ check if lengths of two strings are the same length + dup ( addr len addr addr1 len len ) + I 2 + localVariableTable @ ( addr len addr addr1 len len len1) + = ( addr len addr addr1 len flag) + + if \ if lengths are equal + comp ( addr len flag) + 0= ( addr len flag ) + if \ if the symbol is found + 2drop ( ) + I 1 + localVariableTable @ ( order ) + unloop + exit + then + + else \ if the lengths are different + 3drop ( addr len ) + then + + + 4 \ increment the index by 4 + +loop + 2drop ( addr len - ) + -1 \ returns -1 for the order if the symbol is not found +; + + +\ **** read the local variables in the input stream **** +0 VALUE useTopStackValue +0 VALUE index +0 VALUE localVariableMemory + +: readLocalVariables ( "char" - ) + 0 TO index + true TO useTopStackValue + + begin + parse-word ( addr len ) + dup ( addr len len ) + 0> ( addr len flag ) + while ( addr len ) + 2dup ( addr len addr len ) + drop ( addr len addr ) + " }" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ if end of local variables + drop ( addr ) + drop ( ) + exit ( ) + then + + 2dup ( addr len addr len ) + drop ( addr len addr ) + " ;" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ if not using top stack value for local variables + false TO useTopStackValue ( addr len ) + 2drop ( ) + else \ add local variable to table + index useTopStackValue ( addr len order useTopStackValue ) + addLocal ( ) + index 1 + TO index \ increment index + then + + repeat + drop ( addr ) + drop ( ) +; + + +\ FALSE VALUE usingLocals \ not needed because it is in the interpreter.fs file + +\ sets the stack size +1000 CONSTANT maxStackSize + +\ declare the local stack +maxStackSize ARRAY localStack + +\ declare the stack top pointer +0 VALUE localStackTop + +\ Adds to the top of the local stack +: pushLocalStack ( x - L:x ) + localStackTop maxStackSize 1 - > + if + cr ." Local stack overflow!" cr + maxStackSize TO localStackTop \ sets localStackTop back to the max size + then + localStackTop localStack ! ( x - ) + localStackTop 1 + TO localStackTop +; + + +\ Removes the top local stack value and places it into the data stack +: popLocalStack ( L:x - x ) + localStackTop 1 - TO localStackTop + localStackTop 0< if \ if popping too many items + cr ." Local stack underflow!" cr + 0 TO localStackTop \ sets localStackTop back to zero + abort + then + localStackTop localStack @ +; + + +12 CONSTANT localVariableLimit +\ ***** sets up local variables ****** +: { ( "char" - ) + initLocalTable + \ localVariableLimit CELLS ( memorySize ) + calculateNeededMemory ( memorySize ) + allocateMemory ( memorySize - addr ) + TO localVariableMemory ( ) + readLocalVariables ( ) + TRUE TO usingLocals + + \ add code to the current definition + + \ saves the old base address + postpone getBaseAddress + postpone pushLocalStack + + \ sets the base address to this definition's reserved memory + localVariableMemory + postpone literal + postpone setBaseAddress + + \ add code to initialize the variables if needed + 0 arrayCount 4 - ( end start ) + ?do + I 0 + localVariableTable @ ( flag ) \ get the init flag + true ( flag true ) + = ( flag1 ) + if + I 4 / ( variable number ) + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + then + -4 + +loop + +; immediate \ declares this word as a compiler directive + + + +\ sets values for local variables +: -> ( - ) + parse-word ( addr len ) + getOrder ( order ) + dup ( order order ) + -1 = ( order flag ) + + if \ if the symbol isn't found + cr ." Symbol is not a local variable! " cr + drop ( ) + exit + then + + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + +; immediate + + +\ returns the first local variable's value +: Local0@ + 0 CELLS getBaseAddress + @ +; + +\ returns the second local variable's value +: Local1@ + 1 CELLS getBaseAddress + @ +; + +\ returns the third local variable's value +: Local2@ + 2 CELLS getBaseAddress + @ +; + +\ returns the fourth local variable's value +: Local3@ + 3 CELLS getBaseAddress + @ +; + +\ returns the fifth local variable's value +: Local4@ + 4 CELLS getBaseAddress + @ +; + +\ returns the sixth local variable's value +: Local5@ + 5 CELLS getBaseAddress + @ +; + +\ returns the seventh local variable's value +: Local6@ + 6 CELLS getBaseAddress + @ +; + +\ returns the eighth local variable's value +: Local7@ + 7 CELLS getBaseAddress + @ +; + +\ returns the ninth local variable's value +: Local8@ + 8 CELLS getBaseAddress + @ +; + +\ returns the tenth local variable's value +: Local9@ + 9 CELLS getBaseAddress + @ +; + +\ returns the eleventh local variable's value +: Local10@ + 10 CELLS getBaseAddress + @ +; + +\ returns the twelfth local variable's value +: Local11@ + 11 CELLS getBaseAddress + @ +; + + +\ determines if a symbol is a local variable +\ returns true if the symbol is a local variable, false otherwise +: LFIND ( addr len - ) + depth 2 < if \ if the address and length are not on the stack + exit + then + + 2dup ( addr len addr len ) + getOrder ( addr len addr len - addr len n ) + dup ( addr len n - addr len n n ) + -1 = if \ if the symbol isn't a local variable + drop ( addr len n - addr len ) + false ( addr len flag ) + + else \ if the symbol is a local variable + case + 0 of ['] Local0@ , endof + 1 of ['] Local1@ , endof + 2 of ['] Local2@ , endof + 3 of ['] Local3@ , endof + 4 of ['] Local4@ , endof + 5 of ['] Local5@ , endof + 6 of ['] Local6@ , endof + 7 of ['] Local7@ , endof + 8 of ['] Local8@ , endof + 9 of ['] Local9@ , endof + 10 of ['] Local10@ , endof + 11 of ['] Local11@ , endof + + \ default case + 2drop ( addr len - ) + cr ." Could not compile local variable!" cr + TRUE ( addr len flag ) + exit + + endcase + + 2drop ( addr len - ) + ." compiled " \ display this text when entering a local variable symbol + true ( addr len flag ) + then +; + + +\ Redefine colon to clean up after { +: ; + usingLocals TRUE = + if + FALSE TO usingLocals + postpone popLocalStack + postpone setBaseAddress + then + postpone ; +; immediate + +' lfind is mydefer \ makes lfind work in INTERPRET + + -- 1.7.5.4

1 0

[PATCH] Adds local variable support to OpenBIOS.
by Programmingkid 27 Aug '12

27 Aug '12

This is the second patch for adding support to OpenBIOS. This adds the bulk of the local variable code to OpenBIOS. --- forth/util/util.fs | 558 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 558 insertions(+), 0 deletions(-) diff --git a/forth/util/util.fs b/forth/util/util.fs index 6f549bf..f55b0be 100644 --- a/forth/util/util.fs +++ b/forth/util/util.fs @@ -93,3 +93,561 @@ 2dup " tell" is-relay 2drop ; + + + +\ ------------------------------------------------------------------------- +\ Local Variable Support +\ ------------------------------------------------------------------------- + +\ Creates an array variable +: ARRAY ( cellCount - ) + DEPTH 0= IF + CR ." Please specify an array size." CR + EXIT + THEN + + \ Compile-time behavior + CREATE CELL * ALLOT \ creates and initializes the instance + + DOES> + + \ Run-time behavior + DEPTH 2 < IF + CR ." Please specify an index number." CR + drop \ removes the address of the array instance + -1 throw \ stop normal execution after error + THEN + + SWAP CELL * + \ Calculates address to return +; immediate + + +\ Declare the local-base-address VALUE +0 VALUE local-base-address + +\ returns the base address used for the local words +: getBaseAddress ( - addr ) + local-base-address +; + +\ sets the base address used for the local words +: setBaseAddress ( addr - ) + TO local-base-address +; + + +\ Sets the first local variable's value +: Local0! ( x - ) + 0 CELL * getBaseAddress + ! +; + +\ Sets the second local variable's value +: Local1! ( x - ) + 1 CELL * getBaseAddress + ! +; + +\ Sets the third local variable's value +: Local2! ( x - ) + 2 CELL * getBaseAddress + ! +; + +\ Sets the fourth local variable's value +: Local3! ( x - ) + 3 CELL * getBaseAddress + ! +; + +\ Sets the fifth local variable's value +: Local4! ( x - ) + 4 CELL * getBaseAddress + ! +; + +\ Sets the sixth local variable's value +: Local5! ( x - ) + 5 CELL * getBaseAddress + ! +; + +\ Sets the seventh local variable's value +: Local6! ( x - ) + 6 CELL * getBaseAddress + ! +; + +\ Sets the eighth local variable's value +: Local7! ( x - ) + 7 CELL * getBaseAddress + ! +; + +\ Sets the ninth local variable's value +: Local8! ( x - ) + 8 CELL * getBaseAddress + ! +; + +\ Sets the tenth local variable's value +: Local9! ( x - ) + 9 CELL * getBaseAddress + ! +; + +\ Sets the eleventh local variable's value +: Local10! ( x - ) + 10 CELL * getBaseAddress + ! +; + +\ Sets the twelfth local variable's value +: Local11! ( x - ) + 11 CELL * getBaseAddress + ! +; + + +\ **** Calculates the needed amount of memory for local variables **** +0 value variableCount +: calculateNeededMemory ( "char" - n ) + 0 TO variableCount + >in @ \ keep track of where the pointer was + + begin + parse-word + 0= if \ if there is no more text to parse + drop + true + else + dup " ;" comp + 0= if \ if the semicolon is encountered + drop \ drop the duplicated address + false + else + " }" comp + 0= if \ if '}' character is encountered + true \ end loop because '}' marks end of local variables + else + variableCount 1 + TO variableCount + false + then + then + then + until + + >in ! \ reset the pointer + variableCount CELL * +; + + +\ **** allocates the memory for local variables **** +: allocateMemory ( n - addr ) + alloc-mem dup 0= if + drop + cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr + then +; + + + +\ Declares the size of the local variable table +48 CONSTANT localTableSize + +\ Declare the local variable table +localTableSize ARRAY localVariableTable + +\ Keeps track of end of array +0 VALUE arrayCount + +\ gets the number of records in the local variable table +: getLocalRecordCount + arrayCount 4 / +; + +\ Clears the local variable table +: initLocalTable ( - ) + + \ free all the dynamically allocated memory + arrayCount 0 ?do + I 3 + localVariableTable @ ( addr ) + free-mem ( ) + 4 +loop + + 0 localVariableTable localTableSize erase + 0 TO arrayCount +; + +\ Adds a local variable symbol to the local variable table +: addLocal ( addr len order initflag - ) + depth 4 < if + cr ." The stack needs at least 4 values to add a local variable." cr + exit + then + + \ add to the table + arrayCount 0 + localVariableTable ! \ initflag + arrayCount 1 + localVariableTable ! \ order + arrayCount 2 + localVariableTable ! \ len + arrayCount 3 + localVariableTable ! \ addr + + \ allocate memory for the symbol + arrayCount 2 + localVariableTable @ ( length ) + alloc-mem ( memaddr ) + dup ( memaddr memaddr ) + dup ( memaddr memaddr memaddr ) + + \ called only when memaddr = 0 + 0= ( memaddr memaddr flag ) + if + cr ." Failed to allocate memory in addLocal!" cr ( memaddr memaddr ) + then + + \ copy local variable name to a safe location + arrayCount 3 + localVariableTable @ ( memaddr memaddr addr ) + swap ( memaddr addr memaddr ) + arrayCount 2 + localVariableTable @ ( memaddr addr memaddr length ) + move ( memaddr ) + arrayCount 3 + localVariableTable ! ( ) + + \ increment arrayCount + arrayCount 4 + TO arrayCount +; + +\ prints the local variable table +: printLocalTable + + arrayCount 0= if + cr ." No variables loaded" cr + exit + then + + arrayCount 0 ?do + cr ." Variable name: " + I 3 + localVariableTable @ + I 2 + localVariableTable @ + type + + ." Order: " + I 1 + localVariableTable @ . + + ." Init Flag: " + I 0 + localVariableTable @ . + 4 + +loop +; + +\ Finds a local variable symbol in the local variable table +\ Returns its order or -1 on failure +: getOrder ( addr len - order ) + \ if the address and length are missing + depth 2 < if + cr ." Address and length are required on the stack to use getOrder!" cr + -1 throw \ ends execution + then + + arrayCount 0 ?do + over ( addr len addr ) + I 3 + ( addr len addr addrindex ) + localVariableTable @ ( addr len addr addr1 ) + 2 pick ( addr len addr addr1 len ) + + \ check if lengths of two strings are the same length + dup ( addr len addr addr1 len len ) + I 2 + localVariableTable @ ( addr len addr addr1 len len len1) + = ( addr len addr addr1 len flag) + + if \ if lengths are equal + comp ( addr len flag) + 0= ( addr len flag ) + if \ if the symbol is found + 2drop ( ) + I 1 + localVariableTable @ ( order ) + unloop + exit + then + + else \ if the lengths are different + 3drop ( addr len ) + then + + + 4 \ increment the index by 4 + +loop + 2drop ( addr len - ) + -1 \ returns -1 for the order if the symbol is not found +; + + +\ **** read the local variables in the input stream **** +0 VALUE useTopStackValue +0 VALUE index +0 VALUE localVariableMemory + +: readLocalVariables ( "char" - ) + 0 TO index + true TO useTopStackValue + + begin + parse-word ( addr len ) + dup ( addr len len ) + 0> ( addr len flag ) + while ( addr len ) + 2dup ( addr len addr len ) + drop ( addr len addr ) + " }" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ if end of local variables + drop ( addr ) + drop ( ) + exit ( ) + then + + 2dup ( addr len addr len ) + drop ( addr len addr ) + " ;" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ if not using top stack value for local variables + false TO useTopStackValue ( addr len ) + 2drop ( ) + else \ add local variable to table + index useTopStackValue ( addr len order useTopStackValue ) + addLocal ( ) + index 1 + TO index \ increment index + then + + repeat + drop ( addr ) + drop ( ) +; + + +\ FALSE VALUE usingLocals \ not needed because it is in the interpreter.fs file + +\ sets the stack size +1000 CONSTANT maxStackSize + +\ declare the local stack +maxStackSize ARRAY localStack + +\ declare the stack top pointer +0 VALUE localStackTop + +\ Adds to the top of the local stack +: pushLocalStack ( x - L:x ) + localStackTop localStack ! ( x - ) + localStackTop 1 + TO localStackTop + localStackTop maxStackSize = + abort" Local stack overflow!" +; + + +\ Removes the top local stack value and places it into the data stack +: popLocalStack ( L:x - x ) + localStackTop 1 - TO localStackTop + localStackTop localStack @ +; + + +12 CONSTANT localVariableLimit +\ ***** sets up local variables ****** +: { ( "char" - ) + initLocalTable + \ localVariableLimit CELL * ( memorySize ) + calculateNeededMemory ( memorySize ) + allocateMemory ( memorySize - addr ) + TO localVariableMemory ( ) + readLocalVariables ( ) + TRUE TO usingLocals + + \ add code to the current definition + + \ saves the old base address + postpone getBaseAddress + postpone pushLocalStack + + \ sets the base address to this definition's reserved memory + localVariableMemory + postpone literal + postpone setBaseAddress + + \ add code to initialize the variables if needed + 0 arrayCount 4 - ( end start ) + ?do + I 0 + localVariableTable @ ( flag ) \ get the init flag + true ( flag true ) + = ( flag1 ) + if + I 4 / ( variable number ) + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + then + -4 + +loop + +; immediate \ declares this word as a compiler directive + + + +\ sets values for local variables +: -> ( - ) + parse-word ( addr len ) + getOrder ( order ) + dup ( order order ) + -1 = ( order flag ) + + if \ if the symbol isn't found + cr ." Symbol is not a local variable! " cr + drop ( ) + exit + then + + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + +; immediate + + +\ returns the first local variable's value +: Local0@ + CELL 0 * getBaseAddress + @ +; + +\ returns the second local variable's value +: Local1@ + CELL 1 * getBaseAddress + @ +; + +\ returns the third local variable's value +: Local2@ + CELL 2 * getBaseAddress + @ +; + +\ returns the fourth local variable's value +: Local3@ + CELL 3 * getBaseAddress + @ +; + +\ returns the fifth local variable's value +: Local4@ + CELL 4 * getBaseAddress + @ +; + +\ returns the sixth local variable's value +: Local5@ + CELL 5 * getBaseAddress + @ +; + +\ returns the seventh local variable's value +: Local6@ + CELL 6 * getBaseAddress + @ +; + +\ returns the eighth local variable's value +: Local7@ + CELL 7 * getBaseAddress + @ +; + +\ returns the ninth local variable's value +: Local8@ + CELL 8 * getBaseAddress + @ +; + +\ returns the tenth local variable's value +: Local9@ + CELL 9 * getBaseAddress + @ +; + +\ returns the eleventh local variable's value +: Local10@ + CELL 10 * getBaseAddress + @ +; + +\ returns the twelfth local variable's value +: Local11@ + CELL 11 * getBaseAddress + @ +; + + +\ determines if a symbol is a local variable +\ returns true if the symbol is a local variable, false otherwise +: LFIND ( addr len - ) + depth 2 < if \ if the address and length are not on the stack + exit + then + + 2dup ( addr len addr len ) + getOrder ( addr len addr len - addr len n ) + dup ( addr len n - addr len n n ) + -1 = if \ if the symbol isn't a local variable + drop ( addr len n - addr len ) + false ( addr len flag ) + + else \ if the symbol is a local variable + case + 0 of ['] Local0@ , endof + 1 of ['] Local1@ , endof + 2 of ['] Local2@ , endof + 3 of ['] Local3@ , endof + 4 of ['] Local4@ , endof + 5 of ['] Local5@ , endof + 6 of ['] Local6@ , endof + 7 of ['] Local7@ , endof + 8 of ['] Local8@ , endof + 9 of ['] Local9@ , endof + 10 of ['] Local10@ , endof + 11 of ['] Local11@ , endof + + \ default case + 2drop ( addr len - ) + cr ." Could not compile local variable!" cr + TRUE ( addr len flag ) + exit + + endcase + + 2drop ( addr len - ) + ." compiled " \ display this text when entering a local variable symbol + true ( addr len flag ) + then +; + + +\ Redefine colon to clean up after { +: ; + usingLocals TRUE = + if + FALSE TO usingLocals + postpone popLocalStack + postpone setBaseAddress + then + postpone ; +; immediate + +' lfind is mydefer \ makes lfind work in INTERPRET -- 1.7.5.4

2 1

[PATCH] Alters INTERPRET to be able to handle local variables.
by Programmingkid 27 Aug '12

27 Aug '12

I'm new to using git, so if there are any problems with this patch, let me know and I will try to fix it. This patch is the first of two patches for adding local variable support to OpenBIOS. As you may know, local variable support is required to be able to run Mac OS X in QEMU one day. This and the second patch takes us one step closer to that day. --- forth/bootstrap/interpreter.fs | 41 +++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/forth/bootstrap/interpreter.fs b/forth/bootstrap/interpreter.fs index 5187058..486bb03 100644 --- a/forth/bootstrap/interpreter.fs +++ b/forth/bootstrap/interpreter.fs @@ -40,16 +40,10 @@ \ 7.3.9.2.4 Miscellaneous dictionary \ -\ interpreter. This word checks whether the interpreted word -\ is a word in dictionary or a number. It honours compile mode -\ and immediate/compile-only words. -: interpret - 0 >in ! - begin - parse-word dup 0> \ was there a word at all? - while - $find +\ most of the old version of interpret +: oldInterpret + $find if dup flags? 0<> state @ 0= or if execute @@ -70,9 +64,34 @@ depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then - repeat +; + + +Defer mydefer +false VALUE usingLocals + +\ The refactored interpret - supports local variables +: interpret + 0 >in ! + begin + parse-word dup 0> ( addr len flag ) \ was there a word at all? + while ( addr len ) + + usingLocals true = if ( addr len ) \ if local variables are being used + mydefer ( addr len flag ) + not if ( ) \ if symbol is not a local variable + oldInterpret + then + + else \ if not using local variables + oldInterpret + then + + repeat 2drop - ; +; + + : refill ( -- ) ib #ib @ expect 0 >in ! ; -- 1.7.5.4

2 1

Re: [OpenBIOS] C's continue statement in Forth?
by Programmingkid 27 Aug '12

27 Aug '12

On Aug 25, 2012, at 8:19 AM, openbios-request(a)openbios.org wrote: >> I was wondering if there is a way to implement C's continue >> statement in Forth. I have this loop, and some times I only want to >> execute part of it, and then continue on to the next iteration >> without finishing the current iteration. Is there any way of doing >> this in OpenBIOS? > > It certainly can be done. But it sounds like you are making a > word with a very big body; this is not the Forth way. Instead, > factor your words into smaller words, for example, pull the loop > body (the part between WHILE and REPEAT) into a separate word. > It then becomes trivial to do your "continue" (and it will also > be much more readable!) > >> begin >> \ condition >> while >> >> \ conditional code >> if >> CONTINUE \ skip rest of loop >> then >> >> \ rest of loop ... >> >> repeat > > You don't have anything in here that "increases" the condition > (increases some counter, follows a pointer, whatever). Typically > you would have that just before the REPEAT, but your example makes > it seem you have it between the BEGIN and WHILE. So your code is: > > BEGIN cond WHILE smth IF CONTINUE THEN rest REPEAT > > which you can write as > > BEGIN cond WHILE smth 0= IF rest THEN REPEAT > > (and if you do have an "increment" just before the REPEAT, which > you want to run on CONTINUE, you can put it between the THEN and > REPEAT in the modified example). > > But, let's build a CONTINUE like you described, just for fun. > Let's look at the structure words you used: > > BEGIN ( C: -- dest ) > WHILE ( C: dest -- orig dest ) > REPEAT ( C: orig dest -- ) > > You want to use your CONTINUE word between WHILE and REPEAT, and > it should jump back to "dest"; at compile time, it should not drop > the "dest" from the compilation stack. So its stack diagram is > > CONTINUE ( C: orig dest -- orig dest ) > > or just > > CONTINUE ( C: dest -- dest ) > > For doing an unconditional jump back, there is AGAIN, which is > > AGAIN ( C: dest -- ) > > That eats the dest from the compilation stack though, so we want > to duplicate it first, using CS-DUP > > CS-DUP ( C: dest -- dest dest ) > > Not every system has that; just make it from CS-PICK, like so: > > : CS-DUP 0 CS-PICK ; IMMEDIATE > > And then let's do CONTINUE itself: > > : CONTINUE CS-DUP POSTPONE AGAIN ; IMMEDIATE > > Or you might want a ?CONTINUE which does the equivalent of > IF CONTINUE THEN: > > : ?CONTINUE POSTPONE 0= CS-DUP POSTPONE UNTIL ; IMMEDIATE > > > Hope this helps, > > > Segher You are right. My code was a little too long, so refactoring it fixed the problem. I guess I was still programming like a C programmer still. Thanks for the help.

1 0

Re: [OpenBIOS] Local variable support
by Programmingkid 27 Aug '12

27 Aug '12

On Aug 25, 2012, at 8:19 AM, openbios-request(a)openbios.org wrote: > On 22/08/12 02:44, Programmingkid wrote: > >> The following code is for the use of local variables in OpenBIOS. I was >> able to successfully make a word that used local variables. The work >> isn't complete. There is still work to be done with the INTERPRET word. >> The LFIND word has be implemented in the INTERPRET word for local >> variables to be recognized during the compile state. I just need a >> C-like CONTINUE word to go back to the start of a loop to fix all my >> problems with INTERPRET. Maybe someone knows a better way of adding >> LFIND to INTERPRET. >> >> I would appreciate any comments, suggestions, or advice for the >> following code. > > Interesting work! I think that you may have made this a harder problem > that it should be though. > > When I had a quick look at doing something earlier a while back, I > noticed that OpenBIOS already has a concept of multiple dictionaries > with a search order (see dict-list?). My idea for an implementation was > to intercept docol to create a new dictionary at the top of the > function, add it to the head of the search list and then add the values > from the local variable declaration. This is pretty much what happens > when you "cd" to a particular path in the device tree. > > Similarly you can then intercept dosemi from the search list to remove > the dictionary and clear up. The advantage of this approach is that you > can use all the in-built dictionary functions to manage your local > variable words, rather than your current approach which is to > re-implement this functionality yourself. > > > HTH, > > Mark. I did try at one time to do this, but decided to go the route of imitating how x86 assembly uses local variables.

1 0

Location for local variable code
by Programmingkid 25 Aug '12

25 Aug '12

Given the size of the local variable code I made, I think it would be best to place it all in its own file. Would anyone know how to add a file to OpenBIOS?

4 3

Re: [OpenBIOS] [Qemu-ppc] FreeBSD powerpc issue
by Andreas TObler 25 Aug '12

25 Aug '12

On 08/25/12 11:00, Blue Swirl wrote: > On Fri, Aug 24, 2012 at 9:45 PM, Andreas Tobler <andreast(a)fgznet.ch> wrote: >> Hello, >> >> I'm trying to get FreeBSD powerpc running with qemu. >> So far it loads the fbsd loader and the loader loads the kernel. >> The kernel starts booting but it hangs in an endless loop. It tries to print >> out a fatal_trap but it looks like the 'of' doesn't work properly (anymore?) >> at this stage. >> >> I have a remote debugger attached to the kernel and I can see where it >> hangs. But I can not figure out what caused the fatal trap here. >> >> An 'info registers' in qemu shows the srr0=fff025a4, this, as I understand, >> points to of_client_callback from OpenBIOS. (objdump -dS >> openbios-qemu.nostrip gives me this.) >> >> qemu is on 1.1.90, iow, a git snapshot from yesterday with OpenBIOS from >> 19th of aug. >> >> Is there a possibilty to 'debug' the OpenBIOS somehow? > > CCing OpenBIOS list too. > > We have a built-in debugger in OpenBIOS (maybe not well documented). > Then there's DEBUG_CIF in libopenbios/client.c and it should be > possible to add debugging print statements to forth/system/ciface.fs > too. Oh, thank you. I'll take a look when I'm back on the machine. >> I'm not sure whether it is a kernel issue or an OpenBIOS issue. > > The problem could be that there's a MMU fault when the kernel calls > OpenBIOS, maybe because OpenBIOS is no longer mapped (MMU disabled?) > and then the above debugging would not help. Hm, from the FreeBSD kernel code view, I passed several 'of' calls to read the memory regions etc. to map memory. That said, OB is working fine for the start. I'm not sure where it happens, the fault above. It might be when I start to call 'of' again after I have started the MMU on the FreeBSD kernel side. So, to my understanding, you say it might be an MMU fault, that OB is no longer mapped? Who would be the responsible for this mapping, the FreeBSD kernel or OB? Thanks a lot! Andreas

2 1

Re: [OpenBIOS] [Qemu-ppc] FreeBSD powerpc issue
by Andreas Tobler 25 Aug '12

25 Aug '12

On 08/25/12 12:05, Blue Swirl wrote: > On Sat, Aug 25, 2012 at 9:47 AM, Andreas TObler <andreast(a)fgznet.ch> wrote: >> On 08/25/12 11:00, Blue Swirl wrote: >>> >>> On Fri, Aug 24, 2012 at 9:45 PM, Andreas Tobler <andreast(a)fgznet.ch> >>> wrote: >>>> >>>> Hello, >>>> >>>> I'm trying to get FreeBSD powerpc running with qemu. >>>> So far it loads the fbsd loader and the loader loads the kernel. >>>> The kernel starts booting but it hangs in an endless loop. It tries to >>>> print >>>> out a fatal_trap but it looks like the 'of' doesn't work properly >>>> (anymore?) >>>> at this stage. >>>> >>>> I have a remote debugger attached to the kernel and I can see where it >>>> hangs. But I can not figure out what caused the fatal trap here. >>>> >>>> An 'info registers' in qemu shows the srr0=fff025a4, this, as I >>>> understand, >>>> points to of_client_callback from OpenBIOS. (objdump -dS >>>> openbios-qemu.nostrip gives me this.) >>>> >>>> qemu is on 1.1.90, iow, a git snapshot from yesterday with OpenBIOS from >>>> 19th of aug. >>>> >>>> Is there a possibilty to 'debug' the OpenBIOS somehow? >>> >>> >>> CCing OpenBIOS list too. >>> >>> We have a built-in debugger in OpenBIOS (maybe not well documented). >>> Then there's DEBUG_CIF in libopenbios/client.c and it should be >>> possible to add debugging print statements to forth/system/ciface.fs >>> too. >> >> >> Oh, thank you. I'll take a look when I'm back on the machine. >> >> >>>> I'm not sure whether it is a kernel issue or an OpenBIOS issue. >>> >>> >>> The problem could be that there's a MMU fault when the kernel calls >>> OpenBIOS, maybe because OpenBIOS is no longer mapped (MMU disabled?) >>> and then the above debugging would not help. >> >> >> Hm, from the FreeBSD kernel code view, I passed several 'of' calls to read >> the memory regions etc. to map memory. That said, OB is working fine for the >> start. >> I'm not sure where it happens, the fault above. It might be when I start to >> call 'of' again after I have started the MMU on the FreeBSD kernel side. >> >> So, to my understanding, you say it might be an MMU fault, that OB is no >> longer mapped? Who would be the responsible for this mapping, the FreeBSD >> kernel or OB? > > Assuming that SRR0 is the fault address (I'm not so familiar with > PPC), since it's pointing to the low level entry point this could make > sense. Ok. > At least on Sparc, the kernel should save the original MMU mappings > and restore them on point of entry to OpenBIOS. Alternatively, you > could try to arrange the code so that after you take control of MMU, > OpenBIOS is not used anymore. For example, Linux builds an internal > model of the Open Firmware tree and does not use the OF calls for OF > tree lookup after the initial probe. I'd suppose NetBSD and OpenBSD > kernel code could be used for reference since they work on PPC (real > machines at least, I haven't tried on QEMU). This exact code (FreeBSD kernel) is working on real G3/4/5, namely here on an imac G3, on a PowerBook G4 and on several UP and SMP G5s. We use often 'of' calls even after starting the MMU in the kernel on real machines. But it is not said that this code is 100% bullet proof. I try to dive in a bit more and investigate the MMU mappings when entering 'of'. Thanks again! Andreas

1 0

Re: [OpenBIOS] [Qemu-ppc] FreeBSD powerpc issue
by Blue Swirl 25 Aug '12

25 Aug '12

On Fri, Aug 24, 2012 at 9:45 PM, Andreas Tobler <andreast(a)fgznet.ch> wrote: > Hello, > > I'm trying to get FreeBSD powerpc running with qemu. > So far it loads the fbsd loader and the loader loads the kernel. > The kernel starts booting but it hangs in an endless loop. It tries to print > out a fatal_trap but it looks like the 'of' doesn't work properly (anymore?) > at this stage. > > I have a remote debugger attached to the kernel and I can see where it > hangs. But I can not figure out what caused the fatal trap here. > > An 'info registers' in qemu shows the srr0=fff025a4, this, as I understand, > points to of_client_callback from OpenBIOS. (objdump -dS > openbios-qemu.nostrip gives me this.) > > qemu is on 1.1.90, iow, a git snapshot from yesterday with OpenBIOS from > 19th of aug. > > Is there a possibilty to 'debug' the OpenBIOS somehow? CCing OpenBIOS list too. We have a built-in debugger in OpenBIOS (maybe not well documented). Then there's DEBUG_CIF in libopenbios/client.c and it should be possible to add debugging print statements to forth/system/ciface.fs too. > > I'm not sure whether it is a kernel issue or an OpenBIOS issue. The problem could be that there's a MMU fault when the kernel calls OpenBIOS, maybe because OpenBIOS is no longer mapped (MMU disabled?) and then the above debugging would not help. > > Any hint is welcome. > > TIA, > Andreas > > Here some info, it might help... > > telnet localhost 1200 > Trying ::1... > Connected to localhost. > Escape character is '^]'. >>> Configuration device id QEMU version 1 machine id 2 >>> CPUs: 1 >>> Memory: 255M >>> UUID: 00000000-0000-0000-0000-000000000000 >>> CPU type PowerPC,750 > Welcome to OpenBIOS v1.0 built on Aug 19 2012 13:11 > Trying cd:,\\:tbxi... > Consoles: Open Firmware console > > FreeBSD/powerpc Open Firmware loader, Revision 0.1 > (root(a)tcx58.andreas.nets, Sun Aug 19 10:32:07 CEST 2012) > Memory: 261120KB > Booted from: cd > > Loading /boot/defaults/loader.conf > /boot/kernel/kernel text=0xb1ff27 data=0x5ff60+0x1ac7d0 > syms=[0x4+0x8c690+0x4+0xae1e0] > / > Hit [Enter] to boot immediately, or any other key for command prompt. > Booting [/boot/kernel/kernel]... > Kernel entry at 0x100100 ... > KDB: debugger backends: ddb > KDB: current backend: ddb > > > QEMU 1.1.90 monitor - type 'help' for more information > (qemu) info registers > NIP 009463ec LR 009463b0 CTR 0094638c XER 00000000 > MSR 00001032 HID0 00000000 HF 00000000 idx 1 > TB 00000000 1000640182 DECR 3294327117 > GPR00 0000000000000001 0000000000c7ba00 0000000080020400 000000000fd00000 > GPR04 00000000005b5128 000000000094638c 00000000005b5128 0000000000c7bab0 > GPR08 000000000fd00000 0000000000c7bab0 0000000000000000 0000000000c7ba00 > GPR12 000000000de9bba0 0000000000000000 00000000fff30714 00000000fff30ec8 > GPR16 00000000fff2f256 0000000004000000 00000000fffb36cc 00000000fffb3ecc > GPR20 0000000000f68000 0000000000000004 00000000fff2f03f 00000000fff2efbf > GPR24 00000000fff2f047 00000000fffb3630 0000000001c2f3b0 0000000001c325a8 > GPR28 0000000080020002 0000000000805180 00000000f97ff97f 0000000000c7ba00 > CR 40003034 [ G - - - EO - EO G ] RES ffffffff > FPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPSCR 00000000 > SRR0 fff025a4 SRR1 40003030 PVR 00080301 VRSAVE 00000000 > SPRG0 0fd00000 SPRG1 00c7c090 SPRG2 0094e3f0 SPRG3 00000400 > SPRG4 00000000 SPRG5 00000000 SPRG6 00000000 SPRG7 00000000 > SDR1 0100001f > > >

1 0

C's continue statement in Forth?
by Programmingkid 24 Aug '12

24 Aug '12

I was wondering if there is a way to implement C's continue statement in Forth. I have this loop, and some times I only want to execute part of it, and then continue on to the next iteration without finishing the current iteration. Is there any way of doing this in OpenBIOS? Example: begin \ condition while \ conditional code if CONTINUE \ skip rest of loop then \ rest of loop ... repeat My guess to a possible solution would be to manipulate the return stack. Any body have any ideas?

2 1

Re: [OpenBIOS] Building OpenBIOS - OS list
by Programmingkid 21 Aug '12

21 Aug '12

On Aug 13, 2012, at 12:08 PM, openbios-request(a)openbios.org wrote: > Date: Mon, 13 Aug 2012 08:54:10 -0700 (PDT) > From: Kenneth Salerno <kennethsalerno(a)yahoo.com> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Building OpenBIOS - OS list > Message-ID: > <1344873250.64301.YahooMailClassic(a)web110401.mail.gq1.yahoo.com> > Content-Type: text/plain; charset="iso-8859-1" > > Hi, > > > I have a cross-compiler chain on 32-bit Windows XP using Cygwin that I use to build OpenBIOS. > > Attached are my scripts for ppc64/ppc, sparc64/sparc, s390x/s390, x86_64/x86. > > Also attached are two patches for OpenBIOS to build correctly with this Cygwin environment (one is just to set options and point to my cross-compilers but the other more importantly fixes some ldscripts so I can use my 64-bit/32-bit cross-compilers correctly to build the 32-bit OpenBIOS roms instead of linking to the default 64-bit C run-time). > > Ken Thanks for the reply. I'm glad to see other OS's can build OpenBIOS. I just hope Mac OS X will be one of them some day. My knowledge of how OpenBIOS is built is limited, so trying to fix the problem myself would be next to impossible.

3 3

Re: [OpenBIOS] Help with building
by Andreas Färber 21 Aug '12

21 Aug '12

Am 20.08.2012 21:41, schrieb Blue Swirl: > On Sun, Aug 19, 2012 at 10:15 PM, Programmingkid > <programmingkidx(a)gmail.com> wrote: >> When I try to build OpenBIOS, I see this error message: >> >> Building OpenBIOS for x86 >> Building...error: >> GEN target/include/openbios-version.h >> GEN forth/version.fs >> HOSTCC host/kernel/dict.o >> HOSTCC host/kernel/bootstrap.o >> HOSTCC host/kernel/forth.o >> HOSTCC host/kernel/stack.o >> HOSTCC forthstrap >> GEN bootstrap.dict >> panic: segmentation violation at 0x30061c >> dict=0x100300000 here=0x100300628(dict+0x628) pc=0x0(dict+0xffd00000) > > It looks like this is 64 bit host but the x86 target is 32 bits. > Please try amd64 target. The underlying issue then probably is that on Mac OS X it is not properly recognized whether we're building for x86 or x86_64? Andreas >> Here are the details: >> OS: Mac OS 10.6 >> gcc -v: 4.2.1 >> target: unix-x86 -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

1 0

[commit] r1063 - trunk/openbios-devel/arch/ppc/qemu
by repository service 21 Aug '12

21 Aug '12

Author: agraf Date: Tue Aug 21 00:29:42 2012 New Revision: 1063 URL: http://tracker.coreboot.org/trac/openbios/changeset/1063 Log: ppc qemu: Increase PCI hole for heathrow The heathrow machine needs more PCI hole space than we provide. Increase its range by a bit. IIUC this still doesn't reflect the actual hole size, but neither do the Mac99 machines. We should probably compare values with the real hardware again. Signed-off-by: Alexander Graf <agraf(a)suse.de> 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 Sun Aug 19 15:25:31 2012 (r1062) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Tue Aug 21 00:29:42 2012 (r1063) @@ -144,7 +144,7 @@ .cfg_len = 0x7f000000, .host_mem_base = 0x80000000, .pci_mem_base = 0x80000000, - .mem_len = 0x01000000, + .mem_len = 0x10000000, .io_base = 0xfe000000, .io_len = 0x00800000, .rbase = 0xfd000000,

1 0

Help with building
by Programmingkid 20 Aug '12

20 Aug '12

When I try to build OpenBIOS, I see this error message: Building OpenBIOS for x86 Building...error: GEN target/include/openbios-version.h GEN forth/version.fs HOSTCC host/kernel/dict.o HOSTCC host/kernel/bootstrap.o HOSTCC host/kernel/forth.o HOSTCC host/kernel/stack.o HOSTCC forthstrap GEN bootstrap.dict panic: segmentation violation at 0x30061c dict=0x100300000 here=0x100300628(dict+0x628) pc=0x0(dict+0xffd00000) dstackcnt=0 rstackcnt=0 instruction=deadbeef dstack: 0x0 rstack: 0x0 Writing dictionary core file make[1]: *** [bootstrap.dict] Error 1 make: *** [build] Error 1 Anyone know where the building fails? Here are the details: OS: Mac OS 10.6 gcc -v: 4.2.1 target: unix-x86

2 1

[PATCH] fix ppc builds with ppc64 compiler and ppc64 linker
by Kenneth Salerno 19 Aug '12

19 Aug '12

Need to specify ppc object code output arch (gcc/as -m32) and 32-bit C run-time (ldscript arch) when using ppc64 compiler and linker. Signed-of-by: Kenneth Salerno <kennethsalerno(a)yahoo.com> --- a/config/scripts/switch-arch 2012-08-14 10:33:34.859375000 -0400 +++ b/config/scripts/switch-arch 2012-08-14 10:34:45.375000000 -0400 @@ -232,11 +232,12 @@ ppc) select_prefix powerpc if [ "$unix" = "no" ]; then - CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + CFLAGS="-m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" + AS_FLAGS="-m32" else CFLAGS="-fno-builtin" + AS_FLAGS= fi - AS_FLAGS= ;; ppc64) --- a/arch/ppc/qemu/ldscript 2012-08-14 10:30:42.046875000 -0400 +++ b/arch/ppc/qemu/ldscript 2012-08-14 10:30:20.218750000 -0400 @@ -1,5 +1,5 @@ OUTPUT_FORMAT(elf32-powerpc) -OUTPUT_ARCH(powerpc) +OUTPUT_ARCH(powerpc:common) /* Initial load address */

2 1

[commit] r1062 - in trunk/openbios-devel: arch/ppc/qemu config/scripts
by repository service 19 Aug '12

19 Aug '12

Author: blueswirl Date: Sun Aug 19 15:25:31 2012 New Revision: 1062 URL: http://tracker.coreboot.org/trac/openbios/changeset/1062 Log: fix ppc builds with ppc64 compiler and ppc64 linker Need to specify ppc object code output arch (gcc/as -m32) and 32-bit C run-time (ldscript arch) when using ppc64 compiler and linker. Signed-of-by: Kenneth Salerno <kennethsalerno(a)yahoo.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ldscript trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/arch/ppc/qemu/ldscript ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ldscript Sat Jun 9 19:05:32 2012 (r1061) +++ trunk/openbios-devel/arch/ppc/qemu/ldscript Sun Aug 19 15:25:31 2012 (r1062) @@ -1,5 +1,5 @@ OUTPUT_FORMAT(elf32-powerpc) -OUTPUT_ARCH(powerpc) +OUTPUT_ARCH(powerpc:common) /* Initial load address */ Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Jun 9 19:05:32 2012 (r1061) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Aug 19 15:25:31 2012 (r1062) @@ -232,11 +232,12 @@ ppc) select_prefix powerpc if [ "$unix" = "no" ]; then - CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + CFLAGS="-m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" + AS_FLAGS="-m32" else CFLAGS="-fno-builtin" + AS_FLAGS= fi - AS_FLAGS= ;; ppc64)

1 0

Segmentation fault
by Programmingkid 16 Aug '12

16 Aug '12

Why does just typing "see comp" cause a segmentation fault? Here are the details: Welcome to OpenBIOS v1.0 built on Aug 12 2012 20:51 Type 'help' for detailed information [unix] Booting default not supported. Trying disk... No valid state has been set by load or init-program 0 > see comp : comp >r 0 -rot r> bounds (?do) panic: segmentation violation at 56 dict=0xb7e50008 here=0xb7e66eec(dict+0x16ee4) pc=0xb7e52ee4(dict+0x2edc) dstackcnt=3 rstackcnt=26 instruction=b7e502ec I am using the target unix if that helps.

2 1

Re: [OpenBIOS] Building OpenBIOS - OS list
by Kenneth Salerno 13 Aug '12

13 Aug '12

Hi, I have a cross-compiler chain on 32-bit Windows XP using Cygwin that I use to build OpenBIOS. Attached are my scripts for ppc64/ppc, sparc64/sparc, s390x/s390, x86_64/x86. Also attached are two patches for OpenBIOS to build correctly with this Cygwin environment (one is just to set options and point to my cross-compilers but the other more importantly fixes some ldscripts so I can use my 64-bit/32-bit cross-compilers correctly to build the 32-bit OpenBIOS roms instead of linking to the default 64-bit C run-time). Ken --- On Mon, 8/13/12, Programmingkid <programmingkidx(a)gmail.com> wrote: From: Programmingkid <programmingkidx(a)gmail.com> Subject: [OpenBIOS] Building OpenBIOS - OS list To: openbios(a)openbios.org Date: Monday, August 13, 2012, 10:48 AM Has OpenBIOS been successfully built on anything that isn't Linux? I was wondering if anyone has been able to build it on Mac OS X, Windows, or any thing else that isn't Linux. -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

2 1

Building OpenBIOS - OS list
by Programmingkid 13 Aug '12

13 Aug '12

Has OpenBIOS been successfully built on anything that isn't Linux? I was wondering if anyone has been able to build it on Mac OS X, Windows, or any thing else that isn't Linux.

2 1

Re: [OpenBIOS] Bug in file unix.c
by Programmingkid 13 Aug '12

13 Aug '12

On Aug 13, 2012, at 12:08 PM, openbios-request(a)openbios.org wrote: > Message: 1 > Date: Sun, 05 Aug 2012 17:20:49 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Bug in file unix.c > Message-ID: <501EE3B1.6090407(a)tarl.net> > Content-Type: text/plain; charset=windows-1252; format=flowed > > On 2012-Aug-5 15:36 , Programmingkid wrote: >> I was trying to build openbios on Ubuntu 10.10 when I received this error message: >> >> CC target/arch/unix/unix.o >> cc1: warnings being treated as errors >> ../arch/unix/unix.c: In function ?read_from_disk?: >> ../arch/unix/unix.c:382: error: ignoring return value of ?read?, declared with attribute warn_unused_result >> make[1]: *** [target/arch/unix/unix.o] Error 1 >> make[1]: Leaving directory `/home/user/Desktop/openbios-devel/obj-x86' >> make: *** [build-verbose] Error 1 >> >> This is the command I used to build openbios: >> ./config/scripts/switch-arch unix-x86 > > That looks like your version of the C compiler has the ultra-pedantic > errors turned on. > > Ignoring the return value for a function that returns one is (or at > least used to be) legal C. Some recent compilers have decided to make it > a fatal error. The fix is to place (void) in front of the particular > invocation, to signal that yes, you know it returns a value, you've > thought about it carefully, and you don't give a crap what the value is, > and you still want to call this function without paying attention to the > return value. > > As you may have gathered, I'm not a fan of this particular error check. > It ends up cluttering code with lots of irrelevant casting. Since I > regard casting as an indication of code weakness, adding piles of > irrelevant casts (in my opinion) makes the code weaker - because it's > harder to focus on the areas which actually are weak. Still, this issue should be fixed. It does sound easy to fix and would make things a lot easier for anyone else who needed to build OpenBIOS on Ubuntu.

1 0

Bug in file unix.c
by Programmingkid 05 Aug '12

05 Aug '12

I was trying to build openbios on Ubuntu 10.10 when I received this error message: CC target/arch/unix/unix.o cc1: warnings being treated as errors ../arch/unix/unix.c: In function ‘read_from_disk’: ../arch/unix/unix.c:382: error: ignoring return value of ‘read’, declared with attribute warn_unused_result make[1]: *** [target/arch/unix/unix.o] Error 1 make[1]: Leaving directory `/home/user/Desktop/openbios-devel/obj-x86' make: *** [build-verbose] Error 1 This is the command I used to build openbios: ./config/scripts/switch-arch unix-x86

2 1

Me email as requested.
by Bode 04 Aug '12

04 Aug '12

pardon my shorthand if any, this message is sent using my mobile device.

1 0

Search word
by Programmingkid 16 Jul '12

16 Jul '12

What is the word used to search for a string inside another string? I tried using 'Search', but that isn't included with openbios.

3 2

fileprint
by Michail Maksimov 20 Jun '12

20 Jun '12

i not found file viewer suggest: : sourceprint source type cr ['] interpret >data token@ >r interpret_save is interpret exit? if 777 throw then r> is interpret ; : fileprint ( adr len -- ) ['] interpret >data token@ to interpret_save ['] sourceprint is interpret ['] included catch interpret_save is interpret dup 777 = if drop 0 then throw ; : fp ( "name" -- ) safe-parse-word fileprint ; --

2 1

Support to Athom E6xx processor
by Paulo Roberto Faria de Almeida Luz 14 Jun '12

14 Jun '12

Hi, I´m considering the possibility of using OpenFirmware in our processor module. Is there a list of supported processors ? We are using Intel® AtomTM Processor E680T ! Krds, Paulo Roberto F. de A. Luz Technology Engineer - Embedded Platform paulo.luz(a)padtec.com.br luz,paulo +55 19 2104-0426 9191 1402 http://www.padtec.com.br

3 5

Re: [OpenBIOS] [PATCH] Identify virtio-net devices
by Blue Swirl 09 Jun '12

09 Jun '12

Thanks, applied. On Sat, May 19, 2012 at 1:35 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > Identify virtio network device in PCI probe. > > Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> > --- > drivers/pci_database.c | 8 ++++++++ > include/drivers/pci.h | 1 + > 2 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/drivers/pci_database.c b/drivers/pci_database.c > index 1d2958c..197f27e 100644 > --- a/drivers/pci_database.c > +++ b/drivers/pci_database.c > @@ -129,6 +129,14 @@ static const pci_dev_t eth_devices[] = { > NULL, "ethernet", > }, > { > + /* Virtio-network controller */ > + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_NET, > + NULL, "virtio-net", NULL, > + "pci1af4,1000\0pci1af4,1000\0pciclass,020000\0", > + 0, 0, 0, > + virtio_config_cb, NULL, > + }, > + { > 0xFFFF, 0xFFFF, > NULL, NULL, NULL, NULL, > -1, -1, -1, > diff --git a/include/drivers/pci.h b/include/drivers/pci.h > index 4c996c0..d3b290a 100644 > --- a/include/drivers/pci.h > +++ b/include/drivers/pci.h > @@ -206,6 +206,7 @@ extern const pci_arch_t *arch; > #define PCI_DEVICE_ID_QEMU_VGA 0x1111 > > #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 > +#define PCI_DEVICE_ID_VIRTIO_NET 0x1000 > #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 > > #define PCI_VENDOR_ID_INTEL 0x8086 > -- > 1.7.1 >

1 0

[commit] r1061 - in trunk/openbios-devel: drivers include/drivers
by repository service 09 Jun '12

09 Jun '12

Author: blueswirl Date: Sat Jun 9 19:05:32 2012 New Revision: 1061 URL: http://tracker.coreboot.org/trac/openbios/changeset/1061 Log: Identify virtio-net devices Identify virtio network device in PCI probe. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/include/drivers/pci.h Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun May 20 18:07:35 2012 (r1060) +++ trunk/openbios-devel/drivers/pci_database.c Sat Jun 9 19:05:32 2012 (r1061) @@ -129,6 +129,14 @@ NULL, "ethernet", }, { + /* Virtio-network controller */ + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_NET, + NULL, "virtio-net", NULL, + "pci1af4,1000\0pci1af4,1000\0pciclass,020000\0", + 0, 0, 0, + virtio_config_cb, NULL, + }, + { 0xFFFF, 0xFFFF, NULL, NULL, NULL, NULL, -1, -1, -1, Modified: trunk/openbios-devel/include/drivers/pci.h ============================================================================== --- trunk/openbios-devel/include/drivers/pci.h Sun May 20 18:07:35 2012 (r1060) +++ trunk/openbios-devel/include/drivers/pci.h Sat Jun 9 19:05:32 2012 (r1061) @@ -206,6 +206,7 @@ #define PCI_DEVICE_ID_QEMU_VGA 0x1111 #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 +#define PCI_DEVICE_ID_VIRTIO_NET 0x1000 #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 #define PCI_VENDOR_ID_INTEL 0x8086

1 0

Re: [OpenBIOS] Compiling Openbios with Sparc cross compiler [Solved]
by P. Wilhelm 09 Jun '12

09 Jun '12

Ok. I finally got things running. To get OpenBIOS to compile, I had to go back to an older Linux system. I installed Ubuntu Lucid (10.04). This has gcc-4.4.3 for the host compiler. I was able to get OpenBIOS to compile with gcc-4.7.0 for sparc-elf, but it just hangs with no text output to the terminal. I downgraded to gcc-4.6.3 and things work great again. By the way, the openbios-sparc32 that is part of the git HEAD for qemu does not work for me either (same hang as noted above). I suspect some kind of library clash. Thanks for your help along the way! Respectfully, Paul.

1 0

Dynamic memory allocation
by Programmingkid 08 Jun '12

08 Jun '12

What word can be used in OpenBIOS to dynamically allocate memory? I have tried ALLOCATE, but that word doesn't exist in the dictionary.

3 2

Re: [OpenBIOS] Compiling Openbios with Sparc cross compiler
by Paul Wilhelm 06 Jun '12

06 Jun '12

What I found looks to be a difference between libc6-dev packages on the lucid version of ubunutu and libc6-dev on the oneiric version of ubuntu. Is there specific c library I should be using for the host compile? Or should I go to an older version of gcc? It is 4.4 on lucid and 4.6 on oneiric. Respectfully, Paul On Wed, Jun 6, 2012 at 11:23 AM, Paul Wilhelm <bearcat.pilot(a)gmail.com>wrote: > On the machine that does compile, the following file is used: > /usr/include/bits/sigcontext.h > This file has a copyright of 2002 from FSF. > This file does not try to use __u32, etc, and does not include other files > that do. > > On the machine that fails to compile, the following file is used: > /usr/include/i386-linux-gnu/bits/sigcontext.h > This file has a copyright of 1998 from FSF. This includes asm/sigcontext.h > which in turn includes linux/types.h before using __u32, etc. linux/types.h > includes asm/types.h (which in other other circumstance would include other > files that include the definition for __u32, etc.). With the asm/types.h in > target/include, things get broken. > > I did some googling to find out how the /usr/include/bits directory gets > filled, what package might set that up, but, I did not find anything useful. > > Any suggestions? > >

1 0

Re: [OpenBIOS] Dynamic memory allocation
by Programmingkid 06 Jun '12

06 Jun '12

On Jun 4, 2012, at 7:53 PM, openbios-request(a)openbios.org wrote: > On 2012-Jun-3 18:48 , Programmingkid wrote: >> What word can be used in OpenBIOS to dynamically allocate memory? I have tried ALLOCATE, but that word doesn't exist in the dictionary. > > Alloc-mem is the one I'm most likely to use, unless I need dma-able > memory, in whch case dma-alloc will be defined by the io nexus. > > There's also always "," to allocate from the heap, depending on how much > you need and where. I couldn't find any documentation on alloc-mem, but I think this is how it works. It pops the top number on the stack and tries to allocate that amount of memory. If it succeeds it returns the address of the memory. If it fails, it returns 0. I think I would release the memory using free-mem. Does this sound about right?

3 2

Re: [OpenBIOS] Compiling Openbios with Sparc cross compiler
by Andreas Färber 06 Jun '12

06 Jun '12

Am 05.06.2012 01:15, schrieb Paul Wilhelm: > Thanks for your kind help / suggestions. > > Here is a more verbose version of the compile error output. > > paul@linux-jkcx:~/src/openbios-devel> env V=1 make build-verbose > Building... > make[1]: Entering directory `/home/paul/src/openbios-devel/obj-sparc32' > true > true > gcc -O2 -g -DFCOMPILER -DBOOTSTRAP -DSWAP_ENDIANNESS > -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -Wall -Wredundant-decls -Wshadow > -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wundef > -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes > -Wnested-externs -W -MMD -MP -MT host/kernel/dict.o -MF > 'host/kernel/dict.d' -I../include -I../kernel -I../kernel/include > -I./target/include -c -o host/kernel/dict.o ../kernel/dict.c > gcc -O2 -g -DFCOMPILER -DBOOTSTRAP -DSWAP_ENDIANNESS > -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -Wall -Wredundant-decls -Wshadow > -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wundef > -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes > -Wnested-externs -W -MMD -MP -MT host/kernel/bootstrap.o -MF > 'host/kernel/bootstrap.d' -I../include -I../kernel -I../kernel/include > -I./target/include -c -o host/kernel/bootstrap.o ../kernel/bootstrap.c Now that's a problem with the host compilation environment, it says gcc, not sparc-elf-gcc. > In file included from /usr/include/asm/sigcontext.h:5:0, > from /usr/include/bits/sigcontext.h:28, > from /usr/include/signal.h:339, > from ../kernel/bootstrap.c:13: > /usr/include/linux/types.h:27:1: error: unknown type name ‘__u16’ > /usr/include/linux/types.h:28:1: error: unknown type name ‘__u16’ > /usr/include/linux/types.h:29:1: error: unknown type name ‘__u32’ > /usr/include/linux/types.h:30:1: error: unknown type name ‘__u32’ > /usr/include/linux/types.h:31:1: error: unknown type name ‘__u64’ > /usr/include/linux/types.h:32:1: error: unknown type name ‘__u64’ > /usr/include/linux/types.h:34:1: error: unknown type name ‘__u16’ > /usr/include/linux/types.h:35:1: error: unknown type name ‘__u32’ > In file included from /usr/include/bits/sigcontext.h:28:0, > from /usr/include/signal.h:339, > from ../kernel/bootstrap.c:13: > /usr/include/asm/sigcontext.h:24:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:25:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:28:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:33:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:38:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:191:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:192:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:193:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:198:2: error: unknown type name ‘__u32’ > make[1]: *** [host/kernel/bootstrap.o] Error 1 > make[1]: Leaving directory `/home/paul/src/openbios-devel/obj-sparc32' > make: *** [build-verbose] Error 1 On my system those typedefs are in /usr/include/asm-generic/int-ll64.h. Could some package be missing? Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

3 2

Re: [OpenBIOS] Compiling Openbios with Sparc cross compiler
by Dave Simonson 05 Jun '12

05 Jun '12

These types are defined in either asm/types.h or sys/types.h, depending on your compiler, if you want to use these instead of the C99 standard, portable, fixed length type values defined in stdint.h. These values are the uint8_t set. Dave On 6/4/2012 6:15 PM, Paul Wilhelm wrote: > Thanks for your kind help / suggestions. > > Here is a more verbose version of the compile error output. > > paul@linux-jkcx:~/src/openbios-devel> env V=1 make build-verbose > Building... > make[1]: Entering directory `/home/paul/src/openbios-devel/obj-sparc32' > true > true > gcc -O2 -g -DFCOMPILER -DBOOTSTRAP -DSWAP_ENDIANNESS > -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -Wall -Wredundant-decls > -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations > -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings > -Wmissing-prototypes -Wnested-externs -W -MMD -MP -MT > host/kernel/dict.o -MF 'host/kernel/dict.d' -I../include -I../kernel > -I../kernel/include -I./target/include -c -o host/kernel/dict.o > ../kernel/dict.c > gcc -O2 -g -DFCOMPILER -DBOOTSTRAP -DSWAP_ENDIANNESS > -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -Wall -Wredundant-decls > -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations > -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings > -Wmissing-prototypes -Wnested-externs -W -MMD -MP -MT > host/kernel/bootstrap.o -MF 'host/kernel/bootstrap.d' -I../include > -I../kernel -I../kernel/include -I./target/include -c -o > host/kernel/bootstrap.o ../kernel/bootstrap.c > In file included from /usr/include/asm/sigcontext.h:5:0, > from /usr/include/bits/sigcontext.h:28, > from /usr/include/signal.h:339, > from ../kernel/bootstrap.c:13: > /usr/include/linux/types.h:27:1: error: unknown type name '__u16' > /usr/include/linux/types.h:28:1: error: unknown type name '__u16' > /usr/include/linux/types.h:29:1: error: unknown type name '__u32' > /usr/include/linux/types.h:30:1: error: unknown type name '__u32' > /usr/include/linux/types.h:31:1: error: unknown type name '__u64' > /usr/include/linux/types.h:32:1: error: unknown type name '__u64' > /usr/include/linux/types.h:34:1: error: unknown type name '__u16' > /usr/include/linux/types.h:35:1: error: unknown type name '__u32' > In file included from /usr/include/bits/sigcontext.h:28:0, > from /usr/include/signal.h:339, > from ../kernel/bootstrap.c:13: > /usr/include/asm/sigcontext.h:24:2: error: unknown type name '__u32' > /usr/include/asm/sigcontext.h:25:2: error: unknown type name '__u32' > /usr/include/asm/sigcontext.h:28:2: error: unknown type name '__u64' > /usr/include/asm/sigcontext.h:33:2: error: unknown type name '__u32' > /usr/include/asm/sigcontext.h:38:2: error: unknown type name '__u32' > /usr/include/asm/sigcontext.h:191:2: error: unknown type name '__u64' > /usr/include/asm/sigcontext.h:192:2: error: unknown type name '__u64' > /usr/include/asm/sigcontext.h:193:2: error: unknown type name '__u64' > /usr/include/asm/sigcontext.h:198:2: error: unknown type name '__u32' > make[1]: *** [host/kernel/bootstrap.o] Error 1 > make[1]: Leaving directory `/home/paul/src/openbios-devel/obj-sparc32' > make: *** [build-verbose] Error 1 > > >

1 0

Re: [OpenBIOS] Compiling Openbios with Sparc cross compiler
by Nathan Kunkee 05 Jun '12

05 Jun '12

On 06/ 2/12 09:09 PM, Paul Wilhelm wrote: > I tried installing openSUSE 12.1 from scratch (since that is working for > Andreas). I grabbed all tools except binutils and gcc from SUSE > packages. I used the configure scripts you kindly provided, Andreas, for > binutils and for gcc. I get the same error with openSUSE as I did with > Arch. Have I overlooked an environment variable that needs to be set? I > am just using fresh install stuff with no special environment set by me. > > Here is the error output and the gcc -v output. > > paul@linux-jkcx:~/src/openbios-devel> make > Building OpenBIOS for sparc32 > Building...error: > /usr/include/linux/types.h:35:1: error: unknown type name ‘__u32’ > In file included from /usr/include/bits/sigcontext.h:28:0, > from /usr/include/signal.h:339, > from ../kernel/bootstrap.c:13: > /usr/include/asm/sigcontext.h:24:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:25:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:28:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:33:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:38:2: error: unknown type name ‘__u32’ > /usr/include/asm/sigcontext.h:191:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:192:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:193:2: error: unknown type name ‘__u64’ > /usr/include/asm/sigcontext.h:198:2: error: unknown type name ‘__u32’ > make[1]: *** [host/kernel/bootstrap.o] Error 1 > make[1]: Leaving directory `/home/paul/src/openbios-devel/obj-sparc32' > make: *** [build] Error 1 The Makefiles wrap the commands in macros for readability. They look for V=1 to show the actual commands being used. To see what else is being included on the command line, what do you get when running env V=1 make ? HTH, -Nathan

2 1

Re: [OpenBIOS] Compiling Openbios with Sparc cross compiler
by Paul Wilhelm 03 Jun '12

03 Jun '12

I tried installing openSUSE 12.1 from scratch (since that is working for Andreas). I grabbed all tools except binutils and gcc from SUSE packages. I used the configure scripts you kindly provided, Andreas, for binutils and for gcc. I get the same error with openSUSE as I did with Arch. Have I overlooked an environment variable that needs to be set? I am just using fresh install stuff with no special environment set by me. Here is the error output and the gcc -v output. paul@linux-jkcx:~/src/openbios-devel> make Building OpenBIOS for sparc32 Building...error: /usr/include/linux/types.h:35:1: error: unknown type name ‘__u32’ In file included from /usr/include/bits/sigcontext.h:28:0, from /usr/include/signal.h:339, from ../kernel/bootstrap.c:13: /usr/include/asm/sigcontext.h:24:2: error: unknown type name ‘__u32’ /usr/include/asm/sigcontext.h:25:2: error: unknown type name ‘__u32’ /usr/include/asm/sigcontext.h:28:2: error: unknown type name ‘__u64’ /usr/include/asm/sigcontext.h:33:2: error: unknown type name ‘__u32’ /usr/include/asm/sigcontext.h:38:2: error: unknown type name ‘__u32’ /usr/include/asm/sigcontext.h:191:2: error: unknown type name ‘__u64’ /usr/include/asm/sigcontext.h:192:2: error: unknown type name ‘__u64’ /usr/include/asm/sigcontext.h:193:2: error: unknown type name ‘__u64’ /usr/include/asm/sigcontext.h:198:2: error: unknown type name ‘__u32’ make[1]: *** [host/kernel/bootstrap.o] Error 1 make[1]: Leaving directory `/home/paul/src/openbios-devel/obj-sparc32' make: *** [build] Error 1 paul@linux-jkcx:~/src/openbios-devel> gcc -v Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/usr/lib/gcc/i586-suse-linux/4.6/lto-wrapper Target: i586-suse-linux Configured with: ../configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man --libdir=/usr/lib --libexecdir=/usr/lib --enable-languages=c,c++,objc,fortran,obj-c++,java,ada --enable-checking=release --with-gxx-include-dir=/usr/include/c++/4.6 --enable-ssp --disable-libssp --disable-plugin --with-bugurl= http://bugs.opensuse.org/ --with-pkgversion='SUSE Linux' --disable-libgcj --disable-libmudflap --with-slibdir=/lib --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-allocator=new --disable-libstdcxx-pch --enable-version-specific-runtime-libs --program-suffix=-4.6 --enable-linux-futex --without-system-libunwind --with-arch-32=i586 --with-tune=generic --build=i586-suse-linux Thread model: posix gcc version 4.6.2 (SUSE Linux) paul@linux-jkcx:~/src/openbios-devel> sparc-elf-gcc -v Using built-in specs. COLLECT_GCC=sparc-elf-gcc COLLECT_LTO_WRAPPER=/usr/local/lib/gcc/sparc-elf/4.7.0/lto-wrapper Target: sparc-elf Configured with: ../gcc-4.7.0/configure --prefix=/usr/local --target=sparc-elf --disable-nls --enable-languages=c --disable-libssp Thread model: single gcc version 4.7.0 (GCC) I also tried the configure you gave shortly ago, Blue, for gcc and get the same error. Respectfully, Paul. On Sat, Jun 2, 2012 at 3:50 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Fri, Jun 1, 2012 at 12:48 AM, P. Wilhelm <bearcat.pilot(a)gmail.com> > wrote: > > I've tried to set up a new machine to compile Openbios for Sparc32. The > > machine is x86. OS is Arch Linux. I got all tools from the Arch packages > > except binutils (2.22) and gcc (4.7.0) source. > > > > I used configuration parameters for sparc-elf-gcc as given by Blue last > year > > on this group. But, I keep running into a compile error for the bootstrap > > that says that __u32 is not defined (also __u64). > > This should not happen, please post the complete error message. > Probably some recent code expects system headers to provide __u32 > which is nonstandard. > > I'm using these: > $ sparc-elf-gcc -v > Using built-in specs. > COLLECT_GCC=sparc-elf-gcc > COLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/sparc-elf/4.7.0/lto-wrapper > Target: sparc-elf > Configured with: ../configure --target=sparc-elf > --enable-targets=sparc-elf --disable-nls --disable-threads > --enable-languages=c --disable-shared --disable-libssp > --disable-multilib > Thread model: single > gcc version 4.7.0 (GCC) > $ sparc64-elf-gcc -v > Using built-in specs. > COLLECT_GCC=sparc64-elf-gcc > COLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/sparc64-elf/4.6.0/lto-wrapper > Target: sparc64-elf > Configured with: ../configure --target=sparc64-elf > --enable-targets=sparc64-elf --disable-nls --disable-threads > --enable-languages=c --disable-shared --disable-libssp > --enable-multilib > Thread model: single > gcc version 4.6.0 20100925 (experimental) (GCC) > $ powerpc-elf-gcc-4.6.0 -v > Using built-in specs. > COLLECT_GCC=powerpc-elf-gcc-4.6.0 > COLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/powerpc-elf/4.6.0/lto-wrapper > Target: powerpc-elf > Configured with: ../configure --target=powerpc-elf > --enable-targets=powerpc-elf --disable-nls --disable-threads > --enable-languages=c --disable-shared --disable-libssp > --disable-multilib > Thread model: single > gcc version 4.6.0 20100925 (experimental) (GCC) > $ powerpc64-linux-gcc-4.6.0 -v > Using built-in specs. > COLLECT_GCC=powerpc64-linux-gcc-4.6.0 > > COLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/powerpc64-linux/4.6.0/lto-wrapper > Target: powerpc64-linux > Configured with: ../configure --target=powerpc64-linux > --enable-targets=powerpc64-linux --disable-nls --disable-threads > --enable-languages=c --disable-shared --disable-libssp > --disable-multilib --disable-decimal-float > Thread model: single > gcc version 4.6.0 20100925 (experimental) (GCC) > > I think GCC 4.7.0 miscompiles OpenBIOS for PPC, or rather more > probably our libgcc does not match theirs. > > > > > Web searches point to a similar issue about a year ago with ppc, but > nothing > > recent or related to Sparc32. Any pointers to what I might be doing wrong > > are appreciated. > > > > The x86 gcc is the generic Arch gcc that comes with the base system. > > > > > > Respectfully, > > Paul W. > > > > -- > > OpenBIOS http://openbios.org/ > > Mailinglist: http://lists.openbios.org/mailman/listinfo > > Free your System - May the Forth be with you > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 0

Compiling Openbios with Sparc cross compiler
by P. Wilhelm 02 Jun '12

02 Jun '12

I've tried to set up a new machine to compile Openbios for Sparc32. The machine is x86. OS is Arch Linux. I got all tools from the Arch packages except binutils (2.22) and gcc (4.7.0) source. I used configuration parameters for sparc-elf-gcc as given by Blue last year on this group. But, I keep running into a compile error for the bootstrap that says that __u32 is not defined (also __u64). Web searches point to a similar issue about a year ago with ppc, but nothing recent or related to Sparc32. Any pointers to what I might be doing wrong are appreciated. The x86 gcc is the generic Arch gcc that comes with the base system. Respectfully, Paul W.

3 2

Re: [OpenBIOS] [PATCH] Sparc32: avoid problems with SMP table
by Andreas Färber 29 May '12

29 May '12

Am 06.05.2012 20:45, schrieb Blue Swirl: > Check CPU ID if we're running on boot CPU. If so, > don't use SMP table information since it may contain > uninitialized or garbage values. > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > --- > arch/sparc32/entry.S | 11 +++++++++++ > 1 file changed, 11 insertions(+) I've still not got around to testing this on ppc yet, but on x86_64 valgrind was happy. sparc64 seems to have a similar problem though according to valgrind: ==22736== Thread 3: ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x2C8050: compute_all_sub (cc_helper.c:37) ==22736== by 0x2C84A8: helper_compute_psr (cc_helper.c:470) ==22736== by 0x9769447: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x2C7F92: compute_all_sub_xcc (cc_helper.c:60) ==22736== by 0x2C84C2: helper_compute_psr (cc_helper.c:473) ==22736== by 0x9769447: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x2C8050: compute_all_sub (cc_helper.c:37) ==22736== by 0x2C84A8: helper_compute_psr (cc_helper.c:470) ==22736== by 0x97C39BC: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x2C7F92: compute_all_sub_xcc (cc_helper.c:60) ==22736== by 0x2C84C2: helper_compute_psr (cc_helper.c:473) ==22736== by 0x97C39BC: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x2C83AF: compute_all_logic (cc_helper.c:37) ==22736== by 0x2C84A8: helper_compute_psr (cc_helper.c:470) ==22736== by 0x97C3A67: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x2C8441: compute_all_logic_xcc (cc_helper.c:60) ==22736== by 0x2C84C2: helper_compute_psr (cc_helper.c:473) ==22736== by 0x97C3A67: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== ==22736== Conditional jump or move depends on uninitialised value(s) ==22736== at 0x977207F: ??? ==22736== Uninitialised value was created by a heap allocation ==22736== at 0x4C27CE8: memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x4C27D97: posix_memalign (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==22736== by 0x256061: qemu_memalign (oslib-posix.c:93) ==22736== by 0x256109: qemu_vmalloc (oslib-posix.c:126) ==22736== by 0x2D1EF6: qemu_ram_alloc_from_ptr (exec.c:2664) ==22736== by 0x2F5FF6: memory_region_init_ram (memory.c:954) ==22736== by 0x303EFD: ram_init1 (sun4u.c:711) ==22736== by 0x268E1E: qdev_init (qdev.c:151) ==22736== by 0x268F5C: qdev_init_nofail (qdev.c:258) ==22736== by 0x304620: sun4uv_init (sun4u.c:729) ==22736== by 0x304F1F: sun4u_init (sun4u.c:932) ==22736== by 0x1846D8: main (vl.c:3519) ==22736== Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

1 0

Re: [OpenBIOS] [PATCH] Identify virtio-net devices
by Artyom Tarasenko 28 May '12

28 May '12

Ping? Can anyone apply this before the 1.1 release of QEMU? On 5/19/12, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > Identify virtio network device in PCI probe. > > Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> > --- > drivers/pci_database.c | 8 ++++++++ > include/drivers/pci.h | 1 + > 2 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/drivers/pci_database.c b/drivers/pci_database.c > index 1d2958c..197f27e 100644 > --- a/drivers/pci_database.c > +++ b/drivers/pci_database.c > @@ -129,6 +129,14 @@ static const pci_dev_t eth_devices[] = { > NULL, "ethernet", > }, > { > + /* Virtio-network controller */ > + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_NET, > + NULL, "virtio-net", NULL, > + "pci1af4,1000\0pci1af4,1000\0pciclass,020000\0", > + 0, 0, 0, > + virtio_config_cb, NULL, > + }, > + { > 0xFFFF, 0xFFFF, > NULL, NULL, NULL, NULL, > -1, -1, -1, > diff --git a/include/drivers/pci.h b/include/drivers/pci.h > index 4c996c0..d3b290a 100644 > --- a/include/drivers/pci.h > +++ b/include/drivers/pci.h > @@ -206,6 +206,7 @@ extern const pci_arch_t *arch; > #define PCI_DEVICE_ID_QEMU_VGA 0x1111 > > #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 > +#define PCI_DEVICE_ID_VIRTIO_NET 0x1000 > #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 > > #define PCI_VENDOR_ID_INTEL 0x8086 > -- > 1.7.1 > > -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] adding eepom node to sparc64
by Artyom Tarasenko 22 May '12

22 May '12

On Mon, May 21, 2012 at 7:10 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Sun, May 20, 2012 at 10:23 PM, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk> wrote: >> On 19/05/12 18:21, Blue Swirl wrote: >> >>> On Sat, May 19, 2012 at 4:38 PM, Artyom Tarasenko<atar4qemu(a)gmail.com> >>> wrote: >>>> >>>> Both Linux and MilaX complain about the missing eeprom / rtc-m48t59 node. >>>> Since QEMU actually has this device I tried to add it, but not sure >>>> where is it located. >> >> >> Oooh this will be interesting as Milax currently fails when it fails to >> detect this device - fixing it should get Solaris to boot further. This has >> also been on my list for a while, but so much to do, not enough time... >> >> >>>> In sun4u.c it's initialized like this: >>>> >>>> nvram = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); >>>> >>>> Is 0x74 the offset to the ISA bus? Then it's wired not as on Ultra-5: >>>> >>>> Node 0xf00662d8 >>>> address: fffba000 >>>> reg: 00000014.00000000.00002000 >>>> model: 'mk48t59' >>>> name: 'eeprom' >>>> >>>> Here it looks like it had to be aligned to a beginning of a page, >>>> which makes sense because of the large size... >>>> So, where QEMU's 0x74 are coming from? >>> >>> >>> It's the I/O port used by PPC. Looking at the reg, it should be using >>> MMIO at address 0 instead. >> >> >> FWIW I've just had a discussion on qemu-devel and the outcome was that the >> <device>_init() functions are generally just shortcuts to the most common >> "wiring" of the peripherals into a machine. So I suspect you'll need to copy >> the _init() function as sun4_m48t59_init() and customise as required. > > We're now using m48t59_init_isa(), we could instead use m48t59_init() > with zero ports. But this would create a SysBusDevice behind Ebus > which is behind PCI, so PCI BAR changes would not propagate. Yes, I rather thought about adding the mem_base parameter to the m48t59_init_isa() function, similar to m48t59_init() . -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] adding eepom node to sparc64
by Mark Cave-Ayland 21 May '12

21 May '12

On 19/05/12 18:21, Blue Swirl wrote: > On Sat, May 19, 2012 at 4:38 PM, Artyom Tarasenko<atar4qemu(a)gmail.com> wrote: >> Both Linux and MilaX complain about the missing eeprom / rtc-m48t59 node. >> Since QEMU actually has this device I tried to add it, but not sure >> where is it located. Oooh this will be interesting as Milax currently fails when it fails to detect this device - fixing it should get Solaris to boot further. This has also been on my list for a while, but so much to do, not enough time... >> In sun4u.c it's initialized like this: >> >> nvram = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); >> >> Is 0x74 the offset to the ISA bus? Then it's wired not as on Ultra-5: >> >> Node 0xf00662d8 >> address: fffba000 >> reg: 00000014.00000000.00002000 >> model: 'mk48t59' >> name: 'eeprom' >> >> Here it looks like it had to be aligned to a beginning of a page, >> which makes sense because of the large size... >> So, where QEMU's 0x74 are coming from? > > It's the I/O port used by PPC. Looking at the reg, it should be using > MMIO at address 0 instead. FWIW I've just had a discussion on qemu-devel and the outcome was that the <device>_init() functions are generally just shortcuts to the most common "wiring" of the peripherals into a machine. So I suspect you'll need to copy the _init() function as sun4_m48t59_init() and customise as required. HTH, Mark.

2 1

[PATCH] Replace 'Qemu' by 'QEMU'
by Stefan Weil 20 May '12

20 May '12

The official product name is written 'QEMU'. Signed-off-by: Stefan Weil <sw(a)weilnetz.de> --- arch/ppc/qemu/start.S | 2 +- arch/ppc/qemu/tree.fs | 2 +- arch/sparc32/ldscript | 2 +- arch/sparc64/ldscript | 2 +- drivers/pci_database.c | 2 +- drivers/sbus.c | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index aa582e2..77ced18 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -701,7 +701,7 @@ _GLOBAL(flush_icache_range): isync blr - /* Get RAM size from Qemu configuration device */ + /* Get RAM size from QEMU configuration device */ #define CFG_ADDR 0xf0000510 #define FW_CFG_RAM_SIZE 0x03 diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index e4115ea..1b9c293 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -1,4 +1,4 @@ -\ Qemu specific initialization code +\ QEMU specific initialization code \ \ This program is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License diff --git a/arch/sparc32/ldscript b/arch/sparc32/ldscript index 32c9445..b543c15 100644 --- a/arch/sparc32/ldscript +++ b/arch/sparc32/ldscript @@ -1,7 +1,7 @@ OUTPUT_FORMAT(elf32-sparc) OUTPUT_ARCH(sparc) -/* Qemu ELF loader can't handle very complex files, so we put ELFBoot +/* QEMU ELF loader can't handle very complex files, so we put ELFBoot info to rodata and put initctx to data.*/ ENTRY(trap_table) diff --git a/arch/sparc64/ldscript b/arch/sparc64/ldscript index 11167c0..d62ab78 100644 --- a/arch/sparc64/ldscript +++ b/arch/sparc64/ldscript @@ -1,7 +1,7 @@ OUTPUT_FORMAT(elf64-sparc) OUTPUT_ARCH(sparc:v9) -/* Qemu ELF loader can't handle very complex files, so we put ELFBoot +/* QEMU ELF loader can't handle very complex files, so we put ELFBoot info to rodata and put initctx to data.*/ ENTRY(trap_table) diff --git a/drivers/pci_database.c b/drivers/pci_database.c index ac47621..0983da3 100644 --- a/drivers/pci_database.c +++ b/drivers/pci_database.c @@ -176,7 +176,7 @@ static const pci_dev_t vga_devices[] = { }, { PCI_VENDOR_ID_QEMU, PCI_DEVICE_ID_QEMU_VGA, - NULL, "QEMU,VGA", "Qemu VGA", "VGA\0", + NULL, "QEMU,VGA", "QEMU VGA", "VGA\0", 0, 0, 0, NULL, NULL, }, diff --git a/drivers/sbus.c b/drivers/sbus.c index 1107c1d..3708a5e 100644 --- a/drivers/sbus.c +++ b/drivers/sbus.c @@ -429,7 +429,7 @@ ob_macio_init(unsigned int slot, uint64_t base, unsigned long offset) static void sbus_probe_slot_ss5(unsigned int slot, uint64_t base) { - // OpenBIOS and Qemu don't know how to do Sbus probing + // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 3: // SUNW,tcx ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); @@ -451,7 +451,7 @@ sbus_probe_slot_ss5(unsigned int slot, uint64_t base) static void sbus_probe_slot_ss10(unsigned int slot, uint64_t base) { - // OpenBIOS and Qemu don't know how to do Sbus probing + // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); @@ -469,7 +469,7 @@ sbus_probe_slot_ss10(unsigned int slot, uint64_t base) static void sbus_probe_slot_ss600mp(unsigned int slot, uint64_t base) { - // OpenBIOS and Qemu don't know how to do Sbus probing + // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); -- 1.7.9

2 2

[commit] r1060 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers
by repository service 20 May '12

20 May '12

Author: afaerber Date: Sun May 20 18:07:35 2012 New Revision: 1060 URL: http://tracker.coreboot.org/trac/openbios/changeset/1060 Log: Replace 'Qemu' by 'QEMU' The official product name is written 'QEMU'. Signed-off-by: Stefan Weil <sw(a)weilnetz.de> Signed-off-by: Andreas Färber <afaerber(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/arch/ppc/qemu/tree.fs trunk/openbios-devel/arch/sparc32/ldscript trunk/openbios-devel/arch/sparc64/ldscript trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat May 19 12:38:26 2012 (r1059) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sun May 20 18:07:35 2012 (r1060) @@ -701,7 +701,7 @@ isync blr - /* Get RAM size from Qemu configuration device */ + /* Get RAM size from QEMU configuration device */ #define CFG_ADDR 0xf0000510 #define FW_CFG_RAM_SIZE 0x03 Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat May 19 12:38:26 2012 (r1059) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Sun May 20 18:07:35 2012 (r1060) @@ -1,4 +1,4 @@ -\ Qemu specific initialization code +\ QEMU specific initialization code \ \ This program is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License Modified: trunk/openbios-devel/arch/sparc32/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc32/ldscript Sat May 19 12:38:26 2012 (r1059) +++ trunk/openbios-devel/arch/sparc32/ldscript Sun May 20 18:07:35 2012 (r1060) @@ -1,7 +1,7 @@ OUTPUT_FORMAT(elf32-sparc) OUTPUT_ARCH(sparc) -/* Qemu ELF loader can't handle very complex files, so we put ELFBoot +/* QEMU ELF loader can't handle very complex files, so we put ELFBoot info to rodata and put initctx to data.*/ ENTRY(trap_table) Modified: trunk/openbios-devel/arch/sparc64/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc64/ldscript Sat May 19 12:38:26 2012 (r1059) +++ trunk/openbios-devel/arch/sparc64/ldscript Sun May 20 18:07:35 2012 (r1060) @@ -1,7 +1,7 @@ OUTPUT_FORMAT(elf64-sparc) OUTPUT_ARCH(sparc:v9) -/* Qemu ELF loader can't handle very complex files, so we put ELFBoot +/* QEMU ELF loader can't handle very complex files, so we put ELFBoot info to rodata and put initctx to data.*/ ENTRY(trap_table) Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat May 19 12:38:26 2012 (r1059) +++ trunk/openbios-devel/drivers/sbus.c Sun May 20 18:07:35 2012 (r1060) @@ -429,7 +429,7 @@ static void sbus_probe_slot_ss5(unsigned int slot, uint64_t base) { - // OpenBIOS and Qemu don't know how to do Sbus probing + // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 3: // SUNW,tcx ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); @@ -451,7 +451,7 @@ static void sbus_probe_slot_ss10(unsigned int slot, uint64_t base) { - // OpenBIOS and Qemu don't know how to do Sbus probing + // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); @@ -469,7 +469,7 @@ static void sbus_probe_slot_ss600mp(unsigned int slot, uint64_t base) { - // OpenBIOS and Qemu don't know how to do Sbus probing + // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx");

1 0

Re: [OpenBIOS] adding eepom node to sparc64
by Blue Swirl 19 May '12

19 May '12

On Sat, May 19, 2012 at 4:38 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > Both Linux and MilaX complain about the missing eeprom / rtc-m48t59 node. > Since QEMU actually has this device I tried to add it, but not sure > where is it located. > In sun4u.c it's initialized like this: > > nvram = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); > > Is 0x74 the offset to the ISA bus? Then it's wired not as on Ultra-5: > > Node 0xf00662d8 > address: fffba000 > reg: 00000014.00000000.00002000 > model: 'mk48t59' > name: 'eeprom' > > Here it looks like it had to be aligned to a beginning of a page, > which makes sense because of the large size... > So, where QEMU's 0x74 are coming from? It's the I/O port used by PPC. Looking at the reg, it should be using MMIO at address 0 instead. > > -- > Regards, > Artyom Tarasenko > > solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

adding eepom node to sparc64
by Artyom Tarasenko 19 May '12

19 May '12

Both Linux and MilaX complain about the missing eeprom / rtc-m48t59 node. Since QEMU actually has this device I tried to add it, but not sure where is it located. In sun4u.c it's initialized like this: nvram = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); Is 0x74 the offset to the ISA bus? Then it's wired not as on Ultra-5: Node 0xf00662d8 address: fffba000 reg: 00000014.00000000.00002000 model: 'mk48t59' name: 'eeprom' Here it looks like it had to be aligned to a beginning of a page, which makes sense because of the large size... So, where QEMU's 0x74 are coming from? -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

[PATCH] Identify virtio-net devices
by Artyom Tarasenko 19 May '12

19 May '12

Identify virtio network device in PCI probe. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> --- drivers/pci_database.c | 8 ++++++++ include/drivers/pci.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/pci_database.c b/drivers/pci_database.c index 1d2958c..197f27e 100644 --- a/drivers/pci_database.c +++ b/drivers/pci_database.c @@ -129,6 +129,14 @@ static const pci_dev_t eth_devices[] = { NULL, "ethernet", }, { + /* Virtio-network controller */ + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_NET, + NULL, "virtio-net", NULL, + "pci1af4,1000\0pci1af4,1000\0pciclass,020000\0", + 0, 0, 0, + virtio_config_cb, NULL, + }, + { 0xFFFF, 0xFFFF, NULL, NULL, NULL, NULL, -1, -1, -1, diff --git a/include/drivers/pci.h b/include/drivers/pci.h index 4c996c0..d3b290a 100644 --- a/include/drivers/pci.h +++ b/include/drivers/pci.h @@ -206,6 +206,7 @@ extern const pci_arch_t *arch; #define PCI_DEVICE_ID_QEMU_VGA 0x1111 #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 +#define PCI_DEVICE_ID_VIRTIO_NET 0x1000 #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 #define PCI_VENDOR_ID_INTEL 0x8086 -- 1.7.1

1 0

[commit] r1059 - trunk/openbios-devel/drivers
by repository service 19 May '12

19 May '12

Author: blueswirl Date: Sat May 19 12:38:26 2012 New Revision: 1059 URL: http://tracker.coreboot.org/trac/openbios/changeset/1059 Log: Sparc64: fix interrupt properties Add interrupt-map and interrupt-mask properties to host and ebus bridges and sprinkle interrupt properties to various devices. Based on hacks by Artyom Tarasenko. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/pci_database.h Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sat May 19 12:38:24 2012 (r1058) +++ trunk/openbios-devel/drivers/ide.c Sat May 19 12:38:26 2012 (r1059) @@ -1432,6 +1432,8 @@ props[0]=14; props[1]=0; set_property(dnode, "interrupts", (char *)&props, 2*sizeof(props[0])); +#elif defined(CONFIG_SPARC64) + set_int_property(get_cur_dev(), "interrupts", 0); #endif props[0] = __cpu_to_be32(chan->io_regs[0]); Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sat May 19 12:38:24 2012 (r1058) +++ trunk/openbios-devel/drivers/pc_serial.c Sat May 19 12:38:26 2012 (r1059) @@ -190,6 +190,9 @@ fword("encode+"); push_str("reg"); fword("property"); +#if defined(CONFIG_SPARC64) + set_int_property(get_cur_dev(), "interrupts", 1); +#endif aliases = find_dev("/aliases"); set_property(aliases, "ttya", nodebuff, strlen(nodebuff) + 1); Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sat May 19 12:38:24 2012 (r1058) +++ trunk/openbios-devel/drivers/pci.c Sat May 19 12:38:26 2012 (r1059) @@ -401,6 +401,21 @@ props[PCI_INT_MAP_PCI_INT] = 0x7; set_property(dev, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); +#elif defined(CONFIG_SPARC64) + phandle_t dev = get_cur_dev(); + uint32_t props[5]; + + props[0] = 0x000001fe; + props[1] = 0x020003f8; + props[2] = 1; + props[3] = find_dev("/"); + props[4] = 0x2b; + set_property(dev, "interrupt-map", (char *)props, 5 * sizeof(props[0])); + + props[0] = 0x000001ff; + props[1] = 0xffffffff; + props[2] = 3; + set_property(dev, "interrupt-map-mask", (char *)props, 3 * sizeof(props[0])); #endif } @@ -522,6 +537,14 @@ return 0; } +int virtio_config_cb(const pci_config_t *config) +{ +#if defined(CONFIG_SPARC64) + set_int_property(get_cur_dev(), "interrupts", 0); +#endif + return 0; +} + int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, @@ -756,6 +779,21 @@ int ebus_config_cb(const pci_config_t *config) { #ifdef CONFIG_DRIVER_EBUS + phandle_t dev = get_cur_dev(); + uint32_t props[5]; + + props[0] = 0x000001fe; + props[1] = 0x020003f8; + props[2] = 1; + props[3] = find_dev("/"); + props[4] = 0x2b; + set_property(dev, "interrupt-map", (char *)props, 5 * sizeof(props[0])); + + props[0] = 0x000001ff; + props[1] = 0xffffffff; + props[2] = 3; + set_property(dev, "interrupt-map-mask", (char *)props, 3 * sizeof(props[0])); + #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init(config->path, "fdthree", 0x3f0ULL, 0); #endif Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sat May 19 12:38:24 2012 (r1058) +++ trunk/openbios-devel/drivers/pci_database.c Sat May 19 12:38:26 2012 (r1059) @@ -52,7 +52,7 @@ NULL, "virtio-scsi", NULL, "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0", 0, 0, 0, - NULL, NULL, + virtio_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: trunk/openbios-devel/drivers/pci_database.h ============================================================================== --- trunk/openbios-devel/drivers/pci_database.h Sat May 19 12:38:24 2012 (r1058) +++ trunk/openbios-devel/drivers/pci_database.h Sat May 19 12:38:26 2012 (r1059) @@ -28,6 +28,7 @@ const void *private; }; +extern int virtio_config_cb(const pci_config_t *config); extern int ide_config_cb2(const pci_config_t *config); extern int eth_config_cb(const pci_config_t *config); extern int macio_heathrow_config_cb(const pci_config_t *config);

1 0

[commit] r1058 - in trunk/openbios-devel: drivers include/drivers
by repository service 19 May '12

19 May '12

Author: blueswirl Date: Sat May 19 12:38:24 2012 New Revision: 1058 URL: http://tracker.coreboot.org/trac/openbios/changeset/1058 Log: pci: identify virtio-scsi devices Identify virtio SCSI device in PCI probe. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/include/drivers/pci.h Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sat May 12 13:43:57 2012 (r1057) +++ trunk/openbios-devel/drivers/pci_database.c Sat May 19 12:38:24 2012 (r1058) @@ -45,6 +45,23 @@ }, }; +static const pci_dev_t scsi_devices[] = { + { + /* Virtio-block controller */ + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_BLOCK, + NULL, "virtio-scsi", NULL, + "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0", + 0, 0, 0, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + static const pci_dev_t ide_devices[] = { { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, /* CMD646 IDE controller */ @@ -64,7 +81,7 @@ static const pci_subclass_t mass_subclass[] = { { PCI_SUBCLASS_STORAGE_SCSI, "SCSI bus controller", - NULL, NULL, NULL, + "scsi", scsi_devices, NULL, NULL, NULL, }, { Modified: trunk/openbios-devel/include/drivers/pci.h ============================================================================== --- trunk/openbios-devel/include/drivers/pci.h Sat May 12 13:43:57 2012 (r1057) +++ trunk/openbios-devel/include/drivers/pci.h Sat May 19 12:38:24 2012 (r1058) @@ -205,6 +205,9 @@ #define PCI_VENDOR_ID_QEMU 0x1234 #define PCI_DEVICE_ID_QEMU_VGA 0x1111 +#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 +#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 + #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_82441 0x1237

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Tarl Neustaedter 18 May '12

18 May '12

On 2012-May-13 03:08 , Artyom Tarasenko wrote: > Yes, this is how it's wired in qemu too. But I meant the OBP level. > What worries me is that this construction seems to be never used in > sun4u OBP: > > $ grep interrupts linux/kernel/git/davem/prtconfs/* | grep -c 00000001 > 402 > $ grep interrupts linux/kernel/git/davem/prtconfs/* | grep -c 00000000 > 2 > > And the both hits are sun4v: > > $ grep interrupts ~/openbios/linux/kernel/git/davem/prtconfs/* | grep 00000000 > linux/kernel/git/davem/prtconfs/t1000: interrupts: 00000000 > linux/kernel/git/davem/prtconfs/t2000_1: interrupts: 00000000 > > Can it be, that 0 is (or used to be) some magic constant? I'll check on monday and get back to you.

2 1

Adding to a definition
by Programmingkid 17 May '12

17 May '12

Is there a way to add words to the end of a definition? If my word is declared like this: : myword firstWord secondWord ; is there a way to append a word to the end of this word so it looks like this: : myword firstWord secondWord thirdWord ;

4 6

Re: [OpenBIOS] fdthree
by Blue Swirl 15 May '12

15 May '12

On Tue, May 15, 2012 at 4:44 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > On Mon, May 14, 2012 at 10:22 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> On Mon, May 14, 2012 at 4:26 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >>> Since none of the current Linux/sparc64 distributions has virtio >>> drivers out of the box, it were nice to give the user ability to load >>> them from a removable media. >>> Currently Linux doesn't recognize our fdthree drive. The reason is >>> simple - in OpenBIOS >>> >>> 0 > cd /pci/ebus/fdthree ok >>> 0 > .properties >>> name "fdthree" >>> reg 00000000 00000000 00000000 >>> >>> in ultra5's prtconf this property looks like this: >>> >>> reg: 00000014.003023f0.00000008.00000014.00706000.00000010.00000014.00720000.00000004 >>> >>> The meaning of the first triple is clear - these are the fdc control >>> registers. But what are the two other register sets? >>> >>> It looks like qemu has a normal PC floppy, connected to EBus. Probably >>> it's not what Sun used to call fdthree? >>> If fdthree is really something else, were there any UltraSPARC >>> machines with PC floppy drives? >> >> I think the FDC was pretty standard 82077. The additional registers >> could implement a DMA controller. > > It seems that in qemu the DMA controller sits on ISA, not on fdc? And > that we don't have it in EBus? > But I guess dma.c could be used directly as-is? I'd expect the DMA controller (if the registers are DMA) to be more like other Sparc DMA controllers, not 8237. > >> At least OpenBSD only seems to use >> the 82077 registers: >> http://fxr.watson.org/fxr/source/arch/sparc64/dev/fd.c?v=OPENBSD >> > -- > Regards, > Artyom Tarasenko > > solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 0

Re: [OpenBIOS] fdthree
by Artyom Tarasenko 15 May '12

15 May '12

On Mon, May 14, 2012 at 10:22 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Mon, May 14, 2012 at 4:26 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >> Since none of the current Linux/sparc64 distributions has virtio >> drivers out of the box, it were nice to give the user ability to load >> them from a removable media. >> Currently Linux doesn't recognize our fdthree drive. The reason is >> simple - in OpenBIOS >> >> 0 > cd /pci/ebus/fdthree ok >> 0 > .properties >> name "fdthree" >> reg 00000000 00000000 00000000 >> >> in ultra5's prtconf this property looks like this: >> >> reg: 00000014.003023f0.00000008.00000014.00706000.00000010.00000014.00720000.00000004 >> >> The meaning of the first triple is clear - these are the fdc control >> registers. But what are the two other register sets? >> >> It looks like qemu has a normal PC floppy, connected to EBus. Probably >> it's not what Sun used to call fdthree? >> If fdthree is really something else, were there any UltraSPARC >> machines with PC floppy drives? > > I think the FDC was pretty standard 82077. The additional registers > could implement a DMA controller. It seems that in qemu the DMA controller sits on ISA, not on fdc? And that we don't have it in EBus? But I guess dma.c could be used directly as-is? > At least OpenBSD only seems to use > the 82077 registers: > http://fxr.watson.org/fxr/source/arch/sparc64/dev/fd.c?v=OPENBSD > -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Solaris 8 on Sparc32 - Broken by 1056 changes
by P. Wilhelm 15 May '12

15 May '12

This past Friday I tried the 1056 version of sparc32 OpenBIOS and found that Solaris 8 hangs during the OS initialization (during the second period when the spinning line (-, \, |, /, -) occurs). The last version of OpenBIOS I had been using was 1047 which seemed to work Ok. So, I incrementally checked versions 1048-1056. The boot works on all but 1056, so it looks like something with the memory changes in 1055 broke the Solaris 8 boot. I am booting from a virtual hard disk upon which I had previously installed Solaris 8 using Qemu (installed from Solaris 8 install CDs). Let me know if you need any specific information about Qemu arguments. Respectfully, Paul

1 0

Re: [OpenBIOS] fdthree
by Blue Swirl 14 May '12

14 May '12

On Mon, May 14, 2012 at 4:26 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > Since none of the current Linux/sparc64 distributions has virtio > drivers out of the box, it were nice to give the user ability to load > them from a removable media. > Currently Linux doesn't recognize our fdthree drive. The reason is > simple - in OpenBIOS > > 0 > cd /pci/ebus/fdthree ok > 0 > .properties > name "fdthree" > reg 00000000 00000000 00000000 > > in ultra5's prtconf this property looks like this: > > reg: 00000014.003023f0.00000008.00000014.00706000.00000010.00000014.00720000.00000004 > > The meaning of the first triple is clear - these are the fdc control > registers. But what are the two other register sets? > > It looks like qemu has a normal PC floppy, connected to EBus. Probably > it's not what Sun used to call fdthree? > If fdthree is really something else, were there any UltraSPARC > machines with PC floppy drives? I think the FDC was pretty standard 82077. The additional registers could implement a DMA controller. At least OpenBSD only seems to use the 82077 registers: http://fxr.watson.org/fxr/source/arch/sparc64/dev/fd.c?v=OPENBSD > > -- > Regards, > Artyom Tarasenko > > solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 0

Re: [OpenBIOS] [PATCH] pci: fix BAR setup
by Mark Cave-Ayland 14 May '12

14 May '12

On 14/05/12 14:28, Artyom Tarasenko wrote: >>> It's to avoid VGA legacy mapping at 0xa0000. If I change >>> hwdefs.pci.pci_mem_base in arch/sparc64/openbios.c to 0, OpenBIOS will >>> crash during VGA init. Previously this worked because the PCI devices >>> were mapped somewhat randomly and by chance, VGA legacy low mem area >>> was avoided. >>> >>> I think the correct fix is to make QEMU VGA device disable the legacy >>> mapping unless explicitly enabled. Alternatively the child base >>> arithmetic could be fixed in OpenBIOS like proposed by Jakub. >> >> >> Did a patch ever come out of this discussion in the end? >> > > No. :-) Feel free to fix it, unless Blue prefers fixing it himself... I'm not sure I'm confident enough with PCI to do this, and I'm also not sure what Blue's recommended fix actually is? Is it to increase parent_base by 0x1000 or set child_base to zero? ATB, Mark.

2 1

fdthree
by Artyom Tarasenko 14 May '12

14 May '12

Since none of the current Linux/sparc64 distributions has virtio drivers out of the box, it were nice to give the user ability to load them from a removable media. Currently Linux doesn't recognize our fdthree drive. The reason is simple - in OpenBIOS 0 > cd /pci/ebus/fdthree ok 0 > .properties name "fdthree" reg 00000000 00000000 00000000 in ultra5's prtconf this property looks like this: reg: 00000014.003023f0.00000008.00000014.00706000.00000010.00000014.00720000.00000004 The meaning of the first triple is clear - these are the fdc control registers. But what are the two other register sets? It looks like qemu has a normal PC floppy, connected to EBus. Probably it's not what Sun used to call fdthree? If fdthree is really something else, were there any UltraSPARC machines with PC floppy drives? -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH] pci: fix BAR setup
by Mark Cave-Ayland 14 May '12

14 May '12

On 12/05/12 10:11, Blue Swirl wrote: >> Agreed. On current SPARC, the only non-zero Range on PCI is for 64-bit >> memory. For the memory ranges we see: >> >> 0200.0000 0000.0000 0000.0000 8000.8090 0000.0000 0000.0007 0000.0000 >> 0300.0000 0000.0001 0000.0000 8000.8091 0000.0000 0000.0007 0000.0000 >> >> My recollection is that memory space PCI RA (real address rather than >> physical address, because now we're behind a hypervisor) ranges from >> 8000.8090.0000.0000 through 8000.8097.FFFF.FFFF - which would match your >> guess that the parent_base needs to be hacked if 0800.0000 is going to be >> the BAR and is going to represent 1ff.0800.0000. >> >> So, why does OpenBios have 0100.0000 as a child base in the first place? > > It's to avoid VGA legacy mapping at 0xa0000. If I change > hwdefs.pci.pci_mem_base in arch/sparc64/openbios.c to 0, OpenBIOS will > crash during VGA init. Previously this worked because the PCI devices > were mapped somewhat randomly and by chance, VGA legacy low mem area > was avoided. > > I think the correct fix is to make QEMU VGA device disable the legacy > mapping unless explicitly enabled. Alternatively the child base > arithmetic could be fixed in OpenBIOS like proposed by Jakub. Did a patch ever come out of this discussion in the end? ATB, Mark.

2 1

Oops: 1056 breaks Solaris 8 on Sparc 32 Qemu
by P. Wilhelm 13 May '12

13 May '12

Friday I tried the 1056 version of sparc32 openbios and found that Solaris 8 hangs during the OS initialization (during the second period when the spinning line (-, \, |, /, -) occurs). The last version of openbios I had been using was 1047 which seemed to work Ok. So, I incrementally checked versions 1048-1056. The boot works on all but 1056, so it looks like something with the memory changes in 1055 broke the Solaris 8 boot. Let me know if you need any specific information about Qemu arguments. Respectfully, Paul

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Jakub Jermar 13 May '12

13 May '12

On 05/13/2012 12:00 AM, Artyom Tarasenko wrote: > On Sat, May 12, 2012 at 7:06 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >> On Sat, May 12, 2012 at 6:29 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >>> On Sat, May 12, 2012 at 3:57 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >>>> On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >>>>> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >>>>> support for virtio-block and interrupt nodes. >>>>> >>>>> With these patches and QEMU HEAD, Linux can boot like Artyom describes in >>>>> http://tyom.blogspot.de/2012_05_01_archive.html >>>>> but without any manual OpenBIOS setup. >>>> >>>> My test kernel - 3.3.2 - still needs the ebus interrupt mapping properties: >>>> >>>> cd /pci@1fe,0/ebus >>>> 000001fe encode-int 020003f8 encode-int encode+ 1 encode-int encode+ >>>> ffe29140 encode-int encode+ 2b encode-int encode+ " interrupt-map" property >>>> 000001ff encode-int ffffffff encode-int encode+ 00000003 encode-int encode+ >>>> " interrupt-map-mask" property >>>> device-end >>>> boot >>> >>> Updated patch attached. This change seems to help the serial driver. >> >> Looks good. The result seems to be identical with my hack, but there >> is one point I'd like to discuss: >> >> cd /pci@1fe,0/pci-ata ok >> .properties >> name "pci-ata" >> [...] >> interrupts 0 >> >> I'm not sure that this is a valid value for the interrupts property. > > Tarl, Jakub, can you comment whether 0 is allowed? According to the UltraSPARC IIi User's Manual, section 19.3.3, INO 0 (again, relative to the parent node mapping), would be INTA# on bus 0 and INO 1 would be INTB#. Jakub

2 1

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Artyom Tarasenko 13 May '12

13 May '12

On Sat, May 12, 2012 at 7:06 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > On Sat, May 12, 2012 at 6:29 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> On Sat, May 12, 2012 at 3:57 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >>> On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >>>> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >>>> support for virtio-block and interrupt nodes. >>>> >>>> With these patches and QEMU HEAD, Linux can boot like Artyom describes in >>>> http://tyom.blogspot.de/2012_05_01_archive.html >>>> but without any manual OpenBIOS setup. >>> >>> My test kernel - 3.3.2 - still needs the ebus interrupt mapping properties: >>> >>> cd /pci@1fe,0/ebus >>> 000001fe encode-int 020003f8 encode-int encode+ 1 encode-int encode+ >>> ffe29140 encode-int encode+ 2b encode-int encode+ " interrupt-map" property >>> 000001ff encode-int ffffffff encode-int encode+ 00000003 encode-int encode+ >>> " interrupt-map-mask" property >>> device-end >>> boot >> >> Updated patch attached. This change seems to help the serial driver. > > Looks good. The result seems to be identical with my hack, but there > is one point I'd like to discuss: > > cd /pci@1fe,0/pci-ata ok > .properties > name "pci-ata" > [...] > interrupts 0 > > I'm not sure that this is a valid value for the interrupts property. Tarl, Jakub, can you comment whether 0 is allowed? > If it's not, I guess it has to be changed back to 1, and the > additional interrupt mappings have to be added to the root pci node. > On the other hand, if no one objects, we can apply the patch as-is, > and say that it's good enough for the only guest OS which currently > supports these devices (virtio and cmd646). > >>>> Blue Swirl (2): >>>> pci: identify virtio-scsi devices >>>> Sparc64: fix interrupt properties >>>> >>>> drivers/ide.c | 2 ++ >>>> drivers/pc_serial.c | 3 +++ >>>> drivers/pci.c | 23 +++++++++++++++++++++++ >>>> drivers/pci_database.c | 19 ++++++++++++++++++- >>>> drivers/pci_database.h | 1 + >>>> include/drivers/pci.h | 3 +++ >>>> 6 files changed, 50 insertions(+), 1 deletion(-) >>>> >>>> -- >>>> 1.7.10 -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] sun4u interrupt-map
by Tarl Neustaedter 12 May '12

12 May '12

On 2012-May-12 09:48 , Artyom Tarasenko wrote: > Btw, thanks Tarl for pointing in the right direction. The problem was that > the combination of the interrupt map and mask properties matched _more > than one_ "reg". > That was confusing the Linux OF tree parser. > > Out of curiosity: should this mappings be really unique? Not sure. We write them such that they are in our platforms, but I don't know the degree of uniqueness required.

1 0

SPARC32 SBus probing with OBP
by Mark Cave-Ayland 12 May '12

12 May '12

Hi all, Does anyone know how OBP probes for in-built SBus devices on SPARC32? The reason I'm asking is that I'm looking at trying to detect in-built devices in OpenBIOS, and the SBus documentation suggests that each slot contains Fcode mapped at offset 0 which is executed to build the device tree. Now QEMU currently doesn't do any Fcode mapping within SBus slots, but according to its boot output OBP still manages to detect hardware such as graphics cards etc. within certain slots during boot. Is there a different mechanism used for detecting in-built devices, or is it just something as simple as a hardcoded list based upon the current machine type? Many thanks, Mark.

2 1

Re: [OpenBIOS] [PATCH 1/2] pci: identify virtio-scsi devices
by Artyom Tarasenko 12 May '12

12 May '12

Acked-by: Artyom Tarasenko <atar4qemu(a)gmail.com> On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > Identify virtio SCSI device in PCI probe. > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > --- > drivers/pci_database.c | 19 ++++++++++++++++++- > include/drivers/pci.h | 3 +++ > 2 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci_database.c b/drivers/pci_database.c > index ac47621..7d420c3 100644 > --- a/drivers/pci_database.c > +++ b/drivers/pci_database.c > @@ -45,6 +45,23 @@ static const pci_subclass_t undef_subclass[] = { > }, > }; > > +static const pci_dev_t scsi_devices[] = { > + { > + /* Virtio-block controller */ > + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_BLOCK, > + NULL, "virtio-scsi", NULL, > + "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0", > + 0, 0, 0, > + NULL, NULL, > + }, > + { > + 0xFFFF, 0xFFFF, > + NULL, NULL, NULL, NULL, > + -1, -1, -1, > + NULL, NULL, > + }, > +}; > + > static const pci_dev_t ide_devices[] = { > { > PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, /* CMD646 IDE controller */ > @@ -64,7 +81,7 @@ static const pci_dev_t ide_devices[] = { > static const pci_subclass_t mass_subclass[] = { > { > PCI_SUBCLASS_STORAGE_SCSI, "SCSI bus controller", > - NULL, NULL, NULL, > + "scsi", scsi_devices, NULL, > NULL, NULL, > }, > { > diff --git a/include/drivers/pci.h b/include/drivers/pci.h > index 562a43e..4c996c0 100644 > --- a/include/drivers/pci.h > +++ b/include/drivers/pci.h > @@ -205,6 +205,9 @@ extern const pci_arch_t *arch; > #define PCI_VENDOR_ID_QEMU 0x1234 > #define PCI_DEVICE_ID_QEMU_VGA 0x1111 > > +#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 > +#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 > + > #define PCI_VENDOR_ID_INTEL 0x8086 > #define PCI_DEVICE_ID_INTEL_82441 0x1237 > > -- > 1.7.10 -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Artyom Tarasenko 12 May '12

12 May '12

On Sat, May 12, 2012 at 6:29 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Sat, May 12, 2012 at 3:57 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >> On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >>> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >>> support for virtio-block and interrupt nodes. >>> >>> With these patches and QEMU HEAD, Linux can boot like Artyom describes in >>> http://tyom.blogspot.de/2012_05_01_archive.html >>> but without any manual OpenBIOS setup. >> >> My test kernel - 3.3.2 - still needs the ebus interrupt mapping properties: >> >> cd /pci@1fe,0/ebus >> 000001fe encode-int 020003f8 encode-int encode+ 1 encode-int encode+ >> ffe29140 encode-int encode+ 2b encode-int encode+ " interrupt-map" property >> 000001ff encode-int ffffffff encode-int encode+ 00000003 encode-int encode+ >> " interrupt-map-mask" property >> device-end >> boot > > Updated patch attached. This change seems to help the serial driver. Looks good. The result seems to be identical with my hack, but there is one point I'd like to discuss: cd /pci@1fe,0/pci-ata ok .properties name "pci-ata" [...] interrupts 0 I'm not sure that this is a valid value for the interrupts property. If it's, not I guess it has to be changed back to 1, and the additional interrupt mappings have to be added to the root pci node. On the other hand, if no one objects, we can apply the patch as-is, and say that it's good enough for the only guest OS which currently supports these devices (virtio and cmd646). >>> Blue Swirl (2): >>> pci: identify virtio-scsi devices >>> Sparc64: fix interrupt properties >>> >>> drivers/ide.c | 2 ++ >>> drivers/pc_serial.c | 3 +++ >>> drivers/pci.c | 23 +++++++++++++++++++++++ >>> drivers/pci_database.c | 19 ++++++++++++++++++- >>> drivers/pci_database.h | 1 + >>> include/drivers/pci.h | 3 +++ >>> 6 files changed, 50 insertions(+), 1 deletion(-) >>> >>> -- >>> 1.7.10 -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Blue Swirl 12 May '12

12 May '12

On Sat, May 12, 2012 at 3:57 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >> support for virtio-block and interrupt nodes. >> >> With these patches and QEMU HEAD, Linux can boot like Artyom describes in >> http://tyom.blogspot.de/2012_05_01_archive.html >> but without any manual OpenBIOS setup. > > My test kernel - 3.3.2 - still needs the ebus interrupt mapping properties: > > cd /pci@1fe,0/ebus > 000001fe encode-int 020003f8 encode-int encode+ 1 encode-int encode+ > ffe29140 encode-int encode+ 2b encode-int encode+ " interrupt-map" property > 000001ff encode-int ffffffff encode-int encode+ 00000003 encode-int encode+ > " interrupt-map-mask" property > device-end > boot Updated patch attached. This change seems to help the serial driver. > >> Blue Swirl (2): >> pci: identify virtio-scsi devices >> Sparc64: fix interrupt properties >> >> drivers/ide.c | 2 ++ >> drivers/pc_serial.c | 3 +++ >> drivers/pci.c | 23 +++++++++++++++++++++++ >> drivers/pci_database.c | 19 ++++++++++++++++++- >> drivers/pci_database.h | 1 + >> include/drivers/pci.h | 3 +++ >> 6 files changed, 50 insertions(+), 1 deletion(-) >> >> -- >> 1.7.10 > > > -- > Regards, > Artyom Tarasenko > > solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Mark Cave-Ayland 12 May '12

12 May '12

On 12/05/12 15:14, Artyom Tarasenko wrote: > On Sat, May 12, 2012 at 3:54 PM, Blue Swirl<blauwirbel(a)gmail.com> wrote: >> On Sat, May 12, 2012 at 1:34 PM, Artyom Tarasenko<atar4qemu(a)gmail.com> wrote: >>> On Sat, May 12, 2012 at 1:42 PM, Blue Swirl<blauwirbel(a)gmail.com> wrote: >>>> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >>>> support for virtio-block and interrupt nodes. >>> >>> Hey, that was fast! Does it mean your patches also allow booting from >>> a virtio device? >> >> No, only a warning for the unknown device is avoided and Linux can use >> the interrupts. >> >> Making a simple driver does not look very difficult, here are some examples: >> http://fxr.watson.org/fxr/source/dev/virtio/block/virtio_blk.c >> http://fxr.watson.org/fxr/source/drivers/block/virtio_blk.c?v=linux-2.6 >> http://git.qemu.org/?p=seabios.git;a=blob;f=src/virtio-blk.c;h=194deaf98b41… >> > > Fair enough. On the other hand, if we implement it too soon, there > will be less motivation in fixing the cmd646 emulation in qemu... ;-) What's the actual bug with cmd646 in QEMU? ATB, Mark.

2 1

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Artyom Tarasenko 12 May '12

12 May '12

On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal > support for virtio-block and interrupt nodes. > > With these patches and QEMU HEAD, Linux can boot like Artyom describes in > http://tyom.blogspot.de/2012_05_01_archive.html > but without any manual OpenBIOS setup. My test kernel - 3.3.2 - still needs the ebus interrupt mapping properties: cd /pci@1fe,0/ebus 000001fe encode-int 020003f8 encode-int encode+ 1 encode-int encode+ ffe29140 encode-int encode+ 2b encode-int encode+ " interrupt-map" property 000001ff encode-int ffffffff encode-int encode+ 00000003 encode-int encode+ " interrupt-map-mask" property device-end boot > Blue Swirl (2): > pci: identify virtio-scsi devices > Sparc64: fix interrupt properties > > drivers/ide.c | 2 ++ > drivers/pc_serial.c | 3 +++ > drivers/pci.c | 23 +++++++++++++++++++++++ > drivers/pci_database.c | 19 ++++++++++++++++++- > drivers/pci_database.h | 1 + > include/drivers/pci.h | 3 +++ > 6 files changed, 50 insertions(+), 1 deletion(-) > > -- > 1.7.10 -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Artyom Tarasenko 12 May '12

12 May '12

On Sat, May 12, 2012 at 3:54 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Sat, May 12, 2012 at 1:34 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >> On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >>> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >>> support for virtio-block and interrupt nodes. >> >> Hey, that was fast! Does it mean your patches also allow booting from >> a virtio device? > > No, only a warning for the unknown device is avoided and Linux can use > the interrupts. > > Making a simple driver does not look very difficult, here are some examples: > http://fxr.watson.org/fxr/source/dev/virtio/block/virtio_blk.c > http://fxr.watson.org/fxr/source/drivers/block/virtio_blk.c?v=linux-2.6 > http://git.qemu.org/?p=seabios.git;a=blob;f=src/virtio-blk.c;h=194deaf98b41… > Fair enough. On the other hand, if we implement it too soon, there will be less motivation in fixing the cmd646 emulation in qemu... ;-) >>> With these patches and QEMU HEAD, Linux can boot like Artyom describes in >>> http://tyom.blogspot.de/2012_05_01_archive.html >>> but without any manual OpenBIOS setup. >>> >>> Blue Swirl (2): >>> pci: identify virtio-scsi devices >>> Sparc64: fix interrupt properties >>> >>> drivers/ide.c | 2 ++ >>> drivers/pc_serial.c | 3 +++ >>> drivers/pci.c | 23 +++++++++++++++++++++++ >>> drivers/pci_database.c | 19 ++++++++++++++++++- >>> drivers/pci_database.h | 1 + >>> include/drivers/pci.h | 3 +++ >>> 6 files changed, 50 insertions(+), 1 deletion(-) >>> >>> -- >>> 1.7.10 -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Blue Swirl 12 May '12

12 May '12

On Sat, May 12, 2012 at 1:34 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal >> support for virtio-block and interrupt nodes. > > Hey, that was fast! Does it mean your patches also allow booting from > a virtio device? No, only a warning for the unknown device is avoided and Linux can use the interrupts. Making a simple driver does not look very difficult, here are some examples: http://fxr.watson.org/fxr/source/dev/virtio/block/virtio_blk.c http://fxr.watson.org/fxr/source/drivers/block/virtio_blk.c?v=linux-2.6 http://git.qemu.org/?p=seabios.git;a=blob;f=src/virtio-blk.c;h=194deaf98b41… >> With these patches and QEMU HEAD, Linux can boot like Artyom describes in >> http://tyom.blogspot.de/2012_05_01_archive.html >> but without any manual OpenBIOS setup. >> >> Blue Swirl (2): >> pci: identify virtio-scsi devices >> Sparc64: fix interrupt properties >> >> drivers/ide.c | 2 ++ >> drivers/pc_serial.c | 3 +++ >> drivers/pci.c | 23 +++++++++++++++++++++++ >> drivers/pci_database.c | 19 ++++++++++++++++++- >> drivers/pci_database.h | 1 + >> include/drivers/pci.h | 3 +++ >> 6 files changed, 50 insertions(+), 1 deletion(-) >> >> -- >> 1.7.10 > > > > -- > Regards, > Artyom Tarasenko > > solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] sun4u interrupt-map
by Artyom Tarasenko 12 May '12

12 May '12

On Mon, Apr 9, 2012 at 6:08 PM, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: > On Thu, Apr 5, 2012 at 11:54 PM, Tarl Neustaedter <tarl-b2(a)tarl.net> wrote: >> The interrupt mask property should probably be 00ff.ffff, ff . > > Should it matter, if the used one matches the target "reg"? > Btw, thanks Tarl for pointing in the right direction. The problem was that the combination of the interrupt map and mask properties matched _more than one_ "reg". That was confusing the Linux OF tree parser. Out of curiosity: should this mappings be really unique? -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

Re: [OpenBIOS] [PATCH 0/2] Sparc64: virtio-block and interrupt support
by Artyom Tarasenko 12 May '12

12 May '12

On Sat, May 12, 2012 at 1:42 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal > support for virtio-block and interrupt nodes. Hey, that was fast! Does it mean your patches also allow booting from a virtio device? > With these patches and QEMU HEAD, Linux can boot like Artyom describes in > http://tyom.blogspot.de/2012_05_01_archive.html > but without any manual OpenBIOS setup. > > Blue Swirl (2): > pci: identify virtio-scsi devices > Sparc64: fix interrupt properties > > drivers/ide.c | 2 ++ > drivers/pc_serial.c | 3 +++ > drivers/pci.c | 23 +++++++++++++++++++++++ > drivers/pci_database.c | 19 ++++++++++++++++++- > drivers/pci_database.h | 1 + > include/drivers/pci.h | 3 +++ > 6 files changed, 50 insertions(+), 1 deletion(-) > > -- > 1.7.10 -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/search/label/qemu

1 0

[commit] r1057 - trunk/openbios-devel/arch/sparc32
by repository service 12 May '12

12 May '12

Author: blueswirl Date: Sat May 12 13:43:57 2012 New Revision: 1057 URL: http://tracker.coreboot.org/trac/openbios/changeset/1057 Log: Sparc32: avoid problems with SMP table Check CPU ID if we're running on boot CPU. If so, don't use SMP table information since it may contain uninitialized or garbage values. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/entry.S Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sat Apr 28 15:35:06 2012 (r1056) +++ trunk/openbios-devel/arch/sparc32/entry.S Sat May 12 13:43:57 2012 (r1057) @@ -126,12 +126,23 @@ set 0x2000, %g3 sub %g1, %g3, %g6 + ! Check if this is the boot CPU and skip SMP table check if yes + ! XXX: not all CPUs should have MXCC + set 0x1c00f00, %g2 + ldda [%g2] ASI_CONTROL, %g2 + srl %g3, 24, %g7 + sub %g7, 8, %g7 + tst %g7 + bz skip_table + nop + ! Calculate SMP table location set 0x1f0c, %g2 add %g6, %g2, %g2 ! valid? lda [%g2] ASI_M_BYPASS, %g7 sta %g0, [%g2] ASI_M_BYPASS +skip_table: ! Get machine ID from configuration device mov FW_CFG_MACHINE_ID, %g2 sub %g5, 2, %g5

1 0

[PATCH 2/2] Sparc64: fix interrupt properties
by Blue Swirl 12 May '12

12 May '12

Add interrupt-map and interrupt-mask properties to host bridge and sprinkle interrupt properties to various devices. Based on hack by Artyom Tarasenko. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- drivers/ide.c | 2 ++ drivers/pc_serial.c | 3 +++ drivers/pci.c | 23 +++++++++++++++++++++++ drivers/pci_database.c | 2 +- drivers/pci_database.h | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/ide.c b/drivers/ide.c index 0d09bcd..90138ff 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -1432,6 +1432,8 @@ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, props[0]=14; props[1]=0; set_property(dnode, "interrupts", (char *)&props, 2*sizeof(props[0])); +#elif defined(CONFIG_SPARC64) + set_int_property(get_cur_dev(), "interrupts", 0); #endif props[0] = __cpu_to_be32(chan->io_regs[0]); diff --git a/drivers/pc_serial.c b/drivers/pc_serial.c index 583d1c0..5882a05 100644 --- a/drivers/pc_serial.c +++ b/drivers/pc_serial.c @@ -190,6 +190,9 @@ ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, fword("encode+"); push_str("reg"); fword("property"); +#if defined(CONFIG_SPARC64) + set_int_property(get_cur_dev(), "interrupts", 1); +#endif aliases = find_dev("/aliases"); set_property(aliases, "ttya", nodebuff, strlen(nodebuff) + 1); diff --git a/drivers/pci.c b/drivers/pci.c index e270a73..1e68000 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -401,6 +401,21 @@ static void pci_host_set_interrupt_map(const pci_config_t *config) props[PCI_INT_MAP_PCI_INT] = 0x7; set_property(dev, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); +#elif defined(CONFIG_SPARC64) + phandle_t dev = get_cur_dev(); + uint32_t props[5]; + + props[0] = 0x000001fe; + props[1] = 0x020003f8; + props[2] = 1; + props[3] = find_dev("/"); + props[4] = 0x2b; + set_property(dev, "interrupt-map", (char *)props, 5 * sizeof(props[0])); + + props[0] = 0x000001ff; + props[1] = 0xffffffff; + props[2] = 3; + set_property(dev, "interrupt-map-mask", (char *)props, 3 * sizeof(props[0])); #endif } @@ -522,6 +537,14 @@ int bridge_config_cb(const pci_config_t *config) return 0; } +int virtio_config_cb(const pci_config_t *config) +{ +#if defined(CONFIG_SPARC64) + set_int_property(get_cur_dev(), "interrupts", 0); +#endif + return 0; +} + int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, diff --git a/drivers/pci_database.c b/drivers/pci_database.c index 7d420c3..1d2958c 100644 --- a/drivers/pci_database.c +++ b/drivers/pci_database.c @@ -52,7 +52,7 @@ static const pci_dev_t scsi_devices[] = { NULL, "virtio-scsi", NULL, "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0", 0, 0, 0, - NULL, NULL, + virtio_config_cb, NULL, }, { 0xFFFF, 0xFFFF, diff --git a/drivers/pci_database.h b/drivers/pci_database.h index 5ddbb20..5459032 100644 --- a/drivers/pci_database.h +++ b/drivers/pci_database.h @@ -28,6 +28,7 @@ struct pci_dev_t { const void *private; }; +extern int virtio_config_cb(const pci_config_t *config); extern int ide_config_cb2(const pci_config_t *config); extern int eth_config_cb(const pci_config_t *config); extern int macio_heathrow_config_cb(const pci_config_t *config); -- 1.7.10

1 0

[PATCH 1/2] pci: identify virtio-scsi devices
by Blue Swirl 12 May '12

12 May '12

Identify virtio SCSI device in PCI probe. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- drivers/pci_database.c | 19 ++++++++++++++++++- include/drivers/pci.h | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/pci_database.c b/drivers/pci_database.c index ac47621..7d420c3 100644 --- a/drivers/pci_database.c +++ b/drivers/pci_database.c @@ -45,6 +45,23 @@ static const pci_subclass_t undef_subclass[] = { }, }; +static const pci_dev_t scsi_devices[] = { + { + /* Virtio-block controller */ + PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_BLOCK, + NULL, "virtio-scsi", NULL, + "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0", + 0, 0, 0, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + static const pci_dev_t ide_devices[] = { { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, /* CMD646 IDE controller */ @@ -64,7 +81,7 @@ static const pci_dev_t ide_devices[] = { static const pci_subclass_t mass_subclass[] = { { PCI_SUBCLASS_STORAGE_SCSI, "SCSI bus controller", - NULL, NULL, NULL, + "scsi", scsi_devices, NULL, NULL, NULL, }, { diff --git a/include/drivers/pci.h b/include/drivers/pci.h index 562a43e..4c996c0 100644 --- a/include/drivers/pci.h +++ b/include/drivers/pci.h @@ -205,6 +205,9 @@ extern const pci_arch_t *arch; #define PCI_VENDOR_ID_QEMU 0x1234 #define PCI_DEVICE_ID_QEMU_VGA 0x1111 +#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 +#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 + #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_82441 0x1237 -- 1.7.10

1 0

[PATCH 0/2] Sparc64: virtio-block and interrupt support
by Blue Swirl 12 May '12

12 May '12

Based on Artyom's Sparc64 work (thanks a lot!), I added some minimal support for virtio-block and interrupt nodes. With these patches and QEMU HEAD, Linux can boot like Artyom describes in http://tyom.blogspot.de/2012_05_01_archive.html but without any manual OpenBIOS setup. Blue Swirl (2): pci: identify virtio-scsi devices Sparc64: fix interrupt properties drivers/ide.c | 2 ++ drivers/pc_serial.c | 3 +++ drivers/pci.c | 23 +++++++++++++++++++++++ drivers/pci_database.c | 19 ++++++++++++++++++- drivers/pci_database.h | 1 + include/drivers/pci.h | 3 +++ 6 files changed, 50 insertions(+), 1 deletion(-) -- 1.7.10

1 0

Re: [OpenBIOS] [PATCH] pci: fix BAR setup
by Jakub Jermar 12 May '12

12 May '12

Hi Artyom, all, On 04/19/2012 10:29 PM, Artyom Tarasenko wrote: > On Thu, Apr 19, 2012 at 10:04 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> On Thu, Apr 19, 2012 at 19:06, Artyom Tarasenko <atar4qemu(a)gmail.com> wrote: >>> On Sun, Mar 11, 2012 at 11:59 AM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >>>> A change in QEMU on how PCI bridges are setup revealed >>>> a bug in OpenBIOS PCI setup. On Sparc64, the BARs just >>>> happened to get somewhat correct values by accident before >>>> the commit but not after the change. >>>> >>>> Don't use arch->io_base for PCI I/O port BARs. >>>> >>>> Fix Sparc64 PCI memory base. >>> >>> Could it be that the ranges property needs to be adjusted to look as >>> it did before the patch? >>> >>> This patch breaks HelenOS-0.4.3/sparc boot. But if I modify the ranges >>> property to the old value, HelenOS boots. >>> >>> 0 > cd /pci@1fe,0 ok >>> 0 > .properties >>> [...] >>> ranges -- 54 : 00 00 00 00 00 00 00 00 00 00 00 00 >>> 00 00 01 fe 01 00 00 00 00 00 00 00 02 00 00 00 01 00 00 00 00 00 00 >>> 00 00 00 00 00 00 00 01 fe 02 00 00 00 00 00 00 00 00 01 00 00 02 00 >>> 00 00 00 00 00 00 00 10 00 00 00 00 01 ff 00 00 00 00 00 00 00 00 10 >>> 00 00 00 >>> >>> Not sure about the best formatting. If I reformat it like this: >>> >>> 00000000 00000000 00000000 000001fe 01000000 00000000 02000000 >>> 01000000 00000000 00000000 000001fe 02000000 00000000 00010000 >>> 02000000 00000000 00100000 000001ff 00000000 00000000 10000000 >>> ^^^^ this one (the third) used to be 0 >>> >> >> On an Ultra-5 this should be >> 00000000.00000000.00000000.000001fe.01000000.00000000.01000000. >> 01000000.00000000.00000000.000001fe.02000000.00000000.01000000. >> 02000000.00000000.00000000.000001ff.00000000.00000001.00000000. >> 03000000.00000000.00000000.000001ff.00000000.00000001.00000000 >> >> http://git.kernel.org/?p=linux/kernel/git/davem/prtconfs.git;a=blob;f=ultra… >> >> I guess the problem is that the properties are added by finding the >> host bridge in the PCI bus (which btw isn't so nice), so we use the >> pci_mem_base. Using pci_mem_base = 0 would probably fix the BAR, but >> then VGA would get in the way. Probably something more complex is >> needed. > > Hmm. Complicated. What is actually the meaning of this property? Don't > we need the values ourselves? > If these are just BARs, can't we pass the configuration from qemu? I am now looking into this from the HelenOS point of view. The problem is that HelenOS miscomputes the framebuffer physical address. I think I found the culprit in the ranges property of the PCI node. The mechanism of the bug seems to be as follows. HelenOS reads the parent-relative address of the VGA node from the reg property. The address is 0x008000000. It then wants to apply it on the parent node's (PCI) ranges property. Using a packed C structure, a range is defined as follows: typedef struct { uint32_t space; uint64_t child_base; uint64_t parent_base; uint64_t size; }; Note that in our case, the matching range is: 02000000 00000000 00100000 000001ff 00000000 00000000 10000000 child_base is 0x00100000 parent_base is 0x1ff00000000 reg_addr is 0x00800000 HelenOS then computes the resulting physical address using this formula: pa = parent_base + (reg_addr - child_base); The result is thus 0x1ff00700000 instead of the correct value 0x1ff00800000. So it looks like either the child base should be 0, or reg_addr must be 0x00900000, or parent_base must be 0x1ff00100000. From the way this works e.g. on Sun E6500, the last option seems to be the correct one. What do you think of it? Jakub

3 2

Re: [OpenBIOS] sparc-softmmu uninitialized memory read?
by Andreas Färber 06 May '12

06 May '12

Am 06.05.2012 18:44, schrieb Blue Swirl: > On Sun, May 6, 2012 at 2:02 PM, Andreas Färber <afaerber(a)suse.de> wrote: >> Am 06.05.2012 13:32, schrieb Blue Swirl: >>> On Sat, May 5, 2012 at 3:37 PM, Andreas Färber <afaerber(a)suse.de> wrote: >>>> Hello Blue, >>>> >>>> Testing a potential AREG0 fix for ppc host by malc I got an error >>>> running `./sparc-softmmu/sparc-softmmu` (same with CD/kernel): >>>> >>>> qemu: fatal: Trap 0x07 while interrupts disabled, Error state >>>> pc: 00005e0c npc: 00005e10 >>>> General Registers: >>>> %g0-7: 00000000 00000001 babababa 00000000 00000020 07ffff08 07ffe000 >>>> babababa >>>> >>>> Current Register Window: >>>> %o0-7: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 >>>> 00000000 >>>> %l0-7: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 >>>> 00000000 >>>> %i0-7: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 >>>> 00000000 >>>> >>>> Floating Point Registers: >>>> %f00: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>>> %f08: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>>> %f16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>>> %f24: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>>> psr: 048000c0 (icc: N--- SPE: SP-) wim: 00000001 >>>> fsr: 00000000 y: 00000020 >>>> Abgebrochen >>>> >>>> The 0xbabababa in %g2 and %g7 is a signature I've seen in uninitialized >>>> memory on openSUSE 12.1 Betas. So I ran valgrind, and the following >>>> caught my eye on both ppc and x86_64: >>>> >>>> ==18801== Command: ./sparc-softmmu/qemu-system-sparc >>>> ==18801== >>>> ==18801== Thread 2: >>>> ==18801== Conditional jump or move depends on uninitialised value(s) >>>> ==18801== at 0x25C5AF: compute_all_logic (cc_helper.c:37) >>>> ==18801== by 0x25C648: helper_compute_psr (cc_helper.c:470) >>>> ==18801== by 0x8CD0981: ??? >>>> ==18801== Uninitialised value was created by a heap allocation >>>> ==18801== at 0x4C27CE8: memalign (in >>>> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) >>>> ==18801== by 0x4C27D97: posix_memalign (in >>>> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) >>>> ==18801== by 0x1F2101: qemu_memalign (oslib-posix.c:93) >>>> ==18801== by 0x1F21A9: qemu_vmalloc (oslib-posix.c:126) >>>> ==18801== by 0x2665F6: qemu_ram_alloc_from_ptr (exec.c:2647) >>>> ==18801== by 0x286D76: memory_region_init_ram (memory.c:954) >>>> ==18801== by 0x297FFD: ram_init1 (sun4m.c:757) >>>> ==18801== by 0x204DAE: qdev_init (qdev.c:151) >>>> ==18801== by 0x204EEC: qdev_init_nofail (qdev.c:258) >>>> ==18801== by 0x298845: ram_init.constprop.7 (sun4m.c:783) >>>> ==18801== by 0x298980: sun4m_hw_init (sun4m.c:862) >>>> ==18801== by 0x2994A2: ss5_init (sun4m.c:1289) >>>> >>>> This is at 8f473dd104f0937ce98523fa6f9de0bd845aebbe, and cc_helper.c:37 >>>> is int32_t dst argument of get_NZ_icc(), which is always called with >>>> CC_DST, i.e. env->cc_dst. >>>> >>>> This seems to indicate that a read from uninitialized memory occurred, >>>> from which cc_dst is being initialized? >>> >>> This should happen in target-sparc/cpu.c:45 >>> memset(env, 0, offsetof(CPUSPARCState, breakpoints)); >>> >>> cc_dst is between structure start and CPU_COMMON. >>> >>> 89aaf60dedbe0e6415acfe816e02b538e5c54e68 fixed a bug relating to reset recently. >> >> The still-current master commit above includes that fix though, and >> that's no explanation for the uninitialized memory stemming from sun4m >> RAM as opposed to QOM object_new(). Somewhere a read is happening, >> possibly in OpenBIOS, from uninitialized memory that is then stored into >> the CPUSPARCState after that has been zero-initialized, IIUC. > > Ok, I see it now. OpenBIOS assumes that the Sparc32 SMP table is valid > when the valid field is nonzero, indicating secondary processor setup > so OpenBIOS jumps to the location indicated with the SMP table. With > 0xbabababa in memory, this fragile logic fails and there is the early > crash. > https://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel/arc… > https://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel/arc… Great! I have tested the following workaround: diff --git a/hw/sun4m.c b/hw/sun4m.c index 34088ad..55d5bdc 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -755,6 +755,7 @@ static int ram_init1(SysBusDevice *dev) RamDevice *d = FROM_SYSBUS(RamDevice, dev); memory_region_init_ram(&d->ram, "sun4m.ram", d->size); + memset(memory_region_get_ram_ptr(&d->ram), 0, d->size); vmstate_register_ram_global(&d->ram); sysbus_init_mmio(dev, &d->ram); return 0; This makes sparc32 work on ppc with malc's attached patch (and doesn't break on x86_64). Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

2 1

[PATCH] Sparc32: avoid problems with SMP table
by Blue Swirl 06 May '12

06 May '12

Check CPU ID if we're running on boot CPU. If so, don't use SMP table information since it may contain uninitialized or garbage values. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- arch/sparc32/entry.S | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/sparc32/entry.S b/arch/sparc32/entry.S index 9f5356c..24c4cbf 100644 --- a/arch/sparc32/entry.S +++ b/arch/sparc32/entry.S @@ -126,12 +126,23 @@ entry: set 0x2000, %g3 sub %g1, %g3, %g6 + ! Check if this is the boot CPU and skip SMP table check if yes + ! XXX: not all CPUs should have MXCC + set 0x1c00f00, %g2 + ldda [%g2] ASI_CONTROL, %g2 + srl %g3, 24, %g7 + sub %g7, 8, %g7 + tst %g7 + bz skip_table + nop + ! Calculate SMP table location set 0x1f0c, %g2 add %g6, %g2, %g2 ! valid? lda [%g2] ASI_M_BYPASS, %g7 sta %g0, [%g2] ASI_M_BYPASS +skip_table: ! Get machine ID from configuration device mov FW_CFG_MACHINE_ID, %g2 sub %g5, 2, %g5 -- 1.7.10

1 0

Re: [OpenBIOS] sparc-softmmu uninitialized memory read?
by Blue Swirl 06 May '12

06 May '12

On Sun, May 6, 2012 at 2:02 PM, Andreas Färber <afaerber(a)suse.de> wrote: > Am 06.05.2012 13:32, schrieb Blue Swirl: >> On Sat, May 5, 2012 at 3:37 PM, Andreas Färber <afaerber(a)suse.de> wrote: >>> Hello Blue, >>> >>> Testing a potential AREG0 fix for ppc host by malc I got an error >>> running `./sparc-softmmu/sparc-softmmu` (same with CD/kernel): >>> >>> qemu: fatal: Trap 0x07 while interrupts disabled, Error state >>> pc: 00005e0c npc: 00005e10 >>> General Registers: >>> %g0-7: 00000000 00000001 babababa 00000000 00000020 07ffff08 07ffe000 >>> babababa >>> >>> Current Register Window: >>> %o0-7: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 >>> 00000000 >>> %l0-7: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 >>> 00000000 >>> %i0-7: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 >>> 00000000 >>> >>> Floating Point Registers: >>> %f00: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>> %f08: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>> %f16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>> %f24: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >>> psr: 048000c0 (icc: N--- SPE: SP-) wim: 00000001 >>> fsr: 00000000 y: 00000020 >>> Abgebrochen >>> >>> The 0xbabababa in %g2 and %g7 is a signature I've seen in uninitialized >>> memory on openSUSE 12.1 Betas. So I ran valgrind, and the following >>> caught my eye on both ppc and x86_64: >>> >>> ==18801== Command: ./sparc-softmmu/qemu-system-sparc >>> ==18801== >>> ==18801== Thread 2: >>> ==18801== Conditional jump or move depends on uninitialised value(s) >>> ==18801== at 0x25C5AF: compute_all_logic (cc_helper.c:37) >>> ==18801== by 0x25C648: helper_compute_psr (cc_helper.c:470) >>> ==18801== by 0x8CD0981: ??? >>> ==18801== Uninitialised value was created by a heap allocation >>> ==18801== at 0x4C27CE8: memalign (in >>> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) >>> ==18801== by 0x4C27D97: posix_memalign (in >>> /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) >>> ==18801== by 0x1F2101: qemu_memalign (oslib-posix.c:93) >>> ==18801== by 0x1F21A9: qemu_vmalloc (oslib-posix.c:126) >>> ==18801== by 0x2665F6: qemu_ram_alloc_from_ptr (exec.c:2647) >>> ==18801== by 0x286D76: memory_region_init_ram (memory.c:954) >>> ==18801== by 0x297FFD: ram_init1 (sun4m.c:757) >>> ==18801== by 0x204DAE: qdev_init (qdev.c:151) >>> ==18801== by 0x204EEC: qdev_init_nofail (qdev.c:258) >>> ==18801== by 0x298845: ram_init.constprop.7 (sun4m.c:783) >>> ==18801== by 0x298980: sun4m_hw_init (sun4m.c:862) >>> ==18801== by 0x2994A2: ss5_init (sun4m.c:1289) >>> >>> This is at 8f473dd104f0937ce98523fa6f9de0bd845aebbe, and cc_helper.c:37 >>> is int32_t dst argument of get_NZ_icc(), which is always called with >>> CC_DST, i.e. env->cc_dst. >>> >>> This seems to indicate that a read from uninitialized memory occurred, >>> from which cc_dst is being initialized? >> >> This should happen in target-sparc/cpu.c:45 >> memset(env, 0, offsetof(CPUSPARCState, breakpoints)); >> >> cc_dst is between structure start and CPU_COMMON. >> >> 89aaf60dedbe0e6415acfe816e02b538e5c54e68 fixed a bug relating to reset recently. > > The still-current master commit above includes that fix though, and > that's no explanation for the uninitialized memory stemming from sun4m > RAM as opposed to QOM object_new(). Somewhere a read is happening, > possibly in OpenBIOS, from uninitialized memory that is then stored into > the CPUSPARCState after that has been zero-initialized, IIUC. Ok, I see it now. OpenBIOS assumes that the Sparc32 SMP table is valid when the valid field is nonzero, indicating secondary processor setup so OpenBIOS jumps to the location indicated with the SMP table. With 0xbabababa in memory, this fragile logic fails and there is the early crash. https://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel/arc… https://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel/arc… I think the current logic would also not survive a reset just when a secondary processor is brought online. The fix is to make the SMP table logic robust, for example with a checksum. We could also read CPU ID from MXCC and skip the check for boot CPU, though MXCC should not exist for all models. > > My issue here is that sparc64 boots HelenOS fine up until it's trying to > load the kernel (identical to x86_64 host) but sparc32 exits really > early on ppc. It might well be that there's a bug hidden in malc's TCG > patch that's causing the fatal error state, but the uninitialized memory > report is on both TCG hosts, so unlikely TCG-related. > > /-F > >>> Any idea where that could originate from or how to further debug? >>> It doesn't seem to be caused by the >>> 7d21dcc84b8c07918124a9c0708694d2fb013f65 OpenBIOS r1056 update. >>> >>> Regards, >>> >>> Andreas > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

1 0

MS word
by Programmingkid 30 Apr '12

30 Apr '12

The MS word is suppose to wait a specified amount of milliseconds before allowing a program to continue. Yet when a simple line of code like this is run: "1000 MS ." hi" ", the message is printed immediately. This happens no matter how high the top value on the stack is. Is this a bug or am I missing something?

3 2

[commit] r1056 - trunk/openbios-devel/arch/sparc32
by repository service 28 Apr '12

28 Apr '12

Author: mcayland Date: Sat Apr 28 15:35:06 2012 New Revision: 1056 URL: http://tracker.coreboot.org/trac/openbios/changeset/1056 Log: SPARC32: Swap Forth machine memory allocation over to OFMEM memory pool. Instead of using our internal memory pool to run the Forth machine, allocate the memory using OFMEM. This enables us to dramatically increase the memory available to Forth clients whilst reducing the memory requirement for the resulting image. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c trunk/openbios-devel/arch/sparc32/openbios.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sat Apr 28 15:35:03 2012 (r1055) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sat Apr 28 15:35:06 2012 (r1056) @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (384 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Apr 28 15:35:03 2012 (r1055) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Apr 28 15:35:06 2012 (r1056) @@ -27,12 +27,10 @@ #include "arch/common/fw_cfg.h" #include "libopenbios/ofmem.h" -#define MEMORY_SIZE (128*1024) /* 128K ram for hosted system */ +#define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) -static ucell *memory; - int qemu_machine_type; struct hwdef { @@ -807,17 +805,28 @@ static void init_memory(void) { - memory = malloc(MEMORY_SIZE); - if (!memory) - printk("panic: not enough memory on host system.\n"); + phys_addr_t phys; + ucell virt; + + /* Claim the memory from OFMEM */ + phys = ofmem_claim_phys(-1, MEMORY_SIZE, PAGE_SIZE); + if (!phys) + printk("panic: not enough physical memory on host system.\n"); + + virt = ofmem_claim_virt(-1, MEMORY_SIZE, PAGE_SIZE); + if (!virt) + printk("panic: not enough virtual memory on host system.\n"); + + /* Generate the mapping (and lock translation into the TLBs) */ + ofmem_map(phys, virt, MEMORY_SIZE, ofmem_arch_default_translation_mode(phys)); /* we push start and end of memory to the stack * so that it can be used by the forth word QUIT * to initialize the memory allocator */ - - PUSH((ucell)memory); - PUSH((ucell)memory + MEMORY_SIZE); + + PUSH(virt); + PUSH(virt + MEMORY_SIZE); } static void

1 0

[commit] r1055 - trunk/openbios-devel/arch/sparc64
by repository service 28 Apr '12

28 Apr '12

Author: mcayland Date: Sat Apr 28 15:35:03 2012 New Revision: 1055 URL: http://tracker.coreboot.org/trac/openbios/changeset/1055 Log: SPARC64: Swap Forth machine memory allocation over to OFMEM memory pool. Instead of using our internal memory pool to run the Forth machine, allocate the memory using OFMEM. This enables us to dramatically increase the memory available to Forth clients whilst substantially reducing the memory requirement for the resulting image. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat Apr 28 15:35:00 2012 (r1054) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat Apr 28 15:35:03 2012 (r1055) @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((256 + 512) * 1024) +#define MEMSIZE (128 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sat Apr 28 15:35:00 2012 (r1054) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sat Apr 28 15:35:03 2012 (r1055) @@ -21,7 +21,8 @@ #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#include "libopenbios/ofmem.h" +#include "arch/sparc64/ofmem_sparc64.h" +#include "spitfire.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" @@ -34,8 +35,6 @@ #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ -static ucell *memory; - // XXX #define NVRAM_SIZE 0x2000 #define NVRAM_IDPROM 0x1fd8 @@ -553,17 +552,28 @@ static void init_memory(void) { - memory = malloc(MEMORY_SIZE); - if (!memory) - printk("panic: not enough memory on host system.\n"); + phys_addr_t phys; + ucell virt; + + /* Claim the memory from OFMEM (align to 512K so we only take 1 TLB slot) */ + phys = ofmem_claim_phys(-1, MEMORY_SIZE, PAGE_SIZE_512K); + if (!phys) + printk("panic: not enough physical memory on host system.\n"); + + virt = ofmem_claim_virt(-1, MEMORY_SIZE, PAGE_SIZE_512K); + if (!virt) + printk("panic: not enough virtual memory on host system.\n"); + + /* Generate the mapping (and lock translation into the TLBs) */ + ofmem_map(phys, virt, MEMORY_SIZE, ofmem_arch_default_translation_mode(phys) | SPITFIRE_TTE_LOCKED); /* we push start and end of memory to the stack * so that it can be used by the forth word QUIT * to initialize the memory allocator */ - - PUSH((ucell)memory); - PUSH((ucell)memory + (ucell)MEMORY_SIZE); + + PUSH(virt); + PUSH(virt + MEMORY_SIZE); } static void

1 0

[commit] r1054 - in trunk/openbios-devel: arch/sparc64 drivers include/arch/sparc64 packages
by repository service 28 Apr '12

28 Apr '12

Author: mcayland Date: Sat Apr 28 15:35:00 2012 New Revision: 1054 URL: http://tracker.coreboot.org/trac/openbios/changeset/1054 Log: SPARC64: Remove majority of the video initialisation hack. Now that we have OFMEM, as long as we have a PCI bus then we can configure the address of the framebuffer automatically without having an architecture-specific hack. The only thing we need to do is override the virtual address from the OFMEM phys == virt default. Similarly we can remove all reference to the video memory variables _vmem and _evmem since the memory is allocated outside of the OpenBIOS image. This commit also fixes another couple of issues: switch video.c to use virtual instead of physical addresses for architectures that require it (the default is the existing behaviour where phys_addr == virt_addr) and also correct the framebuffer size calculation which was also adding the framebuffer start address to size of the framebuffer to be mapped. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/ldscript trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/arch/sparc64/io.h trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/sparc64/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc64/ldscript Sat Apr 28 15:34:57 2012 (r1053) +++ trunk/openbios-devel/arch/sparc64/ldscript Sat Apr 28 15:35:00 2012 (r1054) @@ -12,7 +12,6 @@ /* 16KB stack */ STACK_SIZE = 16384; -VMEM_SIZE = 128 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS @@ -51,11 +50,6 @@ *(.bss.*) *(COMMON) - . = ALIGN(4096); - _vmem = .; - . += VMEM_SIZE; - _evmem = .; - _stack = .; . += STACK_SIZE; . = ALIGN(16); Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Apr 28 15:34:57 2012 (r1053) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Apr 28 15:35:00 2012 (r1054) @@ -133,7 +133,7 @@ int depth = VGA_DEFAULT_DEPTH; int linebytes = VGA_DEFAULT_LINEBYTES; -#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC64)) +#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)) int w, h, d; w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); @@ -144,13 +144,6 @@ depth = d; linebytes = (width * ((depth + 7) / 8)); } -#ifdef CONFIG_SPARC64 -#define VGA_VADDR 0xfe000000 - ofmem_claim_phys(fb, fb_size, 0); - ofmem_claim_virt(VGA_VADDR, fb_size, 0); - ofmem_map(fb, VGA_VADDR, fb_size, 0x76); - fb = VGA_VADDR; -#endif #endif vga_vbe_set_mode(width, height, depth); Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Sat Apr 28 15:34:57 2012 (r1053) +++ trunk/openbios-devel/include/arch/sparc64/io.h Sat Apr 28 15:35:00 2012 (r1054) @@ -9,7 +9,7 @@ extern unsigned long va_shift; // Set in entry.S // Defined in ldscript -extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; +extern char _start, _data, _stack, _estack, _end, _iomem; // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sat Apr 28 15:34:57 2012 (r1053) +++ trunk/openbios-devel/packages/video.c Sat Apr 28 15:35:00 2012 (r1054) @@ -25,6 +25,7 @@ typedef struct osi_fb_info { unsigned long mphys; + unsigned long mvirt; int rb, w, h, depth; } osi_fb_info_t; @@ -79,7 +80,7 @@ dx = (video.fb.w - width)/2; dy = (video.fb.h - height)/3; - pp = (char*)video.fb.mphys + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); + pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); for( y=0 ; y<height; y++, pp += video.fb.rb ) { if( video.fb.depth >= 24 ) { @@ -121,7 +122,7 @@ void draw_pixel( int x, int y, int colind ) { - char *p = (char*)video.fb.mphys + video.fb.rb * y; + char *p = (char*)video.fb.mvirt + video.fb.rb * y; int color, d = video.fb.depth; if( x < 0 || y < 0 || x >= video.fb.w || y >=video.fb.h ) @@ -146,7 +147,7 @@ x + w > video.fb.w || y + h > video.fb.h) return; - pp = (char*)video.fb.mphys + video.fb.rb * y; + pp = (char*)video.fb.mvirt + video.fb.rb * y; for( ; h--; pp += video.fb.rb ) { int ww = w; if( video.fb.depth == 24 || video.fb.depth == 32 ) { @@ -209,8 +210,8 @@ } offs = video.fb.rb * height; size = (video.fb.h * video.fb.rb - offs)/16; - dest = (int*)video.fb.mphys; - src = (int*)(video.fb.mphys + offs); + dest = (int*)video.fb.mvirt; + src = (int*)(video.fb.mvirt + offs); for( i=0; i<size; i++ ) { dest[0] = src[0]; @@ -309,15 +310,21 @@ /************************************************************************/ void -init_video( unsigned long fb, int width, int height, int depth, int rb ) +init_video( unsigned long fb, int width, int height, int depth, int rb ) { int i; -#ifdef CONFIG_PPC - int s, size; +#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) + int size; #endif phandle_t ph=0; - video.fb.mphys = fb; + video.fb.mphys = video.fb.mvirt = fb; + +#if defined(CONFIG_SPARC64) + /* Fix virtual address on SPARC64 somewhere else */ + video.fb.mvirt = 0xfe000000; +#endif + video.fb.w = width; video.fb.h = height; video.fb.depth = depth; @@ -327,18 +334,17 @@ set_int_property( ph, "height", video.fb.h ); set_int_property( ph, "depth", video.fb.depth ); set_int_property( ph, "linebytes", video.fb.rb ); - set_int_property( ph, "address", video.fb.mphys ); + set_int_property( ph, "address", video.fb.mvirt ); } video.has_video = 1; video.pal = malloc( 256 * sizeof(unsigned long) ); -#ifdef CONFIG_PPC - s = (video.fb.mphys & 0xfff); - size = ((video.fb.h * video.fb.rb + s) + 0xfff) & ~0xfff; +#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) + size = ((video.fb.h * video.fb.rb) + 0xfff) & ~0xfff; ofmem_claim_phys( video.fb.mphys, size, 0 ); - ofmem_claim_virt( video.fb.mphys, size, 0 ); - ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 ); + ofmem_claim_virt( video.fb.mvirt, size, 0 ); + ofmem_map( video.fb.mphys, video.fb.mvirt, size, ofmem_arch_io_translation_mode(video.fb.mphys) ); #endif for( i=0; i<256; i++ )

1 0