[PATCH] libopenbios/bootinfo_load.c: Implement Mac OS 9.2 boot script support
by Programmingkid
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");
2 years, 3 months
- 4
- 9
Re: [OpenBIOS] Porting to custom board
by Mark Cave-Ayland
On 28/11/17 20:45, Max Ruttenberg wrote:
> Hi all,
>
> I'm interested in porting openbios to a board with QorIQ ppce5500
> processor. The board currently uses U-Boot as its primary and
> secondary boot loader.
>
> Is it possible to boot into an openbios image from U-Boot?
> Is there a porting guide?
Hi Max,
Building OpenBIOS generates an ELF image, so if you can include an ELF
payload then this should be possible.
Regarding porting to a new board, I wrote some notes last year in
response to a similar query at
https://mail.coreboot.org/pipermail/openbios/2016-November/009837.html
which you may find useful.
Hopefully that gives you a good starting point, and feel free to ask any
further questions you may have on list (posts are moderated by default
unless you are a list member).
ATB,
Mark.
2 years, 4 months
- 1
- 0
Porting to custom board
by Max Ruttenberg
Hi all,
I'm interested in porting openbios to a board with QorIQ ppce5500
processor. The board currently uses U-Boot as its primary and
secondary boot loader.
Is it possible to boot into an openbios image from U-Boot?
Is there a porting guide?
Thank you,
Max
2 years, 4 months
- 1
- 0
Re: [OpenBIOS] Where is the issue tracker?
by Mark Cave-Ayland
On 07/11/17 02:23, Huang, Jie (Jackie) wrote:
> Hi,
>
> I wanted to report an issue for openbios but failed to access the issue tracker:
>
> https://tracker.coreboot.org/trac/openbios
>
> Is this the correct issue tracker openbios is using?
>
> I found openbios is also in github, so I reported the issue there instead(but it
> doesn't seem to be the correct one, there is 0 issue before I reported):
> https://github.com/openbios/openbios/issues/2
>
> Thanks,
> Jackie
Hi Jackie,
The official OpenBIOS bug tracker moved to github a while back, so the
above link is no longer correct.
I updated the OpenBIOS wiki at https://www.openfirmware.info/OpenBIOS to
reflect the new link *within* the page, however I don't currently have
access to the link in the sidebar which might be where the confusion
comes from. I'll see if I can talk to someone to get this fixed.
Thanks for reporting the issue, I will try and take a look at this later.
ATB,
Mark.
2 years, 4 months
- 2
- 1
Where is the issue tracker?
by Huang, Jie (Jackie)
Hi,
I wanted to report an issue for openbios but failed to access the issue tracker:
https://tracker.coreboot.org/trac/openbios
Is this the correct issue tracker openbios is using?
I found openbios is also in github, so I reported the issue there instead(but it
doesn't seem to be the correct one, there is 0 issue before I reported):
https://github.com/openbios/openbios/issues/2
Thanks,
Jackie
2 years, 5 months
- 1
- 0