Index: arch/ppc32/Makefile.inc =================================================================== --- arch/ppc32/Makefile.inc (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/Makefile.inc (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,38 @@ +# +# Copyright (C) 2006 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +build: image.boot + +image.boot: kernel + make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) + +clean: clean_kernel + make -C arch/$(ARCH)/loader clean + -rm -f image.boot + +arch_distclean: distclean_kernel Index: arch/ppc32/loader/Makefile =================================================================== --- arch/ppc32/loader/Makefile (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/Makefile (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,69 @@ +# +# Copyright (C) 2006 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +## Toolchain configuration +# + +TARGET = ppc-linux-gnu +TOOLCHAIN_DIR = /usr/local/ppc/bin + +ifeq ($(COMPILER),native) + CC = gcc + AS = as + LD = ld + OBJCOPY = objcopy + OBJDUMP = objdump +else + CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc + AS = $(TOOLCHAIN_DIR)/$(TARGET)-as + LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld + OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy + OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump +endif + +CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 + +SOURCES = \ + main.c \ + ofw.c \ + printf.c \ + boot.S + +OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) + +loader.bin: $(OBJECTS) + $(LD) -no-check-sections -N -T _link.ld $(OBJECTS) -o $@ + +clean: + -rm -f $(OBJECTS) loader.bin + +%.o: %.S + $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@ + +%.o: %.c + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ Index: arch/ppc32/loader/_link.ld =================================================================== --- arch/ppc32/loader/_link.ld (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/_link.ld (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,22 @@ +/* + * PPC linker script + * + */ + +OUTPUT_FORMAT(elf32-powerpc) +ENTRY(start) + +SECTIONS { + .image 0x80000000: AT (0x80000000) { + *(BOOTSTRAP) + *(.text); + + *(.rodata); + *(.rodata.*); + *(.data); /* initialized data */ + *(.sdata); + *(.sdata2); + *(.sbss); + *(.bss); /* uninitialized static variables */ + } +} Index: arch/ppc32/loader/boot.S =================================================================== --- arch/ppc32/loader/boot.S (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/boot.S (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,42 @@ +# +# Copyright (C) 2005 Martin Decky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +#include "regname.h" + +.section BOOTSTRAP + +.global start + +start: + lis r4, ofw@ha + addi r4, r4, ofw@l + stw r5, 0(r4) + + bl init + + b bootstrap Index: arch/ppc32/loader/main.c =================================================================== --- arch/ppc32/loader/main.c (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/main.c (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "main.h" +#include "printf.h" +#include "ofw.h" + +static void halt(void) +{ + while (1); +} + +void bootstrap(void) +{ + printf("\nHelenOS PPC Bootloader\nKernel size %d, load address %L\n", kernel_size, kernel_load_address); + + void *addr = ofw_claim((void *) kernel_load_address, kernel_size, 1); + if (addr == NULL) { + printf("Error: Unable to claim memory"); + halt(); + } + + halt(); +} Index: arch/ppc32/loader/main.h =================================================================== --- arch/ppc32/loader/main.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/main.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __MAIN_H__ +#define __MAIN_H__ + +extern unsigned int kernel_size; +extern void *kernel_load_address; +extern void bootstrap(void); + +#endif Index: arch/ppc32/loader/ofw.c =================================================================== --- arch/ppc32/loader/ofw.c (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/ofw.c (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "ofw.h" + +ofw_entry ofw; + +phandle ofw_chosen; +ihandle ofw_stdout; + + +void init(void) +{ + ofw_chosen = ofw_find_device("/chosen"); + if (ofw_chosen == -1) + ofw_call("exit", 0, 0); + + if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, sizeof(ofw_stdout)) <= 0) + ofw_stdout = 0; +} + + +int ofw_call(const char *service, const int nargs, const int nret, ...) +{ + va_list list; + ofw_args_t args; + int i; + + args.service = service; + args.nargs = nargs; + args.nret = nret; + + va_start(list, nret); + for (i = 0; i < nargs; i++) + args.args[i] = va_arg(list, ofw_arg_t); + va_end(list); + + for (i = 0; i < nret; i++) + args.args[i + nargs] = 0; + + ofw(&args); + + return args.args[nargs]; +} + + +void ofw_write(const char *str, const int len) +{ + if (ofw_stdout == 0) + return; + + ofw_call("write", 3, 1, ofw_stdout, str, len); +} + + +void ofw_puts(const char *str) +{ + int len = 0; + + while (str[len] != 0) + len++; + + ofw_write(str, len); +} + + +phandle ofw_find_device(const char *name) +{ + return ofw_call("finddevice", 1, 1, name); +} + + +int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen) +{ + return ofw_call("getprop", 4, 1, device, name, buf, buflen); +} + + +void *ofw_claim(const void *addr, const int size, const int align) +{ + return (void *) ofw_call("claim", 3, 1, addr, size, align); +} Index: arch/ppc32/loader/ofw.h =================================================================== --- arch/ppc32/loader/ofw.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/ofw.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __OFW_H__ +#define __OFW_H__ + +#define NULL 0 +#define MAX_OFW_ARGS 10 + +typedef __builtin_va_list va_list; + +#define va_start(ap, last) __builtin_va_start(ap, last) +#define va_arg(ap, type) __builtin_va_arg(ap, type) +#define va_end(ap) __builtin_va_end(ap) + +typedef unsigned int ofw_arg_t; +typedef unsigned int ihandle; +typedef unsigned int phandle; + +/** OpenFirmware command structure + * + */ +typedef struct { + const char *service; /**< Command name */ + unsigned int nargs; /**< Number of in arguments */ + unsigned int nret; /**< Number of out arguments */ + ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */ +} ofw_args_t; + +typedef void (*ofw_entry)(ofw_args_t *); + +extern void init(void); +extern int ofw_call(const char *service, const int nargs, const int nret, ...); +extern void ofw_write(const char *str, const int len); +extern void ofw_puts(const char *str); +extern void *ofw_claim(const void *addr, const int size, const int align); +extern phandle ofw_find_device(const char *name); +extern int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen); + +#endif Index: arch/ppc32/loader/printf.c =================================================================== --- arch/ppc32/loader/printf.c (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/printf.c (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,230 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "printf.h" +#include "ofw.h" + +static char digits[] = "0123456789abcdef"; /**< Hexadecimal characters */ + + +/** Print hexadecimal digits + * + * Print fixed count of hexadecimal digits from + * the number num. The digits are printed in + * natural left-to-right order starting with + * the width-th digit. + * + * @param num Number containing digits. + * @param width Count of digits to print. + * + */ +static void print_fixed_hex(const __u64 num, const int width) +{ + int i; + + for (i = width * 8 - 4; i >= 0; i -= 4) + ofw_write(digits + ((num >> i) & 0xf), 1); +} + + +/** Print number in given base + * + * Print significant digits of a number in given + * base. + * + * @param num Number to print. + * @param base Base to print the number in (should + * be in range 2 .. 16). + * + */ +static void print_number(const __native num, const unsigned int base) +{ + int val = num; + char d[sizeof(__native) * 8 + 1]; /* this is good enough even for base == 2 */ + int i = sizeof(__native) * 8 - 1; + + do { + d[i--] = digits[val % base]; + } while (val /= base); + + d[sizeof(__native) * 8] = 0; + ofw_puts(&d[i + 1]); +} + + +/** General formatted text print + * + * Print text formatted according the fmt parameter + * and variant arguments. Each formatting directive + * begins with \% (percentage) character and one of the + * following character: + * + * \% Prints the percentage character. + * + * s The next variant argument is treated as char* + * and printed as a NULL terminated string. + * + * c The next variant argument is treated as a single char. + * + * p The next variant argument is treated as a maximum + * bit-width integer with respect to architecture + * and printed in full hexadecimal width. + * + * P As with 'p', but '0x' is prefixed. + * + * q The next variant argument is treated as a 64b integer + * and printed in full hexadecimal width. + * + * Q As with 'q', but '0x' is prefixed. + * + * l The next variant argument is treated as a 32b integer + * and printed in full hexadecimal width. + * + * L As with 'l', but '0x' is prefixed. + * + * w The next variant argument is treated as a 16b integer + * and printed in full hexadecimal width. + * + * W As with 'w', but '0x' is prefixed. + * + * b The next variant argument is treated as a 8b integer + * and printed in full hexadecimal width. + * + * B As with 'b', but '0x' is prefixed. + * + * d The next variant argument is treated as integer + * and printed in standard decimal format (only significant + * digits). + * + * x The next variant argument is treated as integer + * and printed in standard hexadecimal format (only significant + * digits). + * + * X As with 'x', but '0x' is prefixed. + * + * All other characters from fmt except the formatting directives + * are printed in verbatim. + * + * @param fmt Formatting NULL terminated string. + */ +void printf(const char *fmt, ...) +{ + int i = 0; + va_list ap; + char c; + + va_start(ap, fmt); + + while ((c = fmt[i++])) { + switch (c) { + + /* control character */ + case '%': + + switch (c = fmt[i++]) { + + /* percentile itself */ + case '%': + break; + + /* + * String and character conversions. + */ + case 's': + ofw_puts(va_arg(ap, char_ptr)); + goto loop; + + case 'c': + c = (char) va_arg(ap, int); + break; + + /* + * Hexadecimal conversions with fixed width. + */ + case 'P': + ofw_puts("0x"); + case 'p': + print_fixed_hex(va_arg(ap, __native), sizeof(__native)); + goto loop; + + case 'Q': + ofw_puts("0x"); + case 'q': + print_fixed_hex(va_arg(ap, __u64), INT64); + goto loop; + + case 'L': + ofw_puts("0x"); + case 'l': + print_fixed_hex(va_arg(ap, __native), INT32); + goto loop; + + case 'W': + ofw_puts("0x"); + case 'w': + print_fixed_hex(va_arg(ap, __native), INT16); + goto loop; + + case 'B': + ofw_puts("0x"); + case 'b': + print_fixed_hex(va_arg(ap, __native), INT8); + goto loop; + + /* + * Decimal and hexadecimal conversions. + */ + case 'd': + print_number(va_arg(ap, __native), 10); + goto loop; + + case 'X': + ofw_puts("0x"); + case 'x': + print_number(va_arg(ap, __native), 16); + goto loop; + + /* + * Bad formatting. + */ + default: + goto out; + } + + default: + ofw_write(&c, 1); + } + +loop: + ; + } + +out: + + va_end(ap); +} Index: arch/ppc32/loader/printf.h =================================================================== --- arch/ppc32/loader/printf.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/printf.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __PRINTF_H__ +#define __PRINTF_H__ + +#define INT8 1 +#define INT16 2 +#define INT32 4 +#define INT64 8 + +typedef signed char __s8; + +typedef unsigned char __u8; +typedef unsigned short __u16; +typedef unsigned long __u32; +typedef long long __u64; + +typedef __u32 __address; +typedef __u32 __native; + +typedef char *char_ptr; + +void printf(const char *fmt, ...); + +#endif Index: arch/ppc32/loader/regname.h =================================================================== --- arch/ppc32/loader/regname.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) +++ arch/ppc32/loader/regname.h (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -0,0 +1,192 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __ppc32_REGNAME_H__ +#define __ppc32_REGNAME_H__ + +/* Condition Register Bit Fields */ +#define cr0 0 +#define cr1 1 +#define cr2 2 +#define cr3 3 +#define cr4 4 +#define cr5 5 +#define cr6 6 +#define cr7 7 + +/* General Purpose Registers (GPRs) */ +#define r0 0 +#define r1 1 +#define r2 2 +#define r3 3 +#define r4 4 +#define r5 5 +#define r6 6 +#define r7 7 +#define r8 8 +#define r9 9 +#define r10 10 +#define r11 11 +#define r12 12 +#define r13 13 +#define r14 14 +#define r15 15 +#define r16 16 +#define r17 17 +#define r18 18 +#define r19 19 +#define r20 20 +#define r21 21 +#define r22 22 +#define r23 23 +#define r24 24 +#define r25 25 +#define r26 26 +#define r27 27 +#define r28 28 +#define r29 29 +#define r30 30 +#define r31 31 + +/* GPR Aliases */ +#define sp 1 + +/* Floating Point Registers (FPRs) */ +#define fr0 0 +#define fr1 1 +#define fr2 2 +#define fr3 3 +#define fr4 4 +#define fr5 5 +#define fr6 6 +#define fr7 7 +#define fr8 8 +#define fr9 9 +#define fr10 10 +#define fr11 11 +#define fr12 12 +#define fr13 13 +#define fr14 14 +#define fr15 15 +#define fr16 16 +#define fr17 17 +#define fr18 18 +#define fr19 19 +#define fr20 20 +#define fr21 21 +#define fr22 22 +#define fr23 23 +#define fr24 24 +#define fr25 25 +#define fr26 26 +#define fr27 27 +#define fr28 28 +#define fr29 29 +#define fr30 30 +#define fr31 31 + +#define vr0 0 +#define vr1 1 +#define vr2 2 +#define vr3 3 +#define vr4 4 +#define vr5 5 +#define vr6 6 +#define vr7 7 +#define vr8 8 +#define vr9 9 +#define vr10 10 +#define vr11 11 +#define vr12 12 +#define vr13 13 +#define vr14 14 +#define vr15 15 +#define vr16 16 +#define vr17 17 +#define vr18 18 +#define vr19 19 +#define vr20 20 +#define vr21 21 +#define vr22 22 +#define vr23 23 +#define vr24 24 +#define vr25 25 +#define vr26 26 +#define vr27 27 +#define vr28 28 +#define vr29 29 +#define vr30 30 +#define vr31 31 + +#define evr0 0 +#define evr1 1 +#define evr2 2 +#define evr3 3 +#define evr4 4 +#define evr5 5 +#define evr6 6 +#define evr7 7 +#define evr8 8 +#define evr9 9 +#define evr10 10 +#define evr11 11 +#define evr12 12 +#define evr13 13 +#define evr14 14 +#define evr15 15 +#define evr16 16 +#define evr17 17 +#define evr18 18 +#define evr19 19 +#define evr20 20 +#define evr21 21 +#define evr22 22 +#define evr23 23 +#define evr24 24 +#define evr25 25 +#define evr26 26 +#define evr27 27 +#define evr28 28 +#define evr29 29 +#define evr30 30 +#define evr31 31 + +/* Special Purpose Registers (SPRs) */ +#define xer 1 +#define lr 8 +#define ctr 9 +#define dec 22 +#define srr0 26 +#define srr1 27 +#define sprg0 272 +#define sprg1 273 +#define sprg2 274 +#define sprg3 275 +#define prv 287 + +#endif Index: boot.config =================================================================== --- boot.config (revision 9d2c946cbd7a61073bcaec35949a49215d8f0ca9) +++ boot.config (revision 3c1dec0e017b0b1e20c70e66b35d74c3eab72867) @@ -5,3 +5,10 @@ @ "amd64" AMD64/Intel EM64T @ "sparc64" Sun UltraSPARC +@ "ppc32" PowerPC 32-bit ! ARCH (choice) + +# PPC32 Compiler +@ "cross" Cross-compiler +@ "native" Native +! [ARCH=ppc32] PPC32_COMPILER (choice) +% [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER