May 2017 - OpenBIOS - mail.coreboot.org

[PATCH] libopenbios/bootinfo_load.c: Implement Mac OS 9.2 boot script support
by Programmingkid Dec. 25, 2017

Dec. 25, 2017

This patch makes booting Mac OS 9.2 possible. It replaces all occurrences of >r and r> with sub_>r and sub_r>. This allows for the return stack to be left alone. This patch also makes it so that the boot script is executed one line at a time. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Note: this patch depends on the strstr() and return stack substitution patches. Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1395) +++ libopenbios/bootinfo_load.c (working copy) @@ -19,6 +19,7 @@ #include "libopenbios/bootinfo_load.h" #include "libopenbios/ofmem.h" #include "libc/vsprintf.h" +#include "libc/string.h" //#define DEBUG_BOOTINFO @@ -116,6 +117,75 @@ return LOADER_NOT_SUPPORT; } +// Replace all occurrences of orig_str in buffer with replace_str +static void replace_string(char *buffer, const char *orig_str, const char *replace_str) +{ + char *ptr; + int index, new_buf_index = 0; + const int max_size = 5000; + char *new_buffer = malloc(max_size * sizeof(char)); + + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == orig_str[0]) { + ptr = strstr(buffer + index, orig_str); + + // if we encountered an orig_str in the buffer + if (index == (ptr - buffer)) { + sprintf(new_buffer + new_buf_index, "%s ", replace_str); + new_buf_index += strlen(replace_str) + 1; + index += strlen(orig_str); + continue; + } + } + new_buffer[new_buf_index++] = buffer[index]; + } + + // copy new_buffer into buffer + for (index = 0; index < strlen(new_buffer); index++) { + buffer[index] = new_buffer[index]; + } + buffer[index+1] = '\0'; +} + +/* Replace >r and r> with sub_>r and sub_r> */ +static void replace_return_stack_words(char *bootscript) +{ + const char *find_str1 = ">r"; + const char *replace_str1 = "sub_>r"; + const char *find_str2 = "r>"; + const char *replace_str2 = "sub_r>"; + + replace_string(bootscript, find_str1, replace_str1); + replace_string(bootscript, find_str2, replace_str2); +} + +/* Runs the bootscript one line at a time */ +void run_script(char *bootscript) +{ + int index = 0, buf_index = 0; + char c; + char *buffer = malloc(1000 * sizeof(char)); + + while (1) { + c = bootscript[index]; + + // fill up buffer + while (c != '\n' && c != '\r' && c != '\0') { + buffer[buf_index++] = c; + c = bootscript[++index]; + } + buffer[buf_index] = '\0'; + buf_index = 0; + index++; + DPRINTF("%s\n", buffer); + feval(buffer); + if (c == '\0') { + break; + } + } + free(buffer); +} + /* Parse SGML structure like: <chrp-boot> @@ -209,9 +279,6 @@ script = 0; bootscript[scriptlen] = '\0'; - DPRINTF("got bootscript %s\n", - bootscript); - scriptvalid = -1; break; @@ -261,8 +328,8 @@ /* If the payload is bootinfo then we execute it immediately */ if (scriptvalid) { - DPRINTF("bootscript: %s\n", bootscript); - feval(bootscript); + replace_return_stack_words(bootscript); + run_script(bootscript); } else DPRINTF("Unable to parse bootinfo bootscript\n");

4 9

Adding new device in the middle of device-tree
by BALATON Zoltan July 16, 2017

July 16, 2017

Hello, Is there a way to add a new device in the middle of the device tree (before or after an existing node) from Forth? If I try: dev / new-device " newdev" device-name finish-device show-devs /newdev appears at the end of the device-tree but that's not what I want. I need this device to go at a specific place in the middle but I could not find out how to achieve that. Any ideas? Thank you, BALATON Zoltan

4 17

[PATCH] vga.fs: install MacOS VGA PPC driver from QEMU fw_cfg interface if available
by Mark Cave-Ayland May 1, 2017

May 1, 2017

If the fw_cfg interface provides a MacOS VGA PPC NDRV binary driver then install it into the "driver,AAPL,MacOS,PowerPC" property of the QEMU VGA package. The installation of the binary is configured via the NVRAM configuration variable "vga-ndrv?" (which is set to true by default for PPC) and also the presence of the NDRV binary driver file within the QEMU fw_cfg interface itself. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- drivers/vga.fs | 14 ++++++++++++++ forth/admin/nvram.fs | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/vga.fs b/drivers/vga.fs index 29a043a..cbfa46c 100644 --- a/drivers/vga.fs +++ b/drivers/vga.fs @@ -34,6 +34,9 @@ fcode-version3 " fb8-fillrect" (find-xt) value fb8-fillrect-xt : fb8-fillrect fb8-fillrect-xt execute ; +" fw-cfg-read-file" (find-xt) value fw-cfg-read-file-xt +: fw-cfg-read-file fw-cfg-read-file-xt execute ; + \ \ IO port words \ @@ -197,6 +200,17 @@ headerless depth-bits encode-int " depth" property line-bytes encode-int " linebytes" property + \ Is the VGA NDRV driver enabled? (PPC only) + " /options" find-package drop s" vga-ndrv?" rot get-package-property not if + decode-string 2swap 2drop \ ( addr len ) + s" true" drop -rot comp 0= if + \ Embed NDRV driver via fw-cfg if it exists + " ndrv/qemu_vga.ndrv" fw-cfg-read-file if + encode-string " driver,AAPL,MacOS,PowerPC" property + then + then + then + ['] qemu-vga-driver-install is-install ; diff --git a/forth/admin/nvram.fs b/forth/admin/nvram.fs index 20f6462..3fbd935 100644 --- a/forth/admin/nvram.fs +++ b/forth/admin/nvram.fs @@ -336,6 +336,7 @@ s" -1" s" real-size" int-config s" 4000000" s" load-base" int-config s" -1" s" virt-base" int-config s" -1" s" virt-size" int-config +s" true" s" vga-ndrv?" bool-config [THEN] [IFDEF] CONFIG_X86 -- 1.7.10.4

1 0