[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");
1 year, 11 months
- 4
- 9
[PATCH] pci: add PCI bridge support for 32-bit PCI IO address spaces
by Mark Cave-Ayland
Make sure that we set the upper 16-bits of the IO address for both the
PCI IO base and PCI IO limit registers.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
drivers/pci.c | 3 +++
drivers/pci.h | 2 ++
2 files changed, 5 insertions(+)
diff --git a/drivers/pci.c b/drivers/pci.c
index 265ab0c..672dcd0 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -1494,6 +1494,7 @@ static void ob_configure_pci_bridge(pci_addr addr,
/* Set the base limit registers */
pci_config_write16(addr, PCI_MEMORY_BASE, ((*mem_base >> 16) & ~(0xf)));
+ pci_config_write16(addr, PCI_IO_BASE_UPPER, (*io_base >> 16));
pci_config_write8(addr, PCI_IO_BASE, ((*io_base >> 8) & ~(0xf)));
/* Always ensure legacy ioports are accessible during enumeration.
@@ -1501,6 +1502,7 @@ static void ob_configure_pci_bridge(pci_addr addr,
the configuration process, so we allow them during the secondary
bus scan and then set the correct IO limit below. */
io_scan_limit = *io_base + (0xffff - *io_base);
+ pci_config_write16(addr, PCI_IO_LIMIT_UPPER, (io_scan_limit >> 16));
pci_config_write8(addr, PCI_IO_LIMIT, (io_scan_limit >> 8) & ~(0xf));
/* make pci bridge parent device, prepare for recursion */
@@ -1535,6 +1537,7 @@ static void ob_configure_pci_bridge(pci_addr addr,
/* Set the limit registers */
pci_config_write16(addr, PCI_MEMORY_LIMIT, (((*mem_base - 1) >> 16) & ~(0xf)));
+ pci_config_write16(addr, PCI_IO_LIMIT_UPPER, ((*io_base - 1) >> 16));
pci_config_write8(addr, PCI_IO_LIMIT, (((*io_base - 1) >> 8) & ~(0xf)));
/* Disable unused address spaces */
diff --git a/drivers/pci.h b/drivers/pci.h
index ea70e8a..883a531 100644
--- a/drivers/pci.h
+++ b/drivers/pci.h
@@ -47,7 +47,9 @@
#define PCI_BASE_ADDR_5 0x24
#define PCI_IO_BASE 0x1c
+#define PCI_IO_BASE_UPPER 0x30
#define PCI_IO_LIMIT 0x1d
+#define PCI_IO_LIMIT_UPPER 0x32
#define PCI_MEMORY_BASE 0x20
#define PCI_MEMORY_LIMIT 0x22
--
1.7.10.4
2 years, 2 months
- 1
- 1
[PATCH] package.fs: don't reveal interposed packages
by Mark Cave-Ayland
The IEEE-1275 interpose specification suggests that interposed packages should
not be visible unless an interpose-aware Forth word is used.
Commit 247c6169 "Fix for interpose problem" realised this by converting the romvec
obp_inst2pkg() function over to use ihandle>non-interposed-phandle but didn't make
the same change to the equivalent CIF call instance-to-path (which is presumably
correct since the interpose specification also states that interposed packages are
only visible to a new instance-to-interposed-path CIF call).
Here we add a new instance-to-package word as a wrapper to
ihandle>non-interposed-phandle and update obp_inst2pkg() and instance-to-path to
use it accordingly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
arch/sparc32/romvec.c | 2 +-
forth/device/package.fs | 4 ++++
forth/system/ciface.fs | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/sparc32/romvec.c b/arch/sparc32/romvec.c
index 8757c28..7a01035 100644
--- a/arch/sparc32/romvec.c
+++ b/arch/sparc32/romvec.c
@@ -372,7 +372,7 @@ int obp_inst2pkg(int dev_desc)
int ret;
PUSH(dev_desc);
- fword("ihandle>non-interposed-phandle");
+ fword("instance-to-package");
ret = POP();
DPRINTF("obp_inst2pkg(fd 0x%x) = 0x%x\n", dev_desc, ret);
diff --git a/forth/device/package.fs b/forth/device/package.fs
index d5b52c3..3056c1d 100644
--- a/forth/device/package.fs
+++ b/forth/device/package.fs
@@ -32,6 +32,10 @@
>in.device-node @
;
+: instance-to-package ( ihandle -- phandle )
+ dup 0<> if ihandle>non-interposed-phandle then
+;
+
: ihandle>phandle ( ihandle -- phandle )
>in.device-node @
;
diff --git a/forth/system/ciface.fs b/forth/system/ciface.fs
index 85a6076..9dc433c 100644
--- a/forth/system/ciface.fs
+++ b/forth/system/ciface.fs
@@ -159,7 +159,7 @@ external
;
: instance-to-package ( ihandle -- phandle )
- ?ihandle ihandle>phandle
+ ?ihandle instance-to-package
;
: package-to-path ( buflen buf phandle -- length )
--
1.7.10.4
2 years, 2 months
- 2
- 4
[PATCH 0/6] Improve network device support (with a bit of PCI map work)
by Mark Cave-Ayland
Now that QEMU 2.10 is out, here's the next set of patches in preparation
for improving the NIC support for PPC Mac machines (sungem) and sun4u
machines (sunhme).
Also included is a little rework of the Forth ob_pci_bus_map_in() so PCI
BARs can be mapped within the various _cb C functions which is needed to
extract the MAC address from the sungem hardware and add it to the DT.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (6):
pci: move pci_decode_pci_addr() towards the top of pci.c
pci: split the PCI mapping code out of ob_pci_bus_map_in() into
ob_pci_map()
pci: add basic support for Apple SunGEM
pci: add ob_pci_unmap() to unmap PCI memory
pci: add SUN hme network device
pci: add Intel e1000 network device to PCI database
drivers/pci.c | 134 ++++++++++++++++++++++++++++++++++--------------
drivers/pci_database.c | 18 +++++++
drivers/pci_database.h | 2 +
include/drivers/pci.h | 3 ++
4 files changed, 118 insertions(+), 39 deletions(-)
--
1.7.10.4
2 years, 3 months
- 1
- 7