OpenBIOS May 2015

openbios@openbios.org

11 participants
24 discussions

[PATCH] ppc: add Adler-32 checksum capability with copyright hack
by Cormac O'Brien 28 May '15

28 May '15

This patch implements Adler-32 checksum support for compatibility with Mac OS 9. Since OS 9 is the only client known to use the Adler-32 function, we bind the copyright message needed by OS 9 when the function is called. Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com> --- arch/ppc/qemu/init.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ arch/ppc/qemu/qemu.fs | 13 ++++++++++++ 2 files changed, 68 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 4fe8b72..84a3615 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -680,6 +680,58 @@ static void ffilll(void) } } +/* + * adler32 ( adler buf len -- checksum ) + * + * Adapted from Mark Adler's original implementation (zlib license) + */ + +#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +static void adler32(void) +{ + uint32_t len = (uint32_t)POP(); + char *buf = (char *)POP(); + uint32_t adler = (uint32_t)POP(); + + if (buf == NULL) { + RET(-1); + } + + uint32_t base = 65521; + uint32_t nmax = 5552; + + uint32_t s1 = adler & 0xffff; + uint32_t s2 = (adler >> 16) & 0xffff; + + uint32_t k; + while (len > 0) { + k = (len < nmax ? len : nmax); + len -= k; + + while (k >= 16) { + DO16(buf); + buf += 16; + k -= 16; + } + if (k != 0) { + do { + s1 += *buf++; + s2 += s1; + } while (--k); + } + + s1 %= base; + s2 %= base; + } + + RET(s2 << 16 | s1); +} + void arch_of_init(void) { @@ -945,6 +997,9 @@ arch_of_init(void) /* Implementation of filll word (required by BootX) */ bind_func("filll", ffilll); + + /* Adler-32 required by Mac OS 9 */ + bind_func("(adler32)", adler32); bind_func("platform-boot", boot); bind_func("(go)", go); diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 458af1b..d2c6a4c 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -93,3 +93,16 @@ variable keyboard-phandle 0 keyboard-phandle ! :noname set-defaults ; PREPOST-initializer + +\ ------------------------------------------------------------------------- +\ Apple copyright hack +\ ------------------------------------------------------------------------- + +: adler32 ( adler buf len -- checksum ) + \ The only OS that calls this is Mac OS 9, so we take this opportunity to + \ patch in the required copyright string. + " /" find-device + " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY PURPOSES ONLY. COPYRIGHT IS HELD BY THE OPENBIOS PROJECT AND ITS CONTRIBUTORS." + encode-string " copyright" property + " (adler32)" evaluate +; -- 2.4.1

3 3

Re: [OpenBIOS] [PATCH] ppc: add Apple copyright string
by Programmingkid 24 May '15

24 May '15

On May 22, 2015, at 5:01 PM, Cormac O'Brien wrote: > Not really anything, but it's not an accurate representation of the real copyright and could be misleading. > Then it sounds like the original patch is good enough. Not too many people are going to be looking thru some node for a copyright message when they could just read the license agreement instead. > On May 22, 2015 3:36 PM, "Programmingkid" <programmingkidx(a)gmail.com> wrote: > > On May 22, 2015, at 4:48 AM, Mark Cave-Ayland wrote: > > > On 21/05/15 23:37, Alexander Graf wrote: > > > >> On 21.05.15 19:44, Cormac O'Brien wrote: > >>> On 21.05.15 12:18, Alexander Graf wrote: > >>>> This requires at least a comment saying that the copyright isn't actually on Apple's side. > >>> > >>> Any legal things to be aware of here? > >>> > >>>> Also, how much of that do they verify? > >>> > >>> As best I can tell, it verifies all of "Copyright 1983-2001 Apple > >>> Computer, Inc.", but it looks like I can add just about anything on > >>> the end. Suggestions? > >>> > >> > >> How about "Copyright 1983-2001 Apple Computer, Inc. THIS STRING IS ONLY > >> HERE BECAUSE OF MAC OS 9 COMPATIBILITY, COPYRIGHT IS WITH THE OPENBIOS > >> PROJECT AND ITS CONTRIBUTORS". > > > > We could also try some evil client detection - if we know that only > > MacOS uses the adler32 word, we could patch it to also update the > > copyright string at the root node of the device tree which won't be > > user-visible from Forth as the bootloader has already executed ;) > > What is the worst thing that could happen if we just left this string in memory?

2 1

Re: [OpenBIOS] [PATCH] ppc: add Apple copyright string
by Alexander Graf 22 May '15

22 May '15

On 21.05.15 19:44, Cormac O'Brien wrote: > On 21.05.15 12:18, Alexander Graf wrote: >> This requires at least a comment saying that the copyright isn't actually on Apple's side. > > Any legal things to be aware of here? > >> Also, how much of that do they verify? > > As best I can tell, it verifies all of "Copyright 1983-2001 Apple > Computer, Inc.", but it looks like I can add just about anything on > the end. Suggestions? > How about "Copyright 1983-2001 Apple Computer, Inc. THIS STRING IS ONLY HERE BECAUSE OF MAC OS 9 COMPATIBILITY, COPYRIGHT IS WITH THE OPENBIOS PROJECT AND ITS CONTRIBUTORS". Alex

4 5

[PATCH] ppc: add ROM node to device tree
by Cormac O'Brien 22 May '15

22 May '15

This patch adds a ROM node to the PPC device tree as is required by Mac OS 9. Based on a patch by John Arbuckle <programmingkidx(a)gmail.com> Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com> --- arch/ppc/qemu/tree.fs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index 1ed8383..47f800d 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -42,6 +42,16 @@ new-device : close ; finish-device +new-device + " rom" device-name + h# ff800000 encode-int 0 encode-int encode+ " reg" property + 1 encode-int " #address-cells" property + h# ff800000 encode-int + h# 800000 encode-int encode+ + h# ff800000 encode-int encode+ + " ranges" property +finish-device + \ ------------------------------------------------------------- \ /packages \ ------------------------------------------------------------- -- 2.4.1

3 2

[PATCH v3] ppc: add Adler-32 checksum capability
by Cormac O'Brien 21 May '15

21 May '15

This patch adds Adler-32 checksum capability as required by Mac OS 9. Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com> --- arch/ppc/qemu/init.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 4fe8b72..842fea4 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -680,6 +680,58 @@ static void ffilll(void) } } +/* + * adler32 ( adler buf len -- checksum ) + * + * Adapted from Mark Adler's original implementation (zlib license) + */ + +#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +static void adler32(void) +{ + uint32_t len = (uint32_t)POP(); + char *buf = (char *)POP(); + uint32_t adler = (uint32_t)POP(); + + if (buf == NULL) { + RET(-1); + } + + uint32_t base = 65521; + uint32_t nmax = 5552; + + uint32_t s1 = adler & 0xffff; + uint32_t s2 = (adler >> 16) & 0xffff; + + uint32_t k; + while (len > 0) { + k = (len < nmax ? len : nmax); + len -= k; + + while (k >= 16) { + DO16(buf); + buf += 16; + k -= 16; + } + if (k != 0) { + do { + s1 += *buf++; + s2 += s1; + } while (--k); + } + + s1 %= base; + s2 %= base; + } + + RET(s2 << 16 | s1); +} + void arch_of_init(void) { @@ -945,6 +997,9 @@ arch_of_init(void) /* Implementation of filll word (required by BootX) */ bind_func("filll", ffilll); + + /* Adler-32 required by Mac OS 9 */ + bind_func("adler32", adler32); bind_func("platform-boot", boot); bind_func("(go)", go); -- 2.4.1

2 1

Re: [OpenBIOS] [PATCH] ppc: add Apple copyright string
by Programmingkid 21 May '15

21 May '15

On May 21, 2015, at 1:44 PM, Cormac O'Brien wrote: > On 21.05.15 12:18, Alexander Graf wrote: >> This requires at least a comment saying that the copyright isn't actually on Apple's side. > > Any legal things to be aware of here? > >> Also, how much of that do they verify? > > As best I can tell, it verifies all of "Copyright 1983-2001 Apple > Computer, Inc.", but it looks like I can add just about anything on > the end. Suggestions? Copyright 1983-2001 Apple Computer, Inc ... just kidding

1 0

[PATCH] ppc: add Apple copyright string
by Cormac O'Brien 21 May '15

21 May '15

This patch adds an official Apple copyright string to the PPC device tree as is required by Mac OS 9. Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com> --- arch/ppc/qemu/tree.fs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index 47f800d..c3f7440 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -17,6 +17,8 @@ include config.fs [IFDEF] CONFIG_PPC64 2 [ELSE] 1 [THEN] encode-int " #address-cells" property 1 encode-int " #size-cells" property h# 05f5e100 encode-int " clock-frequency" property +" Copyright 1983-2001 Apple Computer, Inc. All Rights Reserved" encode-string + " copyright" property new-device " cpus" device-name -- 2.4.1

2 2

[PATCH] ppc: add properties to RTAS node
by Cormac O'Brien 21 May '15

21 May '15

This patch adds properties to the RTAS node to allow Mac OS 9 to continue its boot process. This is likely only a temporary fix, and the actual RTAS will need to be implemented. Signed-off-by: Cormac O'Brien <i.am.cormac.obrien(a)gmail.com> --- arch/ppc/qemu/init.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 4fe8b72..620f942 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -853,6 +853,22 @@ arch_of_init(void) size *= 2; set_property(ph, "rtas-size", (char*)&size, sizeof(size)); set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); + set_int_property(ph, "rtas-error-log-max", 0x28); + set_int_property(ph, "rtas-event-scan-rate", 0x0); + set_int_property(ph, "get-time-for-power-on", 0xabcdef1e); + set_int_property(ph, "system-reboot", 0xabcdef15); + set_int_property(ph, "power-off", 0xabcdef12); + set_int_property(ph, "set-indicator", 0xabcdef0c); + set_int_property(ph, "write-pci-config", 0xabcdef0a); + set_int_property(ph, "read-pci-config", 0xabcdef09); + set_int_property(ph, "check-exception", 0xabcdef08); + set_int_property(ph, "event-scan", 0xabcdef07); + set_int_property(ph, "set-time-for-power-on", 0xabcdef06); + set_int_property(ph, "set-time-of-day", 0xabcdef05); + set_int_property(ph, "get-time-of-day", 0xabcdef04); + set_int_property(ph, "nvram-store", 0xabcdef03); + set_int_property(ph, "nvram-fetch", 0xabcdef02); + set_int_property(ph, "restart-rtas", 0xabcdef01); } break; } -- 2.4.1

2 1

[PATCH v3] ppc: add Adler-32 checksum capability
by Cormac O'Brien 21 May '15

21 May '15

2 1

[PATCH] ppc: add Adler-32 checksum support
by Cormac O'Brien 13 May '15

13 May '15

This patch adds an Adler-32 checksum word to the Forth dictionary, as required by Mac OS 9. --- arch/ppc/qemu/init.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 4fe8b72..682d6a2 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -680,6 +680,58 @@ static void ffilll(void) } } +/* + * adler32 ( adler buf len -- checksum ) + * + * Adapted from Mark Adler's original implementation (zlib license) + */ + +#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +static void adler32(void) +{ + uint32_t len = POP(); + char *buf = POP(); + uint32_t adler = POP(); + + if (buf == NULL) { + RET(-1); + } + + uint32_t base = 65521; + uint32_t nmax = 5552; + + uint32_t s1 = adler & 0xffff; + uint32_t s2 = (adler >> 16) & 0xffff; + + uint32_t k; + while (len > 0) { + k = (len < nmax ? len : nmax); + len -= k; + + while (k >= 16) { + DO16(buf); + buf += 16; + k -= 16; + } + if (k != 0) { + do { + s1 += *buf++; + s2 += s1; + } while (--k); + } + + s1 %= base; + s2 %= base; + } + + RET(s2 << 16 | s1); +} + void arch_of_init(void) { @@ -945,6 +997,9 @@ arch_of_init(void) /* Implementation of filll word (required by BootX) */ bind_func("filll", ffilll); + + /* Adler-32 required by Mac OS 9 */ + bind_func("adler32", adler32); bind_func("platform-boot", boot); bind_func("(go)", go); -- 2.3.6

3 4