OpenBIOS September 2009

openbios@openbios.org

5 participants
19 discussions

r582 - in trunk/openbios-devel/forth: admin device
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 06:20:48 +0200 (Sun, 20 Sep 2009) New Revision: 582 Modified: trunk/openbios-devel/forth/admin/devices.fs trunk/openbios-devel/forth/device/pathres.fs Log: According to IEEE Std 1275-1994, "CORE REQUIREMENTS AND PRACTICES", Annexe H.8, "User interface name changes", "select-dev" and "unselect-dev" have been obsoleted and replaced by "open-dev" and "device-end". But some scripts (like BootX) are using the obsoleted name, so we need to define them. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/admin/devices.fs =================================================================== --- trunk/openbios-devel/forth/admin/devices.fs 2009-09-19 21:44:05 UTC (rev 581) +++ trunk/openbios-devel/forth/admin/devices.fs 2009-09-20 04:20:48 UTC (rev 582) @@ -45,6 +45,10 @@ : device-end ( -- ) 0 active-package! ; + +: unselect-dev ( -- ) + device-end +; : ?active-package ( -- phandle ) active-package dup 0= abort" no active device" Modified: trunk/openbios-devel/forth/device/pathres.fs =================================================================== --- trunk/openbios-devel/forth/device/pathres.fs 2009-09-19 21:44:05 UTC (rev 581) +++ trunk/openbios-devel/forth/device/pathres.fs 2009-09-20 04:20:48 UTC (rev 582) @@ -471,6 +471,10 @@ ( ihandle ) ; +: select-dev ( dev-str dev-len -- ihandle | 0 ) + open-dev +; + : execute-device-method ( ... dev-str dev-len met-str met-len -- ... false | ?? true ) 2swap

1 0

r581 - in trunk/openbios-devel: forth/debugging include/openbios modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 23:44:05 +0200 (Sat, 19 Sep 2009) New Revision: 581 Added: trunk/openbios-devel/include/openbios/xcoff.h trunk/openbios-devel/modules/xcoff-loader.c Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c trunk/openbios-devel/modules/modules.h Log: Implements XCOFF loader (to be able to boot Apple BootX bootloader) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-19 21:44:05 UTC (rev 581) @@ -180,6 +180,7 @@ ; variable elf-entry +variable xcoff-entry : init-program-elf elf file-type ! @@ -302,9 +303,19 @@ elf file-type @ = if [IFDEF] CONFIG_PPC elf-entry @ " (go)" evaluate +[ELSE] + ." go is not yet implemented" [THEN] else - ." go is not yet implemented" + xcoff file-type @ = if +[IFDEF] CONFIG_PPC + xcoff-entry @ " (go)" evaluate +[ELSE] + ." go is not yet implemented" +[THEN] + else + ." go is not yet implemented" + then then ; Added: trunk/openbios-devel/include/openbios/xcoff.h =================================================================== --- trunk/openbios-devel/include/openbios/xcoff.h (rev 0) +++ trunk/openbios-devel/include/openbios/xcoff.h 2009-09-19 21:44:05 UTC (rev 581) @@ -0,0 +1,98 @@ +#ifndef XCOFF_H +#define XCOFF_H + +/* XCOFF executable loader */ + +typedef struct COFF_filehdr_t { + uint16_t f_magic; /* magic number */ + uint16_t f_nscns; /* number of sections */ + uint32_t f_timdat; /* time & date stamp */ + uint32_t f_symptr; /* file pointer to symtab */ + uint32_t f_nsyms; /* number of symtab entries */ + uint16_t f_opthdr; /* sizeof(optional hdr) */ + uint16_t f_flags; /* flags */ +} COFF_filehdr_t; + +/* IBM RS/6000 */ + +#define U802WRMAGIC 0x02DA /* writeable text segments **chh** */ +#define U802ROMAGIC 0x02DF /* readonly sharable text segments */ +#define U802TOCMAGIC 0x02E1 /* readonly text segments and TOC */ +#define U802TOMAGIC 0x01DF + +/* + * Bits for f_flags: + * + * F_RELFLG relocation info stripped from file + * F_EXEC file is executable (i.e. no unresolved external + * references) + * F_LNNO line numbers stripped from file + * F_LSYMS local symbols stripped from file + * F_MINMAL this is a minimal object file (".m") output of fextract + * F_UPDATE this is a fully bound update file, output of ogen + * F_SWABD this file has had its bytes swabbed (in names) + * F_AR16WR this file has the byte ordering of an AR16WR + * (e.g. 11/70) machine + * F_AR32WR this file has the byte ordering of an AR32WR machine + * (e.g. vax and iNTEL 386) + * F_AR32W this file has the byte ordering of an AR32W machine + * (e.g. 3b,maxi) + * F_PATCH file contains "patch" list in optional header + * F_NODF (minimal file only) no decision functions for + * replaced functions + */ + +#define COFF_F_RELFLG 0000001 +#define COFF_F_EXEC 0000002 +#define COFF_F_LNNO 0000004 +#define COFF_F_LSYMS 0000010 +#define COFF_F_MINMAL 0000020 +#define COFF_F_UPDATE 0000040 +#define COFF_F_SWABD 0000100 +#define COFF_F_AR16WR 0000200 +#define COFF_F_AR32WR 0000400 +#define COFF_F_AR32W 0001000 +#define COFF_F_PATCH 0002000 +#define COFF_F_NODF 0002000 + +typedef struct COFF_aouthdr_t { + uint16_t magic; /* type of file */ + uint16_t vstamp; /* version stamp */ + uint32_t tsize; /* text size in bytes, padded to FW bdry */ + uint32_t dsize; /* initialized data " " */ + uint32_t bsize; /* uninitialized data " " */ + uint32_t entry; /* entry pt. */ + uint32_t text_start; /* base of text used for this file */ + uint32_t data_start; /* base of data used for this file */ + uint32_t o_toc; /* address of TOC */ + uint16_t o_snentry; /* section number of entry point */ + uint16_t o_sntext; /* section number of .text section */ + uint16_t o_sndata; /* section number of .data section */ + uint16_t o_sntoc; /* section number of TOC */ + uint16_t o_snloader; /* section number of .loader section */ + uint16_t o_snbss; /* section number of .bss section */ + uint16_t o_algntext; /* .text alignment */ + uint16_t o_algndata; /* .data alignment */ + uint16_t o_modtype; /* module type (??) */ + uint16_t o_cputype; /* cpu type */ + uint32_t o_maxstack; /* max stack size (??) */ + uint32_t o_maxdata; /* max data size (??) */ + char o_resv2[12]; /* reserved */ +} COFF_aouthdr_t; + +#define AOUT_MAGIC 0x010b + +typedef struct COFF_scnhdr_t { + char s_name[8]; /* section name */ + uint32_t s_paddr; /* physical address, aliased s_nlib */ + uint32_t s_vaddr; /* virtual address */ + uint32_t s_size; /* section size */ + uint32_t s_scnptr; /* file ptr to raw data for section */ + uint32_t s_relptr; /* file ptr to relocation */ + uint32_t s_lnnoptr; /* file ptr to line numbers */ + uint16_t s_nreloc; /* number of relocation entries */ + uint16_t s_nlnno; /* number of line number entries */ + uint32_t s_flags; /* flags */ +} COFF_scnhdr_t; + +#endif /* XCOFF_H */ Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/modules/build.xml 2009-09-19 21:44:05 UTC (rev 581) @@ -25,6 +25,7 @@ <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ofmem_common.c" condition="OFMEM"/> <object source="elf-loader.c" condition="PPC"/> + <object source="xcoff-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/modules/init.c 2009-09-19 21:44:05 UTC (rev 581) @@ -44,5 +44,6 @@ #endif #ifdef CONFIG_PPC elf_loader_init(); + xcoff_loader_init(); #endif } Modified: trunk/openbios-devel/modules/modules.h =================================================================== --- trunk/openbios-devel/modules/modules.h 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/modules/modules.h 2009-09-19 21:44:05 UTC (rev 581) @@ -25,5 +25,6 @@ extern void sunparts_init( void ); extern void cmdline_init( void ); extern void elf_loader_init( void ); +extern void xcoff_loader_init( void ); #endif /* _H_MODULES */ Added: trunk/openbios-devel/modules/xcoff-loader.c =================================================================== --- trunk/openbios-devel/modules/xcoff-loader.c (rev 0) +++ trunk/openbios-devel/modules/xcoff-loader.c 2009-09-19 21:44:05 UTC (rev 581) @@ -0,0 +1,140 @@ +/* + * + * <xcoff-loader.c> + * + * XCOFF file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * from original XCOFF loader by Steven Noonan <steven(a)uplinklabs.net> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "modules.h" +#include "ofmem.h" + +#include "openbios/xcoff.h" + +//#define DEBUG_XCOFF + +#ifdef DEBUG_XCOFF +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +DECLARE_NODE(xcoff_loader, INSTALL_OPEN, 0, "+/packages/xcoff-loader" ); + +#ifdef CONFIG_PPC +extern void flush_icache_range( char *start, char *stop ); +#endif + +static void +xcoff_loader_init_program( void *dummy ) +{ + char *base; + COFF_filehdr_t *fhdr; + COFF_aouthdr_t *ahdr; + COFF_scnhdr_t *shdr; + uint32_t offset; + int i; + + feval("load-base"); + base = (char*)POP(); + + fhdr = (COFF_filehdr_t*)base; + + /* Is it an XCOFF file ? */ + + if (fhdr->f_magic != U802WRMAGIC && + fhdr->f_magic != U802ROMAGIC && + fhdr->f_magic != U802TOCMAGIC && + fhdr->f_magic != U802TOMAGIC) { + DPRINTF("Not a XCOFF file %02x\n", fhdr->f_magic); + return; + } + + /* Is it executable ? */ + + if (fhdr->f_magic != 0x01DF && + (fhdr->f_flags & COFF_F_EXEC) == 0) { + DPRINTF("Not an executable XCOFF file %02x\n", fhdr->f_flags); + return; + } + + /* Optional header is a.out ? */ + + if (fhdr->f_opthdr != sizeof(COFF_aouthdr_t)) { + DPRINTF("AOUT optional error size mismatch in XCOFF file\n"); + return; + } + + ahdr = (COFF_aouthdr_t*)(base + sizeof(COFF_filehdr_t)); + + /* check a.out magic number */ + + if (ahdr->magic != AOUT_MAGIC) { + DPRINTF("Invalid AOUT optional header\n"); + return; + } + + offset = sizeof(COFF_filehdr_t) + sizeof(COFF_aouthdr_t); + + DPRINTF("XCOFF file with %d sections\n", fhdr->f_nscns); + + for (i = 0; i < fhdr->f_nscns; i++) { + + DPRINTF("Read header at offset %0x\n", offset); + + shdr = (COFF_scnhdr_t*)(base + offset); + + DPRINTF("Initializing '%s' section from %0x %0x to %0x (%0x)\n", + shdr->s_name, offset, shdr->s_scnptr, + shdr->s_vaddr, shdr->s_size); + + if (strcmp(shdr->s_name, ".text") == 0) { + + memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + shdr->s_size); +#ifdef CONFIG_PPC + flush_icache_range((char*)shdr->s_vaddr, + (char*)(shdr->s_vaddr + shdr->s_size)); +#endif + } else if (strcmp(shdr->s_name, ".data") == 0) { + + memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + shdr->s_size); + + } else if (strcmp(shdr->s_name, ".bss") == 0) { + + memset((void *)shdr->s_vaddr, 0, shdr->s_size); + + } else { + DPRINTF(" Skip '%s' section\n", shdr->s_name); + } + offset += sizeof(COFF_scnhdr_t); + } + + /* FIXME: should initialize saved-program-state. */ + + DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); + PUSH(*(uint32_t*)ahdr->entry); + feval("xcoff-entry !"); +} + +NODE_METHODS( xcoff_loader ) = { + { "init-program", xcoff_loader_init_program }, +}; + +void xcoff_loader_init( void ) +{ + REGISTER_NODE( xcoff_loader ); +}

1 0

r580 - trunk/openbios-devel/modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 01:32:59 +0200 (Sat, 19 Sep 2009) New Revision: 580 Modified: trunk/openbios-devel/modules/init.c Log: call elf_loader_init() only for PPC Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-18 23:01:28 UTC (rev 579) +++ trunk/openbios-devel/modules/init.c 2009-09-18 23:32:59 UTC (rev 580) @@ -42,5 +42,7 @@ #ifdef CONFIG_SUN_PARTS sunparts_init(); #endif +#ifdef CONFIG_PPC elf_loader_init(); +#endif }

1 0

r579 - trunk/openbios-devel/modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 01:01:28 +0200 (Sat, 19 Sep 2009) New Revision: 579 Added: trunk/openbios-devel/modules/elf-loader.c Log: Add missing file from r578 Added: trunk/openbios-devel/modules/elf-loader.c =================================================================== --- trunk/openbios-devel/modules/elf-loader.c (rev 0) +++ trunk/openbios-devel/modules/elf-loader.c 2009-09-18 23:01:28 UTC (rev 579) @@ -0,0 +1,90 @@ +/* + * + * <elf-loader.c> + * + * ELF file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * Some parts Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "modules.h" +#include "ofmem.h" + +#include "openbios/elf.h" +#include "asm/elf.h" + +/* TODO: manage ELF notes section */ + +//#define DEBUG_ELF + +#ifdef DEBUG_ELF +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +DECLARE_NODE(elf_loader, INSTALL_OPEN, 0, "+/packages/elf-loader" ); + +#ifdef CONFIG_PPC +extern void flush_icache_range( char *start, char *stop ); +#endif + +static void +elf_loader_init_program( void *dummy ) +{ + char *base; + int i; + Elf_ehdr *ehdr; + Elf_phdr *phdr; + size_t size; + char *addr; + + feval("load-base"); + base = (char*)POP(); + + ehdr = (Elf_ehdr *)base; + phdr = (Elf_phdr *)(base + ehdr->e_phoff); + + for (i = 0; i < ehdr->e_phnum; i++) { + DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX " + "p_vaddr %08lX\n", + (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, + (ulong)phdr[i].p_offset, (ulong)phdr[i].p_vaddr ); + + size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); + if (!size) + continue; + if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { + printk("Claim failed!\n"); + return; + } + addr = (char*)phdr[i].p_vaddr; + memcpy(addr, base + phdr[i].p_offset, size); +#ifdef CONFIG_PPC + flush_icache_range( addr, addr + size ); +#endif + } + /* FIXME: should initialize saved-program-state. */ + PUSH(ehdr->e_entry); + feval("elf-entry !"); +} + +NODE_METHODS( elf_loader ) = { + { "init-program", elf_loader_init_program }, +}; + +void elf_loader_init( void ) +{ + REGISTER_NODE( elf_loader ); +}

1 0

r578 - in trunk/openbios-devel: arch/ppc/qemu forth/debugging modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 00:59:30 +0200 (Sat, 19 Sep 2009) New Revision: 578 Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c trunk/openbios-devel/modules/modules.h Log: Allows to boot openSUSE from install CD-ROM Implements "init-program" using loader packages Write a first loader package: elf-loader Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-09-18 22:59:30 UTC (rev 578) @@ -439,6 +439,18 @@ for (;;); } +static void go( void ); + +static void +go( void ) +{ + ucell addr; + + addr = POP(); + + call_elf( 0, 0, addr); +} + void arch_of_init( void ) { @@ -688,4 +700,5 @@ device_end(); bind_func("platform-boot", boot ); + bind_func("(go)", go); } Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-18 22:59:30 UTC (rev 578) @@ -23,8 +23,268 @@ : load-size file-size @ ; +variable file-type + +0 constant elf +1 constant bootinfo +2 constant xcoff +3 constant pe + +\ Array indexes and values for e_type + +d# 16 constant EI_NIDENT + +0 constant EI_MAG0 + h# 7f constant ELFMAG0 + +1 constant EI_MAG1 + [CHAR] E constant ELFMAG1 + +2 constant EI_MAG2 + [CHAR] L constant ELFMAG2 + +3 constant EI_MAG3 + [CHAR] F constant ELFMAG3 + +4 constant EI_CLASS + 0 constant ELFCLASSNONE + 1 constant ELFCLASS32 + 2 constant ELFCLASS64 + +5 constant EI_DATA + 0 constant ELFDATANONE + 1 constant ELFDATA2LSB + 2 constant ELFDATA2MSB + +6 constant EI_VERSION + 0 constant EV_NONE + 1 constant EV_CURRENT + +\ Values for e_type + +0 constant ET_NONE +1 constant ET_REL +2 constant ET_EXEC +3 constant ET_DYN +4 constant ET_CORE + +\ Values for e_machine + +d# 2 constant EM_SPARC +d# 3 constant EM_386 +d# 6 constant EM_486 +d# 18 constant EM_SPARC32PLUS +d# 20 constant EM_PPC +d# 43 constant EM_SPARCV9 + +/l constant Elf32_Addr +/w constant Elf32_Half +/l constant Elf32_Off +/l constant Elf32_Sword +/l constant Elf32_Word +/l constant Elf32_Size + +struct ( ELF header ) + EI_NIDENT field >Elf32_Ehdr.e_ident ( File identification ) + Elf32_Half field >Elf32_Ehdr.e_type ( File type ) + Elf32_Half field >Elf32_Ehdr.e_machine ( Machine archicture ) + Elf32_Word field >Elf32_Ehdr.e_version ( ELF format version ) + Elf32_Addr field >Elf32_Ehdr.e_entry ( Entry point ) + Elf32_Off field >Elf32_Ehdr.e_phoff ( Program header file offset ) + Elf32_Off field >Elf32_Ehdr.e_shoff ( Section header file offset ) + Elf32_Word field >Elf32_Ehdr.e_flags ( Architecture specific flags ) + Elf32_Half field >Elf32_Ehdr.e_ehsize ( Size of ELF header in bytes ) + Elf32_Half field >Elf32_Ehdr.e_phentsize ( Size of program header entries ) + Elf32_Half field >Elf32_Ehdr.e_phnum ( Number of program header entry ) + Elf32_Half field >Elf32_Ehdr.e_shentsize ( Size of section header entry ) + Elf32_Half field >Elf32_Ehdr.e_shnum ( Number of section header entries ) + Elf32_Half field >Elf32_Ehdr.e_shstrndx ( Section name strings section ) +constant /Elf32_Ehdr + +: @e_ident ( base index -- byte ) + swap >Elf32_Ehdr.e_ident + c@ +; + +: @e_type ( base -- type ) + >Elf32_Ehdr.e_type w@ +; + +: @e_machine ( base -- type ) + >Elf32_Ehdr.e_machine w@ +; + +: @e_entry ( base -- entry ) + >Elf32_Ehdr.e_entry l@ +; + +: @e_phoff ( base -- poffset ) + >Elf32_Ehdr.e_phoff l@ +; + +: @e_phnum ( base -- pnum ) + >Elf32_Ehdr.e_phnum w@ +; + +: elf? + " load-base" evaluate + dup EI_MAG0 @e_ident + ELFMAG0 <> if drop false exit then + dup EI_MAG1 @e_ident + ELFMAG1 <> if drop false exit then + dup EI_MAG2 @e_ident + ELFMAG2 <> if drop false exit then + dup EI_MAG3 @e_ident + ELFMAG3 <> if drop false exit then + dup EI_CLASS @e_ident +[IFDEF] CONFIG_SPARC64 + ELFCLASS64 <> if drop false exit then +[ELSE] + ELFCLASS32 <> if drop false exit then +[THEN] + dup EI_DATA @e_ident + " little-endian?" evaluate if + ELFDATA2LSB <> if drop false exit then + else + ELFDATA2MSB <> if drop false exit then + then + dup @e_type + ET_EXEC <> if drop false exit then ( not executable ) + @e_machine +[IFDEF] CONFIG_PPC + EM_PPC <> if false exit then +[THEN] +[IFDEF] CONFIG_X86 + dup + EM_386 <> if + EM_486 <> if + false exit + then + else + drop + then +[THEN] +[IFDEF] CONFIG_SPARC32 + dup + EM_SPARC <> if + EM_SPARC32PLUS <> if + false exit + then + else + drop + then +[THEN] +[IFDEF] CONFIG_SPARC64 + EM_SPARCV9 <> if false exit then +[THEN] + true + ; + +variable elf-entry + +: init-program-elf + elf file-type ! + " /packages/elf-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/elf-loader is missing" cr + then +; + +: xcoff? + " load-base" evaluate w@ + h# 1df <> if + false + exit + then + true + ; + +: init-program-xcoff + xcoff file-type ! + " /packages/xcoff-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/xcoff-loader is missing" cr + then + ; + +: pe? + false +; + +: init-program-pe + pe file-type ! + " /packages/pe-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/pe-loader is missing" cr + then + ; + +: bootinfo? + " load-base" evaluate dup + " <CHRP-BOOT>" comp 0= if + drop + true + exit + then + " <chrp-boot>" comp 0= if + true + exit + then + false + ; + +: init-program-bootinfo + bootinfo file-type ! + " /packages/bootinfo-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/bootinfo-loader is missing" cr + then + ; + +: init-program ( -- ) + elf? if + init-program-elf + exit + then + xcoff? if + init-program-xcoff + exit + then + pe? if + init-program-pe + exit + then + bootinfo? if + init-program-bootinfo + exit + then + ; + +: encode-bootpath ( str len -- ) + \ FIXME: need to extract bootargs from bootpath and set it in /chosen + " /chosen" (find-dev) if + " bootpath" rot (property) + then +; + : load ( "{params}<cr>" -- ) linefeed parse ( str len ) + 2dup encode-bootpath open-dev ( ihandle ) dup 0= if drop @@ -35,19 +295,23 @@ dup ihandle>phandle " load" rot find-method ( xt 0|1 ) if swap call-package !load-size else cr ." Cannot find load for this package" 2drop then r> close-dev + init-program ; : go ( -- ) - ." go is not yet implemented" + elf file-type @ = if +[IFDEF] CONFIG_PPC + elf-entry @ " (go)" evaluate +[THEN] + else + ." go is not yet implemented" + then ; : state-valid ( -- a-addr ) ; -: init-program ( -- ) - ; - \ 7.6.3 Abort and resume \ already defined !? Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/modules/build.xml 2009-09-18 22:59:30 UTC (rev 578) @@ -24,6 +24,7 @@ <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ofmem_common.c" condition="OFMEM"/> + <object source="elf-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/modules/init.c 2009-09-18 22:59:30 UTC (rev 578) @@ -42,4 +42,5 @@ #ifdef CONFIG_SUN_PARTS sunparts_init(); #endif + elf_loader_init(); } Modified: trunk/openbios-devel/modules/modules.h =================================================================== --- trunk/openbios-devel/modules/modules.h 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/modules/modules.h 2009-09-18 22:59:30 UTC (rev 578) @@ -24,5 +24,6 @@ extern void pcparts_init( void ); extern void sunparts_init( void ); extern void cmdline_init( void ); +extern void elf_loader_init( void ); #endif /* _H_MODULES */

1 0

[Fwd: [coreboot] possible bug, reported on irc]
by Stefan Reinauer 08 Sep '09

08 Sep '09

2 1

r577 - trunk/openbios-devel/modules
by svn＠openbios.org 03 Sep '09

03 Sep '09

Author: laurent Date: 2009-09-03 00:25:44 +0200 (Thu, 03 Sep 2009) New Revision: 577 Modified: trunk/openbios-devel/modules/disk-label.c Log: Allow "boot hd:,%BOOT" to work again (and thus Quik). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-09-01 23:44:24 UTC (rev 576) +++ trunk/openbios-devel/modules/disk-label.c 2009-09-02 22:25:44 UTC (rev 577) @@ -79,7 +79,7 @@ /* argument format: parnum,filename */ s = path; - filename = NULL; + filename = ""; if( *s == '-' || isdigit(*s) || (*s >= 'a' && *s < ('a' + 8) && (*(s + 1) == ',' || *(s + 1) == '\0'))) { @@ -146,7 +146,7 @@ push_str( filename ); PUSH_ph( ph ); fword("interpose"); - } else if (filename && strcmp(filename, "%BOOT") != 0) { + } else if (*filename && strcmp(filename, "%BOOT") != 0) { goto out; } success = 1;

1 0

Re: [OpenBIOS] r565 - trunk/openbios-devel/modules
by Laurent Vivier 03 Sep '09

03 Sep '09

Le samedi 22 août 2009 à 08:03 +0200, svn(a)openbios.org a écrit : > Author: blueswirl > Date: 2009-08-22 08:03:40 +0200 (Sat, 22 Aug 2009) > New Revision: 565 > > Modified: > trunk/openbios-devel/modules/disk-label.c > Log: > Allow NULL dlabel path argument without accessing page zero. > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > > Modified: trunk/openbios-devel/modules/disk-label.c > =================================================================== > --- trunk/openbios-devel/modules/disk-label.c 2009-08-22 06:03:20 UTC (rev 564) > +++ trunk/openbios-devel/modules/disk-label.c 2009-08-22 06:03:40 UTC (rev 565) > @@ -57,7 +57,7 @@ > static void > dlabel_open( dlabel_info_t *di ) > { > - char *s, *filename; > + const char *s, *filename; > char *path; > char block0[512]; > phandle_t ph; > @@ -65,6 +65,9 @@ > xt_t xt; > > path = my_args_copy(); > + if (!path) { > + path = strdup(""); > + } > DPRINTF("dlabel-open '%s'\n", path ); > > /* open disk interface */ > > This patch breaks booting PPC using QUIK bootloader. Ìs it possible to revert it ? Regards, Laurent -- --------------------- laurent(a)vivier.eu ---------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 4

r576 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 02 Sep '09

02 Sep '09

Author: laurent Date: 2009-09-02 01:44:24 +0200 (Wed, 02 Sep 2009) New Revision: 576 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: Use the load method to load and execute CHRP script. This adds a better support of Apple BootX script. However, "init-program" and "go" are always missing to be able to really boot with BootX. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-30 23:39:55 UTC (rev 575) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-01 23:44:24 UTC (rev 576) @@ -39,6 +39,14 @@ #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) static void +load(const char *path) +{ + char buffer[1024]; + sprintf(buffer, "load %s", path); + feval(buffer); +} + +static void transfer_control_to_elf( ulong elf_entry ) { ELF_DPRINTF("Starting ELF boot loader\n"); @@ -235,10 +243,13 @@ static void try_chrp_script(const char *of_path, const char *param, const char *script_path) { - int fd, len, tag, taglen, script, scriptlen, entity; - char tagbuf[256], bootscript[2048], c; + int tag, taglen, script, scriptlen, entity, chrp; + char tagbuf[128], path[1024], c; char *device, *filename, *directory; int partition; + int current, size; + char *base; + char *bootscript; device = get_device(of_path); partition = get_partition(of_path); @@ -249,31 +260,39 @@ /* read boot script */ if (partition == -1) - snprintf(bootscript, sizeof(bootscript), "%s:,%s", + snprintf(path, sizeof(path), "%s:,%s", device, script_path); else - snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", + snprintf(path, sizeof(path), "%s:%d,%s", device, partition, script_path); - CHRP_DPRINTF("Trying %s\n", bootscript); - if ((fd = open_io(bootscript)) == -1) { - ELF_DPRINTF("Can't open %s\n", bootscript); + CHRP_DPRINTF("Trying %s\n", path); + load(path); + feval("load-size"); + size = POP(); + if (size == 0) { + ELF_DPRINTF("Can't open %s\n", of_path); return; } - len = read_io(fd, tagbuf, 11); - tagbuf[11] = '\0'; - if (len < 0 || strcasecmp(tagbuf, "<chrp-boot>") != 0) - goto badf; + bootscript = malloc(size); + if (bootscript == NULL) { + ELF_DPRINTF("Can't malloc %d bytes\n", size); + return; + } + feval("load-base"); + base = (char*)POP(); + chrp = 0; tag = 0; taglen = 0; script = 0; scriptlen = 0; entity = 0; - do { - len = read_io(fd, &c, 1); - if (len < 0) - goto badf; + current = 0; + while (current < size) { + + c = base[current++]; + if (c == '<') { script = 0; tag = 1; @@ -281,12 +300,27 @@ } else if (c == '>') { tag = 0; tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "boot-script") == 0) - script = 1; - else if (strcasecmp(tagbuf, "/boot-script") == 0) - bootscript[scriptlen] = '\0'; - else if (strcasecmp(tagbuf, "/chrp-boot") == 0) - break; + if (strcasecmp(tagbuf, "chrp-boot") == 0) { + chrp = 1; + } else if (chrp == 1) { + if (strcasecmp(tagbuf, "boot-script") == 0) { + script = 1; + scriptlen = 0; + } else if (strcasecmp(tagbuf, "/boot-script") == 0) { + + script = 0; + bootscript[scriptlen] = '\0'; + + CHRP_DPRINTF("got bootscript %s\n", bootscript); + + encode_bootpath(of_path, param); + + feval(bootscript); + + break; + } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + break; + } } else if (tag && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; } else if (script && c == '&') { @@ -295,7 +329,11 @@ } else if (entity && c ==';') { entity = 0; tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "device") == 0) { + if (strcasecmp(tagbuf, "lt") == 0) { + bootscript[scriptlen++] = '<'; + } else if (strcasecmp(tagbuf, "gt") == 0) { + bootscript[scriptlen++] = '>'; + } else if (strcasecmp(tagbuf, "device") == 0) { strcpy(bootscript + scriptlen, device); scriptlen += strlen(device); } else if (strcasecmp(tagbuf, "partition") == 0) { @@ -322,18 +360,12 @@ } } else if (entity && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; - } else if (script && scriptlen < sizeof(bootscript)) { + } else if (script && scriptlen < size) { bootscript[scriptlen++] = c; } - } while (1); + } - CHRP_DPRINTF("got bootscript %s\n", bootscript); - - encode_bootpath(of_path, param); - - feval(bootscript); - badf: - close_io( fd ); + free(bootscript); } #define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000)

1 0