WebSVN – HelenOS – Path Comparison – / – /branches/dynload/ Rev 4341 and /branches/dynload/ Rev 4342

Ignore whitespace Rev 4341 → Rev 4342

/branches/dynload/kernel/test/avltree/avltree1.def
1,6 → 1,6
{
"avltree1",
"Test Avl tree operations",
"Test AVL tree operations",
&test_avltree1,
true
},

 /branches/dynload/kernel/test/fpu/mips2_skip.c
 ,0 → 1,34
+/*
+ * Copyright (c) 2009 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 <test.h>
+char * test_mips2(bool quiet)
+{
+    return NULL;
+}

 /branches/dynload/kernel/test/fpu/fpu1_skip.c
 ,0 → 1,34
+/*
+ * Copyright (c) 2009 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 <test.h>
+char * test_fpu1(bool quiet)
+{
+    return NULL;
+}

 /branches/dynload/kernel/test/fpu/sse1_skip.c
 ,0 → 1,34
+/*
+ * Copyright (c) 2009 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 <test.h>
+char * test_sse1(bool quiet)
+{
+    return NULL;
+}

 /branches/dynload/kernel/test/fpu/mips2.def
 ,4 → 1,3
-#ifdef mips32
 {
     "mips2",
     "MIPS FPU test",
 ,4 → 4,3
     &test_mips2,
     true
 },
-#endif

 /branches/dynload/kernel/test/fpu/fpu1.def
 ,4 → 1,3
-#if (defined(ia32) || defined(amd64) || defined(ia64) || defined(ia32xen))
 {
     "fpu1",
     "Intel FPU test",
 ,4 → 4,3
     &test_fpu1,
     true
 },
-#endif

 /branches/dynload/kernel/test/fpu/sse1.def
 ,4 → 1,3
-#if (defined(ia32) || defined(amd64) || defined(ia32xen))
 {
     "sse1",
     "Intel SEE test",
 ,4 → 4,3
     &test_sse1,
     true
 },
-#endif

 /branches/dynload/kernel/test/fpu/mips2.c
 ,8 → 26,6
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef mips32
 #include <print.h>
 #include <debug.h>
 ,9 → 36,9
 #include <arch.h>
-#define THREADS     50
-#define DELAY       10000L
-#define ATTEMPTS        5
+#define THREADS   50
+#define DELAY     10000L
+#define ATTEMPTS  5
 static atomic_t threads_ok;
 static atomic_t threads_fault;
 ,7 → 54,7
     thread_detach(THREAD);
     waitq_sleep(&can_start);
     for (i = 0; i < ATTEMPTS; i++) {
         asm volatile (
             "mtc1 %0,$1"
 ,13 → 87,13
     thread_detach(THREAD);
     waitq_sleep(&can_start);
     for (i = 0; i < ATTEMPTS; i++) {
         asm volatile (
             "mtc1 %0,$1"
             : "=r" (arg)
         );
         scheduler();
         asm volatile (
             "mfc1 %0,$1"
 ,7 → 122,7
     if (!quiet)
         printf("Creating %u threads... ", 2 * THREADS);
     for (i = 0; i < THREADS; i++) {
         thread_t *t;
 ,5 → 160,3
     return "Test failed";
 }
-#endif

 /branches/dynload/kernel/test/fpu/fpu1.c
 ,8 → 27,6
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#if (defined(ia32) || defined(amd64) || defined(ia64) || defined(ia32xen))
 #include <print.h>
 #include <debug.h>
 ,5 → 224,3
     return "Test failed";
 }
-#endif

 /branches/dynload/kernel/test/fpu/sse1.c
 ,8 → 26,6
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#if (defined(ia32) || defined(amd64) || defined(ia32xen))
 #include <print.h>
 #include <debug.h>
 ,9 → 36,9
 #include <arch.h>
-#define THREADS     25
-#define DELAY       10000L
-#define ATTEMPTS        5
+#define THREADS   25
+#define DELAY     10000L
+#define ATTEMPTS  5
 static atomic_t threads_ok;
 static atomic_t threads_fault;
 ,5 → 160,3
     return "Test failed";
 }
-#endif

/branches/dynload/kernel/genarch/include/fb/visuals.h
44,6 → 44,7
#define VISUAL_RGB_0_8_8_8 5

#define VISUAL_BGR_0_8_8_8 6
#define VISUAL_BGR_8_8_8 7

#endif

 /branches/dynload/kernel/genarch/include/fb/fb.h
 ,7 → 49,7
      * Address where the first (top left) pixel is mapped,
      * relative to "addr".
      */
-    unsigned int offset;
+    unsigned int offset;
     /** Screen width in pixels. */
     unsigned int x;

/branches/dynload/kernel/genarch/Makefile.inc
33,39 → 33,41
genarch/src/acpi/acpi.c \
genarch/src/acpi/madt.c
endif

ifeq ($(CONFIG_PAGE_PT),y)
GENARCH_SOURCES += \
genarch/src/mm/page_pt.c \
genarch/src/mm/as_pt.c
endif

ifeq ($(CONFIG_PAGE_HT),y)
GENARCH_SOURCES += \
genarch/src/mm/page_ht.c \
genarch/src/mm/as_ht.c
endif

ifeq ($(CONFIG_ASID),y)
GENARCH_SOURCES += \
genarch/src/mm/asid.c
endif

ifeq ($(CONFIG_ASID_FIFO),y)
GENARCH_SOURCES += \
genarch/src/mm/asid_fifo.c
endif

ifeq ($(CONFIG_SOFTINT),y)
GENARCH_SOURCES += \
genarch/src/softint/division.c
endif

## Framebuffer
ifeq ($(CONFIG_FB),y)
GENARCH_SOURCES += \
genarch/src/fb/font-8x16.c \
genarch/src/fb/logo-196x66.c \
genarch/src/fb/fb.c
DEFS += -DCONFIG_FB
endif

## i8042 controller
ifeq ($(CONFIG_I8042),y)
GENARCH_SOURCES += \
genarch/src/kbd/i8042.c \
73,7 → 75,6
genarch/src/kbd/scanc_pc.c
endif

## Sun keyboard
ifeq ($(CONFIG_SUN_KBD),y)
GENARCH_SOURCES += \
genarch/src/kbd/key.c \
80,20 → 81,16
genarch/src/kbd/scanc_sun.c
endif

## z8530 controller
ifeq ($(CONFIG_Z8530),y)
GENARCH_SOURCES += \
genarch/src/kbd/z8530.c
endif

## ns16550 controller
ifeq ($(CONFIG_NS16550),y)
GENARCH_SOURCES += \
genarch/src/kbd/ns16550.c
endif


## OpenFirmware Device Tree
ifeq ($(CONFIG_OFW_TREE), y)
GENARCH_SOURCES += \
genarch/src/ofw/ofw_tree.c \
104,7 → 101,6
genarch/src/ofw/upa.c
endif

## EGA
ifeq ($(CONFIG_EGA), y)
GENARCH_SOURCES += \
genarch/src/drivers/ega/ega.c

 /branches/dynload/kernel/genarch/src/kbd/ns16550.c
 ,9 → 39,6
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/kbd.h>
-#ifndef ia64
-#include <arch/drivers/ns16550.h>
-#endif
 #include <ddi/irq.h>
 #include <ipc/irq.h>
 #include <cpu.h>
 ,11 → 127,9
     ns16550_irq.cir = cir;
     ns16550_irq.cir_arg = cir_arg;
     irq_register(&ns16550_irq);
     while ((ns16550_lsr_read(&ns16550) & LSR_DATA_READY))
         ns16550_rbr_read(&ns16550);
     sysinfo_set_item_val("kbd", NULL, true);
     sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
 ,23 → 137,21
     sysinfo_set_item_val("kbd.inr", NULL, inr);
     sysinfo_set_item_val("kbd.address.virtual", NULL, port);
     sysinfo_set_item_val("kbd.port", NULL, port);
 #ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
     /* Enable interrupts */
-        ns16550_ier_write(&ns16550, IER_ERBFI);
+    ns16550_ier_write(&ns16550, IER_ERBFI);
     ns16550_mcr_write(&ns16550, MCR_OUT2);
 #endif
-#ifdef ia64
-        uint8_t c;
-        // This switches rbr & ier to mode when accept baudrate constant
-        c = ns16550_lcr_read(&ns16550);
-        ns16550_lcr_write(&ns16550, 0x80 | c);
-        ns16550_rbr_write(&ns16550, 0x0c);
-        ns16550_ier_write(&ns16550, 0x00);
-        ns16550_lcr_write(&ns16550, c);
-#endif
+    uint8_t c;
+    // This switches rbr & ier to mode when accept baudrate constant
+    c = ns16550_lcr_read(&ns16550);
+    ns16550_lcr_write(&ns16550, 0x80 | c);
+    ns16550_rbr_write(&ns16550, 0x0c);
+    ns16550_ier_write(&ns16550, 0x00);
+    ns16550_lcr_write(&ns16550, c);
     ns16550_grab();
 }
 ,10 → 178,10
     while(!(ch = active_read_buff_read())) {
         uint8_t x;
-        while (!(ns16550_lsr_read(&ns16550) & LSR_DATA_READY))
-            ;
+        while (!(ns16550_lsr_read(&ns16550) & LSR_DATA_READY));
         x = ns16550_rbr_read(&ns16550);
-#ifndef ia64
         if (x != IGNORE_CODE) {
             if (x & KEY_RELEASE)
                 key_released(x ^ KEY_RELEASE);
 ,15 → 188,6
             else
                 active_read_key_pressed(x);
         }
-#else
-        extern chardev_t kbrd;
-        if(x != 0x0d) {
-            if(x == 0x7f)
-                x = '\b';
-             chardev_push_character(&kbrd, x);
-        }
-#endif
     }
     return ch;
 }
 ,7 → 198,7
  */
 void ns16550_poll(void)
 {
-#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
+#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
     ipl_t ipl;
     ipl = interrupts_disable();
 ,7 → 224,7
         uint8_t x;
         x = ns16550_rbr_read(&ns16550);
-#ifndef ia64
         if (x != IGNORE_CODE) {
             if (x & KEY_RELEASE)
                 key_released(x ^ KEY_RELEASE);
 ,15 → 231,6
             else
                 key_pressed(x);
         }
-#else
-        extern chardev_t kbrd;
-        if(x != 0x0d) {
-            if (x == 0x7f)
-                x = '\b';
-            chardev_push_character(&kbrd, x);
-        }
-#endif
     }
 }

 /branches/dynload/kernel/genarch/src/kbd/i8042.c
 ,9 → 37,7
  */
 #include <genarch/kbd/i8042.h>
-#ifdef ia64
 #include <arch/drivers/kbd.h>
-#endif
 #include <genarch/kbd/key.h>
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_pc.h>
 ,10 → 169,10
     i8042_mouse_irq.claim = i8042_claim;
     i8042_mouse_irq.handler = i8042_irq_handler;
     irq_register(&i8042_mouse_irq);
-#ifndef ia64
     trap_virtual_enable_irqs(1 << kbd_inr);
     trap_virtual_enable_irqs(1 << mouse_inr);
-#endif
     /*
      * Clear input buffer.
      * Number of iterations is limited to prevent infinite looping.
 ,7 → 187,7
     sysinfo_set_item_val("kbd.inr", NULL, kbd_inr);
 #ifdef KBD_LEGACY
     sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
-#endif
+#endif
     sysinfo_set_item_val("mouse", NULL, true);
     sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
     sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
 ,12 → 207,13
 char i8042_key_read(chardev_t *d)
 {
-    char ch;
-    while(!(ch = active_read_buff_read())) {
+    char ch;
+    while (!(ch = active_read_buff_read())) {
         uint8_t x;
-        while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK))
-            ;
+        while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK));
         x = i8042_data_read();
         if (x & KEY_RELEASE)
             key_released(x ^ KEY_RELEASE);
 ,7 → 230,7
 void i8042_poll(void)
 {
     uint8_t x;
     while (((x = i8042_status_read() & i8042_BUFFER_FULL_MASK))) {
         x = i8042_data_read();
         if (x & KEY_RELEASE)

 /branches/dynload/kernel/genarch/src/kbd/key.c
 ,7 → 40,7
 #include <genarch/kbd/scanc_pc.h>
 #endif
-#if (defined(sparc64))
+#if (defined(US)) || (defined(US3))
 #include <genarch/kbd/scanc_sun.h>
 #endif

 /branches/dynload/kernel/genarch/src/fb/fb.c
 ,23 → 120,28
 }
-/** BGR 8:8:8 conversion
+/** RGB 8:8:8 conversion
  *
  */
 static void rgb_888(void *dst, uint32_t rgb)
 {
-#if defined(FB_INVERT_ENDIAN)
-    ((uint8_t *) dst)[0] = RED(rgb, 8);
-    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
-#else
     ((uint8_t *) dst)[0] = BLUE(rgb, 8);
     ((uint8_t *) dst)[1] = GREEN(rgb, 8);
     ((uint8_t *) dst)[2] = RED(rgb, 8);
-#endif
 }
+/** BGR 8:8:8 conversion
+ *
+ */
+static void bgr_888(void *dst, uint32_t rgb)
+{
+    ((uint8_t *) dst)[0] = RED(rgb, 8);
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
+    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
+}
 /** RGB 5:5:5 conversion
  *
  */
 ,6 → 454,10
         rgb_conv = rgb_888;
         pixelbytes = 3;
         break;
+    case VISUAL_BGR_8_8_8:
+        rgb_conv = bgr_888;
+        pixelbytes = 3;
+        break;
     case VISUAL_RGB_8_8_8_0:
         rgb_conv = rgb_888;
         pixelbytes = 4;

 /branches/dynload/kernel/generic/include/fpu_context.h
 ,10 → 37,6
 #include <arch/fpu_context.h>
-#if defined(CONFIG_FPU_LAZY) && !defined(ARCH_HAS_FPU)
-# error "CONFIG_FPU_LAZY defined, but no ARCH_HAS_FPU"
-#endif
 extern void fpu_context_save(fpu_context_t *);
 extern void fpu_context_restore(fpu_context_t *);
 extern void fpu_init(void);

 /branches/dynload/kernel/generic/include/ddi/irq.h
 ,8 → 46,6
     CMD_MEM_WRITE_8,
     CMD_PORT_READ_1,
     CMD_PORT_WRITE_1,
-    CMD_IA64_GETCHAR,
-    CMD_PPC32_GETCHAR,
     CMD_LAST
 } irq_cmd_type;

/branches/dynload/kernel/generic/include/arch.h
79,6 → 79,7

extern void reboot(void);
extern void arch_reboot(void);
extern void arch_construct_function(fncptr_t fptr, void addr, void caller);

#endif

 /branches/dynload/kernel/generic/src/main/kinit.c
 ,7 → 74,9
 #define ALIVE_CHARS  4
+#ifdef CONFIG_KCONSOLE
 static char alive[ALIVE_CHARS] = "-\\|/";
+#endif
 /** Kernel initialization thread.
  *

 /branches/dynload/kernel/generic/src/main/version.c
 ,21 → 34,22
 #include <main/version.h>
 #include <print.h>
+#include <macros.h>
 char *project = "SPARTAN kernel";
-char *copyright = "Copyright (c) 2001-2008 HelenOS project";
-char *release = RELEASE;
-char *name = NAME;
-char *arch = ARCH;
+char *copyright = "Copyright (c) 2001-2009 HelenOS project";
+char *release = STRING(RELEASE);
+char *name = STRING(NAME);
+char *arch = STRING(KARCH);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = " on " TIMESTAMP;
+    char *timestamp = " on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /branches/dynload/kernel/generic/src/console/cmd.c
 ,14 → 616,9
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(void);
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
-    } fptr;
-#endif
+    unative_t (*fnc)(void);
+    fncptr_t fptr;
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,15 → 627,9
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
+        fnc = (unative_t (*)(void)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call0);
         printf("Calling %s() (%p)\n", symbol, symaddr);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(void)) &fptr;
-#else
-        f =  (unative_t (*)(void)) symaddr;
-#endif
-        printf("Result: %#" PRIxn "\n", f());
+        printf("Result: %#" PRIxn "\n", fnc());
     }
     return 1;
 ,15 → 669,10
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(unative_t,...);
+    unative_t (*fnc)(unative_t, ...);
     unative_t arg1 = argv[1].intval;
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
-    } fptr;
-#endif
+    fncptr_t fptr;
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,16 → 681,9
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
+        fnc = (unative_t (*)(unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call1);
         printf("Calling f(%#" PRIxn "): %p: %s\n", arg1, symaddr, symbol);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(unative_t,...)) &fptr;
-#else
-        f =  (unative_t (*)(unative_t,...)) symaddr;
-#endif
-        printf("Result: %#" PRIxn "\n", f(arg1));
+        printf("Result: %#" PRIxn "\n", fnc(arg1));
     }
     return 1;
 ,16 → 694,11
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(unative_t,unative_t,...);
+    unative_t (*fnc)(unative_t, unative_t, ...);
     unative_t arg1 = argv[1].intval;
     unative_t arg2 = argv[2].intval;
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
-    }fptr;
-#endif
+    fncptr_t fptr;
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,16 → 707,10
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
+        fnc = (unative_t (*)(unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call2);
         printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n",
                arg1, arg2, symaddr, symbol);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(unative_t,unative_t,...)) &fptr;
-#else
-        f =  (unative_t (*)(unative_t,unative_t,...)) symaddr;
-#endif
-        printf("Result: %#" PRIxn "\n", f(arg1, arg2));
+        printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
     }
     return 1;
 ,17 → 721,12
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*f)(unative_t,unative_t,unative_t,...);
+    unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
     unative_t arg1 = argv[1].intval;
     unative_t arg2 = argv[2].intval;
     unative_t arg3 = argv[3].intval;
-#ifdef ia64
-    struct {
-        unative_t f;
-        unative_t gp;
-    }fptr;
-#endif
+    fncptr_t fptr;
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,16 → 735,10
         printf("Duplicate symbol, be more specific.\n");
     } else {
         symbol = get_symtab_entry(symaddr);
+        fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call3);
         printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n",
                arg1, arg2, arg3, symaddr, symbol);
-#ifdef ia64
-        fptr.f = symaddr;
-        fptr.gp = ((unative_t *)cmd_call2)[1];
-        f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) &fptr;
-#else
-        f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) symaddr;
-#endif
-        printf("Result: %#" PRIxn "\n", f(arg1, arg2, arg3));
+        printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
     }
     return 1;
 ,9 → 951,9
     test_t *test;
     for (test = tests; test->name != NULL; test++)
-        printf("%s\t\t%s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        printf("%-10s %s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-    printf("*\t\tRun all safe tests\n");
+    printf("%-10s Run all safe tests\n", "*");
     return 1;
 }

 /branches/dynload/kernel/generic/src/proc/thread.c
 ,7 → 102,7
 thread_id_t last_tid = 0;
 static slab_cache_t *thread_slab;
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 slab_cache_t *fpu_context_slab;
 #endif
 ,7 → 161,7
     /* call the architecture-specific part of the constructor */
     thr_constructor_arch(t);
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 #ifdef CONFIG_FPU_LAZY
     t->saved_fpu_context = NULL;
 #else
 ,11 → 169,11
     if (!t->saved_fpu_context)
         return -1;
 #endif
-#endif
+#endif
     t->kstack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
     if (!t->kstack) {
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
         if (t->saved_fpu_context)
             slab_free(fpu_context_slab, t->saved_fpu_context);
 #endif
 ,7 → 196,7
     thr_destructor_arch(t);
     frame_free(KA2PA(t->kstack));
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
     if (t->saved_fpu_context)
         slab_free(fpu_context_slab, t->saved_fpu_context);
 #endif
 ,7 → 215,7
     thread_slab = slab_cache_create("thread_slab", sizeof(thread_t), 0,
         thr_constructor, thr_destructor, 0);
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
     fpu_context_slab = slab_cache_create("fpu_slab", sizeof(fpu_context_t),
         FPU_CONTEXT_ALIGN, NULL, NULL, 0);
 #endif

 /branches/dynload/kernel/generic/src/ipc/kbox.c
 ,6 → 42,7
 #include <debug.h>
 #include <udebug/udebug_ipc.h>
 #include <ipc/kbox.h>
+#include <print.h>
 void ipc_kbox_cleanup(void)
 {
 ,8 → 129,8
     ipl = interrupts_disable();
     spinlock_lock(&TASK->lock);
-    spinlock_lock(&TASK->answerbox.lock);
-    if (list_empty(&TASK->answerbox.connected_phones)) {
+    spinlock_lock(&TASK->kb.box.lock);
+    if (list_empty(&TASK->kb.box.connected_phones)) {
         /*
          * Last phone has been disconnected. Detach this thread so it
          * gets freed and signal to the caller.
 ,7 → 151,7
         *last = false;
     }
-    spinlock_unlock(&TASK->answerbox.lock);
+    spinlock_unlock(&TASK->kb.box.lock);
     spinlock_unlock(&TASK->lock);
     interrupts_restore(ipl);
 }

 /branches/dynload/kernel/generic/src/ipc/irq.c
 ,7 → 100,6
             *((uint64_t *) code->cmds[i].addr) =
                 code->cmds[i].value;
             break;
-#if defined(ia32) || defined(amd64) || defined(ia64)
         case CMD_PORT_READ_1:
             dstval = inb((long) code->cmds[i].addr);
             break;
 ,17 → 106,6
         case CMD_PORT_WRITE_1:
             outb((long) code->cmds[i].addr, code->cmds[i].value);
             break;
-#endif
-#if defined(ia64) && defined(SKI)
-        case CMD_IA64_GETCHAR:
-            dstval = _getc(&ski_uconsole);
-            break;
-#endif
-#if defined(ppc32)
-        case CMD_PPC32_GETCHAR:
-            dstval = cuda_get_scancode();
-            break;
-#endif
         default:
             break;
         }

/branches/dynload/kernel/generic/src/udebug/udebug.c
41,6 → 41,7
#include <debug.h>
#include <udebug/udebug.h>
#include <errno.h>
#include <print.h>
#include <arch.h>

/branches/dynload/kernel/generic/src/udebug/udebug_ops.c
44,6 → 44,7
#include <proc/thread.h>
#include <arch.h>
#include <errno.h>
#include <print.h>
#include <syscall/copy.h>
#include <ipc/ipc.h>
#include <udebug/udebug.h>

 /branches/dynload/kernel/Makefile
 ,21 → 32,25
 include ../version
 -include ../Makefile.config
+-include ../config.defs
 INCLUDES = generic/include
 OPTIMIZATION = 3
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 ## Common compiler flags
 #
-DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" \
-    -DKERNEL
+DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
-GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
+GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     -fno-builtin -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
     -nostdlib -nostdinc -pipe
-ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
+ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     -fno-builtin -Wall -Wmissing-prototypes -Werror \
     -nostdlib -nostdinc \
     -wd170
 ,15 → 62,7
 LFLAGS = -M
 AFLAGS =
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
--include arch/$(ARCH)/Makefile.inc
+-include arch/$(KARCH)/Makefile.inc
 -include genarch/Makefile.inc
 ## The at-sign
 ,92 → 80,6
 #
 SYMTAB_SECTION=".section symtab.data, \"a\", $(ATSIGN)progbits;"
-## Setup kernel configuration
-#
-ifeq ($(CONFIG_DEBUG),y)
-    DEFS += -DCONFIG_DEBUG
-endif
-ifeq ($(CONFIG_LOG),y)
-    DEFS += -DCONFIG_LOG
-endif
-ifeq ($(CONFIG_KCONSOLE),y)
-    DEFS += -DCONFIG_KCONSOLE
-endif
-ifeq ($(CONFIG_DEBUG_SPINLOCK),y)
-    DEFS += -DCONFIG_DEBUG_SPINLOCK
-endif
-ifeq ($(CONFIG_DEBUG_AS_WATCHPOINT),y)
-    DEFS += -DCONFIG_DEBUG_AS_WATCHPOINT
-endif
-ifeq ($(CONFIG_FPU_LAZY),y)
-    DEFS += -DCONFIG_FPU_LAZY
-endif
-ifeq ($(CONFIG_DEBUG_ALLREGS),y)
-    DEFS += -DCONFIG_DEBUG_ALLREGS
-endif
-ifeq ($(CONFIG_VHPT),y)
-    DEFS += -DCONFIG_VHPT
-endif
-ifeq ($(CONFIG_TSB),y)
-    DEFS += -DCONFIG_TSB
-endif
-ifeq ($(CONFIG_Z8530),y)
-    DEFS += -DCONFIG_Z8530
-endif
-ifeq ($(CONFIG_NS16550),y)
-    DEFS += -DCONFIG_NS16550
-endif
-ifeq ($(CONFIG_I8042_INTERRUPT_DRIVEN),y)
-    DEFS += -DCONFIG_I8042_INTERRUPT_DRIVEN
-endif
-ifeq ($(CONFIG_NS16550_INTERRUPT_DRIVEN),y)
-    DEFS += -DCONFIG_NS16550_INTERRUPT_DRIVEN
-endif
-ifeq ($(CONFIG_IOSAPIC),y)
-    DEFS += -DCONFIG_IOSAPIC
-endif
-ifeq ($(CONFIG_VIRT_IDX_DCACHE),y)
-    DEFS += -DCONFIG_VIRT_IDX_DCACHE
-endif
-ifeq ($(CONFIG_FB),y)
-    ifeq ($(ARCH),ia32)
-        DEFS += -DCONFIG_VESA_WIDTH=$(CONFIG_VESA_WIDTH)
-        DEFS += -DCONFIG_VESA_HEIGHT=$(CONFIG_VESA_HEIGHT)
-        DEFS += -DCONFIG_VESA_BPP=$(CONFIG_VESA_BPP)
-    endif
-    ifeq ($(ARCH),amd64)
-        DEFS += -DCONFIG_VESA_WIDTH=$(CONFIG_VESA_WIDTH)
-        DEFS += -DCONFIG_VESA_HEIGHT=$(CONFIG_VESA_HEIGHT)
-        DEFS += -DCONFIG_VESA_BPP=$(CONFIG_VESA_BPP)
-    endif
-    ifeq ($(ARCH),ia32xen)
-        DEFS += -DCONFIG_VESA_WIDTH=$(CONFIG_VESA_WIDTH)
-        DEFS += -DCONFIG_VESA_HEIGHT=$(CONFIG_VESA_HEIGHT)
-        DEFS += -DCONFIG_VESA_BPP=$(CONFIG_VESA_BPP)
-    endif
-endif
-ifeq ($(CONFIG_UDEBUG),y)
-    DEFS += -DCONFIG_UDEBUG
-endif
 ## Simple detection for the type of the host system
 #
 HOST = $(shell uname)
 ,6 → 104,7
     OBJDUMP = $(BINUTILS_PREFIX)objdump
     LIBDIR = /usr/lib
     CFLAGS = $(GCC_CFLAGS)
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,6 → 116,7
     OBJDUMP = objdump
     LIBDIR = /usr/lib
     CFLAGS = $(ICC_CFLAGS)
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),suncc_native)
 ,6 → 128,8
     OBJDUMP = $(BINUTILS_PREFIX)objdump
     LIBDIR = /usr/lib
     CFLAGS = $(SUNCC_CFLAGS)
+    DEFS += $(CONFIG_DEFS)
+    DEPEND_DEFS = $(DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,6 → 141,7
     OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
     LIBDIR = $(TOOLCHAIN_DIR)/lib
     CFLAGS = $(GCC_CFLAGS)
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ## Generic kernel sources
 ,7 → 240,6
 #
 ifeq ($(CONFIG_TEST),y)
-    DEFS += -DCONFIG_TEST
     CFLAGS += -Itest/
     GENERIC_SOURCES += \
         test/test.c \
 ,9 → 248,6
         test/avltree/avltree1.c \
         test/debug/mips1.c \
         test/fault/fault1.c \
-        test/fpu/fpu1.c \
-        test/fpu/sse1.c \
-        test/fpu/mips2.c \
         test/mm/falloc1.c \
         test/mm/falloc2.c \
         test/mm/mapping1.c \
 ,6 → 264,45
         test/print/print1.c \
         test/thread/thread1.c \
         test/sysinfo/sysinfo1.c
+    ifeq ($(CONFIG_FPU),y)
+        ifeq ($(KARCH),ia32)
+            TEST_FPU1 = y
+            TEST_SSE1 = y
+        endif
+        ifeq ($(KARCH),amd64)
+            TEST_FPU1 = y
+            TEST_SSE1 = y
+        endif
+        ifeq ($(KARCH),ia64)
+            TEST_FPU1 = y
+        endif
+        ifeq ($(KARCH),mips32)
+            TEST_MIPS2 = y
+        endif
+    endif
+    ifeq ($(TEST_FPU1),y)
+        GENERIC_SOURCES += test/fpu/fpu1.c
+    else
+        GENERIC_SOURCES += test/fpu/fpu1_skip.c
+    endif
+    ifeq ($(TEST_SSE1),y)
+        GENERIC_SOURCES += test/fpu/sse1.c
+    else
+        GENERIC_SOURCES += test/fpu/sse1_skip.c
+    endif
+    ifeq ($(TEST_MIPS2),y)
+        GENERIC_SOURCES += test/fpu/mips2.c
+    else
+        GENERIC_SOURCES += test/fpu/mips2_skip.c
+    endif
 endif
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ,7 → 311,7
 .PHONY: all build clean archlinks depend disasm
-all: ../Makefile.config
+all: ../Makefile.config ../config.h ../config.defs
     -rm Makefile.depend
     $(MAKE) -C . build
 ,7 → 320,7
 -include Makefile.depend
 clean:
-    -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
+    -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(KARCH)/_link.ld
     find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
     for arch in arch/* ; do \
         [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null ; \
 ,24 → 327,24
     done ; exit 0
 archlinks:
-    ln -sfn ../../arch/$(ARCH)/include/ generic/include/arch
+    ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch
     ln -sfn ../../genarch/include/ generic/include/genarch
 depend: archlinks
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(KARCH)/_link.ld: arch/$(KARCH)/_link.ld.in
     $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
-generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
+generic/src/debug/real_map.bin: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
     echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o generic/src/debug/empty_map.o
-    $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
+    $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
     $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
     tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin
     # Do it once again, this time to get correct even the symbols
     # on architectures, that have bss after symtab
     echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o generic/src/debug/sizeok_map.o
-    $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
+    $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
     $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
     tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin
 ,8 → 351,8
 generic/src/debug/real_map.o: generic/src/debug/real_map.bin
     echo $(SYMTAB_SECTION)" .incbin \"$<\"" | $(AS) $(AFLAGS) -o $@
-kernel.raw: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
-    $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
+kernel.raw: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
+    $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
 kernel.bin: kernel.raw
     $(OBJCOPY) -O $(BFD) kernel.raw kernel.bin

/branches/dynload/kernel/arch/ia32xen/include/smp
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/arg.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/ddi
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/atomic.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/arch.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/proc
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/faddr.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/debugger.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/context.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/barrier.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/debug.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/cpu.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/context_offset.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/interrupt.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/fpu_context.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/cycle.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/byteorder.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/cpuid.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/elf.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/bios
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/memstr.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/context.S
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/debug
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/cpu
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/bios
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/delay.s
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/ddi
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/debugger.c
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/atomic.S
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/fpu_context.c
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

 /branches/dynload/kernel/arch/sparc64/_link.ld.in
 ,8 → 1,8
 /** SPARC64 linker script
  *
  *  It is ELF format, but its only section looks like this:
- *  kernel text
- *  kernel data
+ *   kernel text
+ *   kernel data
  *
  */
 ,7 → 11,7
 ENTRY(kernel_image_start)
 SECTIONS {
-    .image VMA: AT (LMA) {
+    .image VMA: AT (LMA) {
         ktext_start = .;
         *(K_TEXT_START)
         *(.text);
 ,23 → 21,23
         *(K_DATA_START)
         *(.rodata);
         *(.rodata.*);
-        *(.data);       /* initialized data */
+        *(.data);                   /* initialized data */
         *(.sdata);
         *(.sdata2);
         *(.sbss);
         . = ALIGN(8);
         hardcoded_ktext_size = .;
-        QUAD(ktext_end - ktext_start);
+        QUAD(ktext_end - ktext_start);
         hardcoded_kdata_size = .;
         QUAD(kdata_end - kdata_start);
         hardcoded_load_address = .;
         QUAD(VMA);
-        *(.bss);        /* uninitialized static variables */
-        *(COMMON);      /* global variables */
+        *(.bss);                    /* uninitialized static variables */
+        *(COMMON);                  /* global variables */
         symbol_table = .;
-                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
+        *(symtab.*);                /* Symbol table, must be LAST symbol!*/
         kdata_end = .;
     }
 ,5 → 44,5
     /DISCARD/ : {
         *(*);
     }
 }

/branches/dynload/kernel/arch/sparc64/include/fpu_context.h
37,7 → 37,6

#include <arch/types.h>

#define ARCH_HAS_FPU
#define FPU_CONTEXT_ALIGN 8

typedef struct {

 /branches/dynload/kernel/arch/sparc64/include/types.h
 ,6 → 59,9
 typedef uintptr_t ioport_t;
+typedef struct {
+} fncptr_t;
 /**< Formats for uintptr_t, size_t, count_t and index_t */
 #define PRIp "llx"
 #define PRIs "llu"

 /branches/dynload/kernel/arch/sparc64/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_NAME = elf64-sparc
 BFD_ARCH = sparc
 BFD = binary
 ,46 → 42,8
 DEFS += -D__64_BITS__
-## Own configuration directives
-#
-## Compile with page hash table support.
-#
-CONFIG_PAGE_HT = y
-DEFS += -DCONFIG_PAGE_HT
-## Compile with support for address space identifiers.
-#
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-## Compile with support for framebuffer.
-#
-CONFIG_FB = y
-## Compile with support for Sun keyboard.
-#
-CONFIG_SUN_KBD = y
-## Compile with support for OpenFirmware device tree.
-#
-CONFIG_OFW_TREE = y
-ifeq ($(CONFIG_SMP),y)
-    DEFS += -DCONFIG_SMP
-endif
-ifeq ($(CONFIG_SGCN),y)
-        DEFS += -DCONFIG_SGCN
-endif
 ifeq ($(MACHINE),us)
-    DEFS += -DUS
+    DEFS += -DUS
 endif
 ifeq ($(MACHINE),us3)
 ,47 → 51,50
 endif
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/asm.S \
-    arch/$(ARCH)/src/panic.S \
-    arch/$(ARCH)/src/console.c \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/fpu_context.c \
-    arch/$(ARCH)/src/dummy.s \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/mm/cache.S \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/sparc64.c \
-    arch/$(ARCH)/src/start.S \
-    arch/$(ARCH)/src/proc/scheduler.c \
-    arch/$(ARCH)/src/proc/thread.c \
-    arch/$(ARCH)/src/trap/mmu.S \
-    arch/$(ARCH)/src/trap/trap_table.S \
-    arch/$(ARCH)/src/trap/trap.c \
-    arch/$(ARCH)/src/trap/exception.c \
-    arch/$(ARCH)/src/trap/interrupt.c \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/drivers/tick.c \
-    arch/$(ARCH)/src/drivers/kbd.c \
-    arch/$(ARCH)/src/drivers/scr.c \
-    arch/$(ARCH)/src/drivers/sgcn.c \
-    arch/$(ARCH)/src/drivers/pci.c
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/asm.S \
+    arch/$(KARCH)/src/panic.S \
+    arch/$(KARCH)/src/console.c \
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/fpu_context.c \
+    arch/$(KARCH)/src/dummy.s \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/mm/cache.S \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/sparc64.c \
+    arch/$(KARCH)/src/start.S \
+    arch/$(KARCH)/src/proc/scheduler.c \
+    arch/$(KARCH)/src/proc/thread.c \
+    arch/$(KARCH)/src/trap/mmu.S \
+    arch/$(KARCH)/src/trap/trap_table.S \
+    arch/$(KARCH)/src/trap/trap.c \
+    arch/$(KARCH)/src/trap/exception.c \
+    arch/$(KARCH)/src/trap/interrupt.c \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/drivers/tick.c \
+    arch/$(KARCH)/src/drivers/kbd.c \
+    arch/$(KARCH)/src/drivers/sgcn.c \
+    arch/$(KARCH)/src/drivers/pci.c
+ifeq ($(CONFIG_FB),y)
+    ARCH_SOURCES += \
+        arch/$(KARCH)/src/drivers/scr.c
+endif
 ifeq ($(CONFIG_SMP),y)
-ARCH_SOURCES += \
-    arch/$(ARCH)/src/smp/ipi.c \
-    arch/$(ARCH)/src/smp/smp.c
+    ARCH_SOURCES += \
+        arch/$(KARCH)/src/smp/ipi.c \
+        arch/$(KARCH)/src/smp/smp.c
 endif
 ifeq ($(CONFIG_TSB),y)
-ARCH_SOURCES += \
-    arch/$(ARCH)/src/mm/tsb.c
+    ARCH_SOURCES += \
+        arch/$(KARCH)/src/mm/tsb.c
 endif
 ifdef CONFIG_Z8530
-ARCH_SOURCES += \
-    arch/$(ARCH)/src/drivers/fhc.c
+    ARCH_SOURCES += \
+        arch/$(KARCH)/src/drivers/fhc.c
 endif

 /branches/dynload/kernel/arch/sparc64/src/console.c
 ,6 → 69,7
  */
 static void standard_console_init(ofw_tree_node_t *aliases)
 {
+#ifdef CONFIG_FB
     stdin = NULL;
     ofw_tree_property_t *prop;
 ,6 → 97,10
         panic("Cannot find %s.", prop->value);
     kbd_init(keyboard);
+#else
+    panic("Standard console requires FB, "
+          "but the kernel is not compiled with FB support.");
+#endif
 }
 /** Initilize I/O on the Serengeti machine. */
 ,7 → 180,9
  */
 void arch_grab_console(void)
 {
+#ifdef CONFIG_FB
     scr_redraw();
+#endif
     switch (kbd_type) {
 #ifdef CONFIG_Z8530
     case KBD_Z8530:

 /branches/dynload/kernel/arch/sparc64/src/sparc64.c
 ,5 → 161,19
     while (1);
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dynload/kernel/arch/ia64/include/interrupt.h
 ,6 → 153,8
 extern void external_interrupt(uint64_t vector, istate_t *istate);
 extern void disabled_fp_register(uint64_t vector, istate_t *istate);
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
 #endif
 /** @}

/branches/dynload/kernel/arch/ia64/include/fpu_context.h
35,7 → 35,6
#ifndef KERN_ia64_FPU_CONTEXT_H_
#define KERN_ia64_FPU_CONTEXT_H_

#define ARCH_HAS_FPU 1
#define FPU_CONTEXT_ALIGN 16

#include <arch/types.h>

 /branches/dynload/kernel/arch/ia64/include/types.h
 ,6 → 67,11
 typedef uintptr_t ioport_t;
+typedef struct {
+    unative_t fnc;
+    unative_t gp;
+} fncptr_t;
 #define PRIp "lx"   /**< Format for uintptr_t. */
 #define PRIs "lu"   /**< Format for size_t. */
 #define PRIc "lu"   /**< Format for count_t. */

 /branches/dynload/kernel/arch/ia64/include/asm.h
 ,7 → 41,7
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
-static inline void  outb(ioport_t port, uint8_t v)
+static inline void outb(ioport_t port, uint8_t v)
 {
     *((uint8_t *)(IA64_IOSPACE_ADDRESS +
         ((port & 0xfff) | ((port >> 2) << 12)))) = v;
 ,7 → 49,7
     asm volatile ("mf\n" ::: "memory");
 }
-static inline void  outw(ioport_t port, uint16_t v)
+static inline void outw(ioport_t port, uint16_t v)
 {
     *((uint16_t *)(IA64_IOSPACE_ADDRESS +
         ((port & 0xfff) | ((port >> 2) << 12)))) = v;
 ,7 → 57,7
     asm volatile ("mf\n" ::: "memory");
 }
-static inline void  outl(ioport_t port, uint32_t v)
+static inline void outl(ioport_t port, uint32_t v)
 {
     *((uint32_t *)(IA64_IOSPACE_ADDRESS +
         ((port & 0xfff) | ((port >> 2) << 12)))) = v;

 /branches/dynload/kernel/arch/ia64/include/drivers/kbd.h
 ,13 → 35,11
 #ifndef KERN_ia64_KBD_H_
 #define KERN_ia64_KBD_H_
+#define KBD_UNKNOWN  0
+#define KBD_SKI      1
+#define KBD_LEGACY   2
+#define KBD_NS16550  3
-#define KBD_UNKNOWN 0
-#define KBD_SKI 1
-#define KBD_LEGACY 2
-#define KBD_NS16550 3
 #endif
 /** @}

 /branches/dynload/kernel/arch/ia64/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_NAME = elf64-little
 BFD_ARCH = ia64-elf64
 TARGET = ia64-pc-linux-gnu
 ,59 → 41,35
 LFLAGS += -EL
 AFLAGS += -mconstant-gp
-DEFS += -D__64_BITS__ -D$(MACHINE)
+DEFS += -D__64_BITS__
-## Compile with page hash table support.
-#
-CONFIG_PAGE_HT = y
-DEFS += -DCONFIG_PAGE_HT
-## Compile with support for address space identifiers.
-#
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-## Compile with support for software integer division.
-#
-CONFIG_SOFTINT = y
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/start.S \
-    arch/$(ARCH)/src/asm.S \
-    arch/$(ARCH)/src/dummy.s \
-    arch/$(ARCH)/src/ia64.c \
-    arch/$(ARCH)/src/fpu_context.c \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/ivt.S \
-    arch/$(ARCH)/src/interrupt.c \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/mm/vhpt.c \
-    arch/$(ARCH)/src/proc/scheduler.c \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/smp/smp.c \
-    arch/$(ARCH)/src/drivers/it.c
+    arch/$(KARCH)/src/start.S \
+    arch/$(KARCH)/src/asm.S \
+    arch/$(KARCH)/src/dummy.s \
+    arch/$(KARCH)/src/ia64.c \
+    arch/$(KARCH)/src/fpu_context.c \
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/ivt.S \
+    arch/$(KARCH)/src/interrupt.c \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/mm/vhpt.c \
+    arch/$(KARCH)/src/proc/scheduler.c \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/smp/smp.c \
+    arch/$(KARCH)/src/drivers/it.c
 ifeq ($(MACHINE),ski)
-    ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c
+    ARCH_SOURCES += arch/$(KARCH)/src/ski/ski.c
     DEFS += -DSKI
     BFD = binary
 endif
 ifeq ($(MACHINE),i460GX)
-    CONFIG_I8042 = y
-    CONFIG_EGA = y
-    DEFS += -DI460GX -DCONFIG_I8042 -DCONFIG_EGA
+    DEFS += -DI460GX
     BFD = binary
 endif
-ifeq ($(CONFIG_SMP),y)
-    DEFS += -DCONFIG_SMP
-endif

 /branches/dynload/kernel/arch/ia64/src/ia64.c
 ,9 → 132,9
         irq_init(INR_COUNT, INR_COUNT);
 #ifdef SKI
         ski_init_console();
-#else
+#else
         ega_init(EGA_BASE, EGA_VIDEORAM);
-#endif
+#endif
     }
     it_init();
 ,13 → 265,13
 {
 #ifdef SKI
     ski_kbd_release();
-#else
+#else
 #ifdef CONFIG_NS16550
     ns16550_release();
-#else
+#else
     i8042_release();
-#endif
 #endif
+#endif
 }
 void arch_reboot(void)
 ,5 → 281,22
         ;
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    fptr->fnc = (unative_t) addr;
+    fptr->gp = ((unative_t *) caller)[1];
+    return (void *) fptr;
+}
 /** @}
  */

 /branches/dynload/kernel/arch/ia64/src/ski/ski.c
 ,7 → 46,7
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
-#define SKI_KBD_INR 0
+#define SKI_KBD_INR  0
 static irq_t ski_kbd_irq;
 static devno_t ski_kbd_devno;
 ,9 → 114,9
 static char ski_getchar_blocking(chardev_t *d)
 {
     int ch;
-    while(!(ch = ski_getchar()))
-        ;
+    while(!(ch = ski_getchar()));
     if (ch == '\r')
         ch = '\n';
     return (char) ch;
 ,16 → 128,16
     char ch;
     static char last;
     ipl_t ipl;
     ipl = interrupts_disable();
     if (kbd_disabled) {
         interrupts_restore(ipl);
         return;
     }
     spinlock_lock(&ski_kbd_irq.lock);
     ch = ski_getchar();
     if(ch == '\r')
         ch = '\n';
 ,7 → 177,7
 /* Called from getc(). */
 static void ski_kbd_disable(chardev_t *d)
 {
-    kbd_disabled = true;
+    kbd_disabled = true;
 }
 /** Decline to service hardware IRQ.

 /branches/dynload/kernel/arch/ia64/src/interrupt.c
 ,8 → 194,8
 void disabled_fp_register(uint64_t vector, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY
-    scheduler_fpu_lazy_request();
+#ifdef CONFIG_FPU_LAZY
+    scheduler_fpu_lazy_request();
 #else
     fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
         (uint16_t) vector, vector_to_string(vector));
 ,5 → 301,9
     }
 }
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+}
 /** @}
  */

 /branches/dynload/kernel/arch/arm32/include/types.h
 ,6 → 64,11
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uintptr_t ioport_t;
+typedef struct {
+} fncptr_t;
 #define PRIp "x"    /**< Format for uintptr_t. */
 #define PRIs "u"    /**< Format for size_t. */
 #define PRIc "u"    /**< Format for count_t. */

 /branches/dynload/kernel/arch/arm32/include/asm.h
 ,6 → 46,17
 {
 }
+/** No I/O port address space on ARM. */
+static inline void outb(ioport_t port, uint8_t v)
+{
+}
+/** No I/O port address space on ARM. */
+static inline uint8_t inb(ioport_t port)
+{
+    return 0;
+}
 /** Return base address of current stack.
  *
  * Return the base address of the current stack.

 /branches/dynload/kernel/arch/arm32/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm
 BFD = binary
 ,11 → 36,8
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm
 KERNEL_LOAD_ADDRESS = 0x80200000
+DMACHINE = MACHINE_GXEMUL_TESTARM
-# ifeq ($(MACHINE), gxemul_testarm)
-    DMACHINE = MACHINE_GXEMUL_TESTARM
-# endif
 ATSIGN = %
 GCC_CFLAGS += -fno-zero-initialized-in-bss
 ,50 → 44,23
 DEFS += -D__32_BITS__ -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS) -D$(DMACHINE)
-# Compile with framebuffer support
-ifeq ($(CONFIG_FB), y)
-    DEFS += -DCONFIG_FB -DFB_INVERT_ENDIAN
-endif
-## Compile with hierarchical page tables support.
-#
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-## Compile with support for address space identifiers.
-#
-# no HW support for ASIDs
-#CONFIG_ASID = y
-#CONFIG_ASID_FIFO = y
-## Compile with support with software division and multiplication.
-#
-CONFIG_SOFTINT = y
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/start.S \
-    arch/$(ARCH)/src/asm.S \
-    arch/$(ARCH)/src/arm32.c \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/dummy.S \
-    arch/$(ARCH)/src/panic.S \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/interrupt.c \
-    arch/$(ARCH)/src/debug/print.c \
-    arch/$(ARCH)/src/console.c \
-    arch/$(ARCH)/src/exception.c \
-    arch/$(ARCH)/src/userspace.c \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/mm/page_fault.c
-# ifeq ($(MACHINE), gxemul_testarm)
-    ARCH_SOURCES += arch/$(ARCH)/src/drivers/gxemul.c
-# endif
+    arch/$(KARCH)/src/start.S \
+    arch/$(KARCH)/src/asm.S \
+    arch/$(KARCH)/src/arm32.c \
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/dummy.S \
+    arch/$(KARCH)/src/panic.S \
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/interrupt.c \
+    arch/$(KARCH)/src/debug/print.c \
+    arch/$(KARCH)/src/console.c \
+    arch/$(KARCH)/src/exception.c \
+    arch/$(KARCH)/src/userspace.c \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/mm/page_fault.c \
+    arch/$(KARCH)/src/drivers/gxemul.c

 /branches/dynload/kernel/arch/arm32/src/arm32.c
 ,7 → 92,7
         .x = 640,
         .y = 480,
         .scan = 1920,
-        .visual = VISUAL_RGB_8_8_8,
+        .visual = VISUAL_BGR_8_8_8,
     };
     fb_init(&prop);
 #endif
 ,9 → 164,22
 void arch_reboot()
 {
     /* not implemented */
-    for (;;)
-        ;
+    while (1);
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dynload/kernel/arch/arm32/src/drivers/gxemul.c
 ,7 → 72,7
 static void gxemul_kbd_enable(chardev_t *dev);
 static void gxemul_kbd_disable(chardev_t *dev);
-static void gxemul_write(chardev_t *dev, const char ch);
+static void gxemul_write(chardev_t *dev, const char ch, bool silent);
 static char gxemul_do_read(chardev_t *dev);
 static chardev_operations_t gxemul_ops = {

 /branches/dynload/kernel/arch/ppc32/include/types.h
 ,6 → 57,11
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uintptr_t ioport_t;
+typedef struct {
+} fncptr_t;
 /**< Formats for uintptr_t, size_t, count_t and index_t */
 #define PRIp "x"
 #define PRIs "u"

 /branches/dynload/kernel/arch/ppc32/include/asm.h
 ,6 → 149,17
 extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
+/** No I/O port address space on PowerPC. */
+static inline void outb(ioport_t port, uint8_t v)
+{
+}
+/** No I/O port address space on PowerPC. */
+static inline uint8_t inb(ioport_t port)
+{
+    return 0;
+}
 #endif
 /** @}

 /branches/dynload/kernel/arch/ppc32/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_NAME = elf32-powerpc
 BFD_ARCH = powerpc:common
 BFD = binary
 ,44 → 41,22
 DEFS += -D__32_BITS__
-## Own configuration directives
-#
-CONFIG_FB = y
-## Compile with hierarchical page tables support.
-#
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-## Compile with support for address space identifiers.
-#
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-## Compile with support for software integer division.
-#
-CONFIG_SOFTINT = y
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/debug/panic.s \
-    arch/$(ARCH)/src/fpu_context.S \
-    arch/$(ARCH)/src/boot/boot.S \
-    arch/$(ARCH)/src/ppc32.c \
-    arch/$(ARCH)/src/dummy.s \
-    arch/$(ARCH)/src/exception.S \
-    arch/$(ARCH)/src/interrupt.c \
-    arch/$(ARCH)/src/asm.S \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/proc/scheduler.c \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/drivers/cuda.c \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/drivers/pic.c
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/debug/panic.s \
+    arch/$(KARCH)/src/fpu_context.S \
+    arch/$(KARCH)/src/boot/boot.S \
+    arch/$(KARCH)/src/ppc32.c \
+    arch/$(KARCH)/src/dummy.s \
+    arch/$(KARCH)/src/exception.S \
+    arch/$(KARCH)/src/interrupt.c \
+    arch/$(KARCH)/src/asm.S \
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/proc/scheduler.c \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/drivers/cuda.c \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/drivers/pic.c

 /branches/dynload/kernel/arch/ppc32/src/ppc32.c
 ,5 → 167,19
     cuda_release();
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dynload/kernel/arch/amd64/include/types.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup amd64
+/** @addtogroup amd64
  * @{
  */
 /** @file
 ,6 → 59,9
 typedef uintptr_t ioport_t;
+typedef struct {
+} fncptr_t;
 /**< Formats for uintptr_t, size_t, count_t and index_t */
 #define PRIp "llx"
 #define PRIs "llu"

 /branches/dynload/kernel/arch/amd64/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_NAME = elf64-x86-64
 BFD_ARCH = i386:x86-64
 BFD = binary
 ,7 → 41,7
 ICC_CFLAGS += $(CMN1)
 SUNCC_CFLAGS += -m64 -xmodel=kernel
-DEFS += -DMACHINE=$(MACHINE) -D__64_BITS__
+DEFS += -D__64_BITS__
 ## Accepted CPUs
 #
 ,78 → 51,40
     GCC_CFLAGS += $(CMN2)
     ICC_CFLAGS += $(CMN2)
     SUNCC_CFLAGS += -xtarget=opteron
-    DEFS += -DFENCES=p4
 endif
-## Own configuration directives
-#
-CONFIG_ACPI = y
-## Compile with hierarchical page tables support.
-#
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-## Compile with i8042 support.
-#
-CONFIG_I8042 = y
-DEFS += -DCONFIG_I8042
-## Compile with EGA support
-#
-CONFIG_EGA = y
-DEFS += -DCONFIG_EGA
-## Accepted configuration directives
-#
-ifeq ($(CONFIG_SMP),y)
-    DEFS += -DCONFIG_SMP
-endif
-ifeq ($(CONFIG_HT),y)
-    DEFS += -DCONFIG_HT
-endif
-ifeq ($(CONFIG_SIMICS_FIX),y)
-    DEFS += -DCONFIG_SIMICS_FIX
-endif
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/fpu_context.c \
-    arch/$(ARCH)/src/boot/boot.S \
-    arch/$(ARCH)/src/boot/memmap.c \
-    arch/$(ARCH)/src/pm.c \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/drivers/vesa.c \
-    arch/$(ARCH)/src/drivers/i8254.c \
-    arch/$(ARCH)/src/drivers/i8259.c \
-    arch/$(ARCH)/src/delay.S \
-    arch/$(ARCH)/src/amd64.c \
-    arch/$(ARCH)/src/bios/bios.c \
-    arch/$(ARCH)/src/interrupt.c \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/asm_utils.S \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/proc/scheduler.c \
-    arch/$(ARCH)/src/proc/task.c \
-    arch/$(ARCH)/src/proc/thread.c \
-    arch/$(ARCH)/src/userspace.c \
-    arch/$(ARCH)/src/syscall.c \
-    arch/$(ARCH)/src/debugger.c
+    arch/$(KARCH)/src/fpu_context.c \
+    arch/$(KARCH)/src/boot/boot.S \
+    arch/$(KARCH)/src/boot/memmap.c \
+    arch/$(KARCH)/src/pm.c \
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/drivers/vesa.c \
+    arch/$(KARCH)/src/drivers/i8254.c \
+    arch/$(KARCH)/src/drivers/i8259.c \
+    arch/$(KARCH)/src/delay.S \
+    arch/$(KARCH)/src/amd64.c \
+    arch/$(KARCH)/src/bios/bios.c \
+    arch/$(KARCH)/src/interrupt.c \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/asm_utils.S \
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/proc/scheduler.c \
+    arch/$(KARCH)/src/proc/task.c \
+    arch/$(KARCH)/src/proc/thread.c \
+    arch/$(KARCH)/src/userspace.c \
+    arch/$(KARCH)/src/syscall.c \
+    arch/$(KARCH)/src/debugger.c
 ifeq ($(CONFIG_SMP),y)
     ARCH_SOURCES += \
-        arch/$(ARCH)/src/smp/ap.S \
-        arch/$(ARCH)/src/smp/apic.c \
-        arch/$(ARCH)/src/smp/ipi.c \
-        arch/$(ARCH)/src/smp/mps.c \
-        arch/$(ARCH)/src/smp/smp.c
+        arch/$(KARCH)/src/smp/ap.S \
+        arch/$(KARCH)/src/smp/apic.c \
+        arch/$(KARCH)/src/smp/ipi.c \
+        arch/$(KARCH)/src/smp/mps.c \
+        arch/$(KARCH)/src/smp/smp.c
 endif

 /branches/dynload/kernel/arch/amd64/src/amd64.c
 ,5 → 226,19
     i8042_release();
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dynload/kernel/arch/amd64/src/debugger.c
 ,16 → 204,16
     /* Send IPI */
 #ifdef CONFIG_SMP
-//  ipi_broadcast(VECTOR_DEBUG_IPI);
+//  ipi_broadcast(VECTOR_DEBUG_IPI);
 #endif
     return curidx;
 }
-#ifdef amd64
-#   define getip(x) ((x)->rip)
+#ifdef __64_BITS__
+    #define getip(x)  ((x)->rip)
 #else
-#   define getip(x) ((x)->eip)
+    #define getip(x)  ((x)->eip)
 #endif
 static void handle_exception(int slot, istate_t *istate)
 ,7 → 276,7
     int i;
     /* Set RF to restart the instruction  */
-#ifdef amd64
+#ifdef __64_BITS__
     istate->rflags |= RFLAGS_RF;
 #else
     istate->eflags |= EFLAGS_RF;
 ,7 → 348,7
     unsigned int i;
     char *symbol;
-#ifdef __32_BITS__
+#ifdef __32_BITS__
     printf("#  Count Address    In symbol\n");
     printf("-- ----- ---------- ---------\n");
 #endif

 /branches/dynload/kernel/arch/amd64/src/interrupt.c
 ,7 → 142,7
 static void nm_fault(int n, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY
+#ifdef CONFIG_FPU_LAZY
     scheduler_fpu_lazy_request();
 #else
     fault_if_from_uspace(istate, "FPU fault.");

 /branches/dynload/kernel/arch/mips32/include/context_offset.h
 ,10 → 114,10
     sw $s8,OFFSET_S8(\ctx)
     sw $gp,OFFSET_GP(\ctx)
-#ifndef KERNEL
+#ifndef KERNEL
     sw $k1,OFFSET_TLS(\ctx)
-# ifdef CONFIG_MIPS_FPU
+#ifdef CONFIG_FPU
     mfc1 $t0,$20
     sw $t0, OFFSET_F20(\ctx)
 ,7 → 150,7
     mfc1 $t0,$30
     sw $t0, OFFSET_F30(\ctx)
-# endif /* CONFIG_MIPS_FPU */
+#endif /* CONFIG_FPU */
 #endif /* KERNEL */
     sw $ra,OFFSET_PC(\ctx)
 ,7 → 172,7
 #ifndef KERNEL
     lw $k1,OFFSET_TLS(\ctx)
-# ifdef CONFIG_MIPS_FPU
+#ifdef CONFIG_FPU
     lw $t0, OFFSET_F20(\ctx)
     mtc1 $t0,$20
 ,9 → 205,9
     lw $t0, OFFSET_F30(\ctx)
     mtc1 $t0,$30
-# endif /* CONFIG_MIPS_FPU */
+#endif /* CONFIG_FPU */
 #endif /* KERNEL */
     lw $ra,OFFSET_PC(\ctx)
     lw $sp,OFFSET_SP(\ctx)
 .endm

 /branches/dynload/kernel/arch/mips32/include/types.h
 ,6 → 57,11
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uintptr_t ioport_t;
+typedef struct {
+} fncptr_t;
 #define PRIp "x"    /**< Format for uintptr_t. */
 #define PRIs "u"    /**< Format for size_t. */
 #define PRIc "u"    /**< Format for count_t. */

 /branches/dynload/kernel/arch/mips32/include/asm.h
 ,6 → 70,17
 extern void interrupts_restore(ipl_t ipl);
 extern ipl_t interrupts_read(void);
+/** No I/O port address space on MIPS. */
+static inline void outb(ioport_t port, uint8_t v)
+{
+}
+/** No I/O port address space on MIPS. */
+static inline uint8_t inb(ioport_t port)
+{
+    return 0;
+}
 #endif
 /** @}

 /branches/dynload/kernel/arch/mips32/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel
 ,20 → 37,8
 GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
-DEFS += -D__32_BITS__ -DMACHINE=$(MACHINE) -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS}
+DEFS += -D__32_BITS__ -D$(MACHINE) -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS)
-## Compile with hierarchical page tables support.
-#
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-## Compile with support for address space identifiers.
-#
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
 ## Accepted MACHINEs
 #
 ,7 → 45,7
 ifeq ($(MACHINE),lgxemul)
     BFD_NAME = elf32-tradlittlemips
     BFD = binary
-    GCC_CFLAGS += -DFB_INVERT_ENDIAN -DARCH_HAS_FPU -mips3
+    GCC_CFLAGS += -mips3
 endif
 ifeq ($(MACHINE),bgxemul)
     BFD_NAME = elf32-bigmips
 ,7 → 52,7
     BFD = ecoff-bigmips
     TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
     TARGET = mips-sgi-irix5
-    GCC_CFLAGS += -EB -DBIG_ENDIAN -DARCH_HAS_FPU -mips3
+    GCC_CFLAGS += -EB -DBIG_ENDIAN -mips3
 endif
 ifeq ($(MACHINE),simics)
     # SIMICS 4kc emulation is broken, although for instructions
 ,31 → 69,25
     GCC_CFLAGS += -mhard-float -mips3
 endif
-## Compile with support for software integer division.
-#
-CONFIG_SOFTINT = y
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/start.S \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/panic.S \
-    arch/$(ARCH)/src/mips32.c \
-    arch/$(ARCH)/src/dummy.S \
-    arch/$(ARCH)/src/console.c \
-    arch/$(ARCH)/src/asm.S \
-    arch/$(ARCH)/src/exception.c \
-    arch/$(ARCH)/src/interrupt.c \
-    arch/$(ARCH)/src/cache.c \
-    arch/$(ARCH)/src/debugger.c \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/fpu_context.c \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/drivers/msim.c \
-    arch/$(ARCH)/src/drivers/serial.c \
-    arch/$(ARCH)/src/smp/order.c
+    arch/$(KARCH)/src/start.S \
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/panic.S \
+    arch/$(KARCH)/src/mips32.c \
+    arch/$(KARCH)/src/dummy.S \
+    arch/$(KARCH)/src/console.c \
+    arch/$(KARCH)/src/asm.S \
+    arch/$(KARCH)/src/exception.c \
+    arch/$(KARCH)/src/interrupt.c \
+    arch/$(KARCH)/src/cache.c \
+    arch/$(KARCH)/src/debugger.c \
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/fpu_context.c \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/drivers/msim.c \
+    arch/$(KARCH)/src/drivers/serial.c \
+    arch/$(KARCH)/src/smp/order.c

 /branches/dynload/kernel/arch/mips32/src/fpu_context.c
 ,7 → 40,7
 void fpu_disable(void)
 {
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
     cp0_status_write(cp0_status_read() & ~cp0_status_fpu_bit);
 #endif
 }
 ,7 → 47,7
 void fpu_enable(void)
 {
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
     cp0_status_write(cp0_status_read() | cp0_status_fpu_bit);
 #endif
 }

 /branches/dynload/kernel/arch/mips32/src/asm.S
 ,7 → 159,7
 .global fpu_context_save
 fpu_context_save:
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
     fpu_gp_save 0,$a0
     fpu_gp_save 1,$a0
     fpu_gp_save 2,$a0
 ,7 → 230,7
 .global fpu_context_restore
 fpu_context_restore:
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
     fpu_gp_restore 0,$a0
     fpu_gp_restore 1,$a0
     fpu_gp_restore 2,$a0

 /branches/dynload/kernel/arch/mips32/src/mips32.c
 ,12 → 111,12
      */
     cp0_status_write(cp0_status_read() &
         ~(cp0_status_bev_bootstrap_bit | cp0_status_erl_error_bit));
-    /*
-     * Mask all interrupts
+    /*
+     * Mask all interrupts
      */
     cp0_mask_all_int();
     debugger_init();
 }
 ,11 → 132,26
         .x = 640,
         .y = 480,
         .scan = 1920,
-        .visual = VISUAL_RGB_8_8_8,
+        .visual = VISUAL_BGR_8_8_8,
     };
     fb_init(&gxemul_prop);
 #endif
-    sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
+#ifdef msim
+    sysinfo_set_item_val("machine.msim", NULL, 1);
+#endif
+#ifdef simics
+    sysinfo_set_item_val("machine.simics", NULL, 1);
+#endif
+#ifdef bgxemul
+    sysinfo_set_item_val("machine.bgxemul", NULL, 1);
+#endif
+#ifdef lgxemul
+    sysinfo_set_item_val("machine.lgxemul", NULL, 1);
+#endif
 }
 void arch_post_cpu_init(void)
 ,8 → 176,7
         (uintptr_t) kernel_uarg->uspace_uarg,
         (uintptr_t) kernel_uarg->uspace_entry);
-    while (1)
-        ;
+    while (1);
 }
 /** Perform mips32 specific tasks needed before the new task is run. */
 ,9 → 209,22
 {
     ___halt();
-    while (1)
-        ;
+    while (1);
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dynload/kernel/arch/mips32/src/mm/frame.c
 ,7 → 75,7
  */
 static bool frame_available(pfn_t frame)
 {
-#if MACHINE == msim
+#ifdef msim
     /* MSIM device (dprinter) */
     if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
         return false;
 ,13 → 85,13
         return false;
 #endif
-#if MACHINE == simics
+#ifdef simics
     /* Simics device (serial line) */
     if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH))
         return false;
 #endif
-#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
+#if defined(lgxemul) || defined(bgxemul)
     /* gxemul devices */
     if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
 x10000000, MB2SIZE(256)))
 ,7 → 218,7
                     ZERO_PAGE_VALUE = 0xdeadbeef;
                     if (ZERO_PAGE_VALUE != 0xdeadbeef)
                         avail = false;
-#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
+#if defined(lgxemul) || defined(bgxemul)
                     else {
                         ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
                         if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)

/branches/dynload/kernel/arch/mips32/src/drivers/msim.c
76,7 → 76,6
cp0_mask_int(MSIM_KBD_IRQ);
}

#include <print.h>
/** Read character using polling, assume interrupts disabled */
static char msim_do_read(chardev_t *dev)
{

 /branches/dynload/kernel/arch/ia32/_link.ld.in
 ,11 → 1,11
 /** IA-32 linker script
- *
+ *
  * umapped section:
- *  kernel text
- *  kernel data
+ *  kernel text
+ *  kernel data
  * mapped section:
- *  kernel text
- *  kernel data
+ *  kernel text
+ *  kernel data
  */
 #include <arch/boot/boot.h>
 ,9 → 28,9
         ktext_end = .;
         kdata_start = .;
-        *(.data);           /* initialized data */
-        *(.rodata*);            /* string literals */
-        *(COMMON);          /* global variables */
+        *(.data);               /* initialized data */
+        *(.rodata*);            /* string literals */
+        *(COMMON);              /* global variables */
         hardcoded_load_address = .;
         LONG(PA2KA(BOOT_OFFSET));
         hardcoded_ktext_size = .;
 ,23 → 42,23
         hardcoded_unmapped_kdata_size = .;
         LONG(unmapped_kdata_end - unmapped_kdata_start);
         symbol_table = .;
-        *(symtab.*);                /* Symbol table, must be LAST symbol! */
-        *(.bss);            /* uninitialized static variables */
+        *(symtab.*);            /* Symbol table, must be LAST symbol! */
+        *(.bss);                /* uninitialized static variables */
         kdata_end = .;
     }
     /DISCARD/ : {
-        *(.note.GNU-stack);
+        *(.note.GNU-stack);
         *(.comment);
     }
-#ifdef CONFIG_SMP
+#ifdef CONFIG_SMP
     _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
     ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
     ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;
     protected_ap_gdtr = PA2KA(ap_gdtr);
 #endif /* CONFIG_SMP */
 }

/branches/dynload/kernel/arch/ia32/include/fpu_context.h
37,7 → 37,6

#include <arch/types.h>

#define ARCH_HAS_FPU
#define FPU_CONTEXT_ALIGN 16

void fpu_fxsr(void);

 /branches/dynload/kernel/arch/ia32/include/types.h
 ,6 → 59,9
 typedef uintptr_t ioport_t;
+typedef struct {
+} fncptr_t;
 #define PRIp "x"    /**< Format for uintptr_t. */
 #define PRIs "u"    /**< Format for size_t. */
 #define PRIc "u"    /**< Format for count_t. */

 /branches/dynload/kernel/arch/ia32/include/drivers/kbd.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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.
+ */
+/** @addtogroup ia32
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32_KBD_H_
+#define KERN_ia32_KBD_H_
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 BFD_NAME = elf32-i386
 BFD_ARCH = i386
 BFD = binary
 ,7 → 35,7
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
-DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
+DEFS += -D__32_BITS__
 CMN1 = -m32
 GCC_CFLAGS += $(CMN1)
 ,31 → 48,22
 ifeq ($(MACHINE),athlon-xp)
     CMN2 = -march=athlon-xp
     SUNCC_CFLAGS += -xarch=ssea
-    DEFS += -DCONFIG_FENCES_P3
-    CONFIG_SMP = n
-    CONFIG_HT = n
 endif
 ifeq ($(MACHINE),athlon-mp)
     CMN2 = -march=athlon-mp
     SUNCC_CFLAGS += xarch=ssea
-    DEFS += -DCONFIG_FENCES_P3
-    CONFIG_HT = n
 endif
 ifeq ($(MACHINE),pentium3)
     CMN2 = -march=pentium3
     SUNCC_CFLAGS += -xarch=sse
-    DEFS += -DCONFIG_FENCES_P3
-    CONFIG_HT = n
 endif
 ifeq ($(MACHINE),pentium4)
     CMN2 = -march=pentium4
     SUNCC_CFLAGS += -xarch=sse2
-    DEFS += -DCONFIG_FENCES_P4
 endif
 ifeq ($(MACHINE),core)
     CMN2 = -march=prescott
     SUNCC_CFLAGS += -xarch=sse3
-    DEFS += -DCONFIG_FENCES_P4
 endif
 FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow
 ,77 → 70,36
 GCC_CFLAGS += $(CMN2)
 ICC_CFLAGS += $(CMN2)
-## Own configuration directives
-#
-CONFIG_ACPI = y
-## Compile with hierarchical page tables support.
-#
-CONFIG_PAGE_PT = y
-DEFS += -DCONFIG_PAGE_PT
-## Compile with i8042 controller support
-#
-CONFIG_I8042 = y
-DEFS += -DCONFIG_I8042
-## Compile with EGA support
-#
-CONFIG_EGA = y
-DEFS += -DCONFIG_EGA
-## Accepted configuration directives
-#
-ifeq ($(CONFIG_SMP),y)
-    DEFS += -DCONFIG_SMP
-endif
-ifeq ($(CONFIG_HT),y)
-    DEFS += -DCONFIG_HT
-endif
-ifeq ($(CONFIG_SIMICS_FIX),y)
-    DEFS += -DCONFIG_SIMICS_FIX
-endif
-## Compile with support for software integer division.
-#
-CONFIG_SOFTINT = y
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/context.S \
-    arch/$(ARCH)/src/debug/panic.s \
-    arch/$(ARCH)/src/delay.s \
-    arch/$(ARCH)/src/asm.S \
-    arch/$(ARCH)/src/proc/scheduler.c \
-    arch/$(ARCH)/src/proc/task.c \
-    arch/$(ARCH)/src/proc/thread.c \
-    arch/$(ARCH)/src/bios/bios.c \
-    arch/$(ARCH)/src/smp/ap.S \
-    arch/$(ARCH)/src/smp/apic.c \
-    arch/$(ARCH)/src/smp/mps.c \
-    arch/$(ARCH)/src/smp/smp.c \
-    arch/$(ARCH)/src/atomic.S \
-    arch/$(ARCH)/src/smp/ipi.c \
-    arch/$(ARCH)/src/ia32.c \
-    arch/$(ARCH)/src/interrupt.c \
-    arch/$(ARCH)/src/pm.c \
-    arch/$(ARCH)/src/userspace.c \
-    arch/$(ARCH)/src/cpu/cpu.c \
-    arch/$(ARCH)/src/mm/as.c \
-    arch/$(ARCH)/src/mm/frame.c \
-    arch/$(ARCH)/src/mm/page.c \
-    arch/$(ARCH)/src/mm/tlb.c \
-    arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/drivers/i8254.c \
-    arch/$(ARCH)/src/drivers/i8259.c \
-    arch/$(ARCH)/src/drivers/vesa.c \
-    arch/$(ARCH)/src/boot/boot.S \
-    arch/$(ARCH)/src/boot/memmap.c \
-    arch/$(ARCH)/src/fpu_context.c \
-    arch/$(ARCH)/src/debugger.c \
-    arch/$(ARCH)/src/syscall.c
+    arch/$(KARCH)/src/context.S \
+    arch/$(KARCH)/src/debug/panic.s \
+    arch/$(KARCH)/src/delay.s \
+    arch/$(KARCH)/src/asm.S \
+    arch/$(KARCH)/src/proc/scheduler.c \
+    arch/$(KARCH)/src/proc/task.c \
+    arch/$(KARCH)/src/proc/thread.c \
+    arch/$(KARCH)/src/bios/bios.c \
+    arch/$(KARCH)/src/smp/ap.S \
+    arch/$(KARCH)/src/smp/apic.c \
+    arch/$(KARCH)/src/smp/mps.c \
+    arch/$(KARCH)/src/smp/smp.c \
+    arch/$(KARCH)/src/atomic.S \
+    arch/$(KARCH)/src/smp/ipi.c \
+    arch/$(KARCH)/src/ia32.c \
+    arch/$(KARCH)/src/interrupt.c \
+    arch/$(KARCH)/src/pm.c \
+    arch/$(KARCH)/src/userspace.c \
+    arch/$(KARCH)/src/cpu/cpu.c \
+    arch/$(KARCH)/src/mm/as.c \
+    arch/$(KARCH)/src/mm/frame.c \
+    arch/$(KARCH)/src/mm/page.c \
+    arch/$(KARCH)/src/mm/tlb.c \
+    arch/$(KARCH)/src/ddi/ddi.c \
+    arch/$(KARCH)/src/drivers/i8254.c \
+    arch/$(KARCH)/src/drivers/i8259.c \
+    arch/$(KARCH)/src/drivers/vesa.c \
+    arch/$(KARCH)/src/boot/boot.S \
+    arch/$(KARCH)/src/boot/memmap.c \
+    arch/$(KARCH)/src/fpu_context.c \
+    arch/$(KARCH)/src/debugger.c \
+    arch/$(KARCH)/src/syscall.c

 /branches/dynload/kernel/arch/ia32/src/ia32.c
 ,5 → 177,19
     i8042_release();
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dynload/tools/config.py
 ,12 → 37,14
 import xtui
 INPUT = sys.argv[1]
-OUTPUT = 'Makefile.config'
+MAKEFILE = 'Makefile.config'
+MACROS = 'config.h'
+DEFS = 'config.defs'
 def read_defaults(fname, defaults):
     "Read saved values from last configuration run"
-    inf = file(fname,'r')
+    inf = file(fname, 'r')
     for line in inf:
         res = re.match(r'^(?:#!# )?([^#]\w*)\s*=\s*(.*?)\s*$', line)
 ,15 → 218,29
     return True
-def create_output(fname, defaults, ask_names):
+def create_output(mkname, mcname, dfname, defaults, ask_names):
     "Create output configuration"
-    outf = file(fname, 'w')
+    revision = commands.getoutput('svnversion . 2> /dev/null')
+    timestamp = commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')
-    outf.write('#########################################\n')
-    outf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
-    outf.write('#########################################\n\n')
+    outmk = file(mkname, 'w')
+    outmc = file(mcname, 'w')
+    outdf = file(dfname, 'w')
+    outmk.write('#########################################\n')
+    outmk.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
+    outmk.write('#########################################\n\n')
+    outmc.write('/***************************************\n')
+    outmc.write(' * AUTO-GENERATED FILE, DO NOT EDIT!!! *\n')
+    outmc.write(' ***************************************/\n\n')
+    outdf.write('#########################################\n')
+    outdf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
+    outdf.write('#########################################\n\n')
+    outdf.write('CONFIG_DEFS =')
     for varname, vartype, name, choices, cond in ask_names:
         if ((cond) and (not check_condition(cond, defaults, ask_names))):
             continue
 ,11 → 250,27
         else:
             default = defaults[varname]
-        outf.write('# %s\n%s = %s\n\n' % (name, varname, default))
+        outmk.write('# %s\n%s = %s\n\n' % (name, varname, default))
+        if ((vartype == "y") or (vartype == "y/n") or (vartype == "n/y")):
+            if (default == "y"):
+                outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
+                outdf.write(' -D%s' % varname)
+        else:
+            outmc.write('/* %s */\n#define %s %s\n\n' % (name, varname, default))
+            outdf.write(' -D%s=%s' % (varname, default))
-    outf.write('REVISION = %s\n' % commands.getoutput('svnversion . 2> /dev/null'))
-    outf.write('TIMESTAMP = %s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"'))
-    outf.close()
+    outmk.write('REVISION = %s\n' % revision)
+    outmk.write('TIMESTAMP = %s\n' % timestamp)
+    outmc.write('#define REVISION %s\n' % revision)
+    outmc.write('#define TIMESTAMP %s\n' % timestamp)
+    outdf.write(' "-DREVISION=%s" "-DTIMESTAMP=%s"\n' % (revision, timestamp))
+    outmk.close()
+    outmc.close()
+    outdf.close()
 def main():
     defaults = {}
 ,13 → 280,13
     parse_config(INPUT, ask_names)
     # Read defaults from previous run
-    if os.path.exists(OUTPUT):
-        read_defaults(OUTPUT, defaults)
+    if os.path.exists(MAKEFILE):
+        read_defaults(MAKEFILE, defaults)
     # Default mode: only check defaults and regenerate configuration
     if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
         if (check_choices(defaults, ask_names)):
-            create_output(OUTPUT, defaults, ask_names)
+            create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
             return 0
     # Check mode: only check defaults
 ,10 → 325,13
                     # If there is just one option, use it
                     if (len(choices) == 1):
-                        default = choices[0][0]
-                        defaults[varname] = default
+                        defaults[varname] = choices[0][0]
+                        continue
                     options.append("     %s [%s] --> " % (name, default))
+                elif (vartype == 'y'):
+                    defaults[varname] = 'y'
+                    continue
                 elif (vartype == 'y/n'):
                     if (default == None):
                         default = 'y'
 ,7 → 381,7
     finally:
         xtui.screen_done(screen)
-    create_output(OUTPUT, defaults, ask_names)
+    create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
     return 0
 if __name__ == '__main__':

 /branches/dynload/uspace/app/dltest/Makefile
 ,7 → 27,6
 #
 include ../../../version
--include ../../../Makefile.config
 ## Setup toolchain
 #
 ,6 → 34,7
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../lib/libc -O0
 ,13 → 58,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(ARCH)/_link.ld
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(UARCH)/_link.ld
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /branches/dynload/uspace/app/bdsh/Makefile
 ,26 → 30,18
 # POSSIBILITY OF SUCH DAMAGE.
 include ../../../version
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app
 CFLAGS += -I../../srv/kbd/include
-DEFS += -DRELEASE=\"$(RELEASE)\"
+DEFS += -DRELEASE=$(RELEASE)
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(TIMESTAMP)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 PROGRAM = bdsh
 # Any directory that cleaning targets should know about

 /branches/dynload/uspace/app/dltest2/Makefile
 ,7 → 27,6
 #
 include ../../../version
--include ../../../Makefile.config
 ## Setup toolchain
 #
 ,6 → 34,7
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -D__32_BITS__ -I../../srv/loader/include -I../../lib/rtld/include -I../../lib/libc -O0
 ,14 → 62,14
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(ARCH)/_link.ld
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(UARCH)/_link.ld
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
-#   $(LD) -T $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link2.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+#   $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link2.ld $(OBJECTS) $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /branches/dynload/uspace/app/dload/Makefile
 ,7 → 27,6
 #
 include ../../../version
--include ../../../Makefile.config
 ## Setup toolchain
 #
 ,8 → 34,9
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(ARCH)/Makefile.inc
+include arch/$(UARCH)/Makefile.inc
 CFLAGS += -Iinclude -I../../srv/loader/include -I../../lib/rtld/include -O0 -ggdb
 LFLAGS +=
 ,19 → 67,19
 all: inc $(OUTPUT) disasm sections
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(ARCH)/_link.ld include/arch
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld include/arch
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
-    $(LD) -T arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+    $(LD) -T arch/$(UARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm
 ,7 → 87,7
 sections:
     $(OBJDUMP) -h $(OUTPUT) >$(OUTPUT).sections
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/branches/dynload/uspace/app/dload/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/app/dload/arch/ppc32/Makefile.inc
29,4 → 29,4
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/start.s
arch/$(UARCH)/start.s

/branches/dynload/uspace/app/dload/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/app/dload/arch/mips32/Makefile.inc
29,4 → 29,4
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/mips32.s
arch/$(UARCH)/mips32.s

/branches/dynload/uspace/app/dload/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/app/dload/arch/ia32/Makefile.inc
29,4 → 29,4
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/start.c
arch/$(UARCH)/start.c

 /branches/dynload/uspace/app/init/version.c
 ,19 → 35,20
 #include <unistd.h>
 #include <stdio.h>
+#include <macros.h>
 #include "init.h"
 #include "version.h"
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /branches/dynload/uspace/app/init/Makefile
 ,7 → 27,6
 #
 include ../../../version
--include ../../../Makefile.config
 ## Setup toolchain
 #
 ,21 → 33,14
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../srv/kbd/include
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
+DEFS += -DRELEASE=$(RELEASE)
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,7 → 64,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/app/tester/Makefile
 ,11 → 29,10
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app

 /branches/dynload/uspace/app/tetris/Makefile
 ,8 → 1,7
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app

 /branches/dynload/uspace/app/klog/Makefile
 ,11 → 29,10
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app

 /branches/dynload/uspace/app/trace/Makefile
 ,11 → 29,10
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app

 /branches/dynload/uspace/lib/libfs/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 libfs.a: depend $(OBJECTS)
     $(AR) rc libfs.a $(OBJECTS)

 /branches/dynload/uspace/lib/libblock/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 libblock.a: depend $(OBJECTS)
     $(AR) rc libblock.a $(OBJECTS)

 /branches/dynload/uspace/lib/softfloat/Makefile
 ,28 → 29,27
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
 ## Sources
 #
-GENERIC_SOURCES =       \
-    generic/add.c       \
-    generic/common.c    \
-    generic/comparison.c    \
-    generic/conversion.c    \
-    generic/div.c       \
-    generic/mul.c       \
-    generic/other.c     \
-    generic/softfloat.c \
+GENERIC_SOURCES = \
+    generic/add.c \
+    generic/common.c \
+    generic/comparison.c \
+    generic/conversion.c \
+    generic/div.c \
+    generic/mul.c \
+    generic/other.c \
+    generic/softfloat.c \
     generic/sub.c
 ARCH_SOURCES =
 ,7 → 67,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /branches/dynload/uspace/lib/rtld/Makefile
 ,7 → 34,7
 LIBC_PREFIX = ../../lib/libc
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(ARCH)/Makefile.inc
+include arch/$(UARCH)/Makefile.inc
 #CFLAGS += -Iinclude -I../../srv/loader/include  -fPIC -O0 -ggdb
 #LFLAGS += -shared --no-undefined -soname rtld.so
 ,13 → 75,13
 all: inc $(OUTPUT) librtld.pic.a
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) librtld.pic.a $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o $(PIC_OBJECTS) arch/$(ARCH)/_link.ld include/arch
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) librtld.pic.a $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o $(PIC_OBJECTS) arch/$(UARCH)/_link.ld include/arch
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend

/branches/dynload/uspace/lib/rtld/arch/ppc32/Makefile.inc
29,5 → 29,5
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/src/dynamic.c \
arch/$(ARCH)/src/reloc.c
arch/$(UARCH)/src/dynamic.c \
arch/$(UARCH)/src/reloc.c

/branches/dynload/uspace/lib/rtld/arch/mips32/Makefile.inc
29,5 → 29,5
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/src/dynamic.c \
arch/$(ARCH)/src/reloc.c
arch/$(UARCH)/src/dynamic.c \
arch/$(UARCH)/src/reloc.c

/branches/dynload/uspace/lib/rtld/arch/ia32/Makefile.inc
29,5 → 29,5
CFLAGS += -D__32_BITS__

ARCH_SOURCES := \
arch/$(ARCH)/src/dynamic.c \
arch/$(ARCH)/src/reloc.c
arch/$(UARCH)/src/dynamic.c \
arch/$(UARCH)/src/reloc.c

 /branches/dynload/uspace/lib/libtest/Makefile
 ,7 → 27,6
 #
 include ../../../version
--include ../../../Makefile.config
 ## Setup toolchain
 #
 ,14 → 47,6
 DEFS += -DRELEASE=\"$(RELEASE)\"
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,19 → 62,19
 all: $(OUTPUT) disasm sections
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(ARCH)/_link.ld
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
-    $(LD) -T arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+    $(LD) -T arch/$(UARCH)/_link.ld $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm
 ,7 → 82,7
 sections:
     $(OBJDUMP) -h $(OUTPUT) >$(OUTPUT).sections
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

 /branches/dynload/uspace/lib/softint/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 64,7
     find generic/ \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
     -makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
 libsoftint.a: depend $(OBJECTS)

 /branches/dynload/uspace/lib/libc/include/macros.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2009 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.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_MACROS_H_
+#define LIBC_MACROS_H_
+#define SIZE2KB(size) ((size) >> 10)
+#define SIZE2MB(size) ((size) >> 20)
+#define KB2SIZE(kb) ((kb) << 10)
+#define MB2SIZE(mb) ((mb) << 20)
+#define STRING(arg) STRING_ARG(arg)
+#define STRING_ARG(arg) #arg
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/shared/Makefile
 ,7 → 27,6
 #
 include ../../../../version
--include ../../../../Makefile.config
 ## Setup toolchain
 #
 ,7 → 36,7
 SOFTINT_PREFIX = ../../../lib/softint
 RTLD_PREFIX = ../../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
-#include arch/$(ARCH)/Makefile.inc
+#include arch/$(UARCH)/Makefile.inc
 ARCH_SOURCES :=
 LFLAGS = -shared -soname libc.so.0 --whole-archive
 ,14 → 48,6
 DEFS += -DRELEASE=\"$(RELEASE)\"
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,22 → 55,22
 .PHONY: all clean
-all: $(OUTPUT) arch/$(ARCH)/_link.ld
+all: $(OUTPUT) arch/$(UARCH)/_link.ld
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(ARCH)/_link.ld  arch/$(ARCH)/_lib.ld include/arch
-    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(UARCH)/_link.ld  arch/$(UARCH)/_lib.ld include/arch
+    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
-$(OUTPUT): $(LIBS) arch/$(ARCH)/_lib.ld
-    $(LD) -T arch/$(ARCH)/_lib.ld $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(LIBS) arch/$(UARCH)/_lib.ld
+    $(LD) -T arch/$(UARCH)/_lib.ld $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
-arch/$(ARCH)/_lib.ld: arch/$(ARCH)/_lib.ld.in
+arch/$(UARCH)/_lib.ld: arch/$(UARCH)/_lib.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(APP_LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

/branches/dynload/uspace/lib/libc/shared/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/lib/libc/shared/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/lib/libc/shared/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/Makefile.app
 ,8 → 32,8
 ifeq ($(CONFIG_SHARED_LIBC),y)
     LFLAGS := -Bdynamic -I/app/dload -rpath-link $(RTLD_PREFIX)
     LIBS = $(LIBC_PREFIX)/shared/libc.so.0
-    LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link.ld
+    LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
 else
     LIBS = $(LIBC_PREFIX)/libc.a
-    LD_SCRIPT = $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld
+    LD_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 endif

 /branches/dynload/uspace/lib/libc/Makefile.toolchain
 ,15 → 26,23
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe -g
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =
+## Cross-toolchain prefix
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 ## Setup platform configuration
 #
--include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
+-include $(LIBC_PREFIX)/../../../Makefile.config
+-include $(LIBC_PREFIX)/../../../config.defs
+-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
 ## Simple detection of the host system
 #
 ,6 → 66,7
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,6 → 76,7
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 86,5
     AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

 /branches/dynload/uspace/lib/libc/Makefile
 ,8 → 30,6
 ## Common compiler flags
 #
--include ../../../Makefile.config
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
 RTLD_PREFIX = ../../lib/rtld
 ,7 → 45,6
 ## Sources
 #
 GENERIC_SOURCES = \
     generic/libc.c \
     generic/ddi.c \
 ,8 → 90,8
     generic/vfs/canonify.c
 ARCH_SOURCES += \
-    arch/$(ARCH)/src/entry.s \
-    arch/$(ARCH)/src/thread_entry.s
+    arch/$(UARCH)/src/entry.s \
+    arch/$(UARCH)/src/thread_entry.s
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 ,21 → 100,21
 .PHONY: all clean depend kerninc
-all: kerninc libc.a libc.pic.a arch/$(ARCH)/_link.ld
+all: kerninc libc.a libc.pic.a arch/$(UARCH)/_link.ld
 kerninc:
     ln -sfn ../../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
-    ln -sfn ../arch/$(ARCH)/include include/libarch
+    ln -sfn ../arch/$(UARCH)/include include/libarch
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch include/libarch libc.a libc.pic.a arch/$(ARCH)/_link.ld Makefile.depend
+    -rm -f include/kernel include/arch include/libarch libc.a libc.pic.a arch/$(UARCH)/_link.ld Makefile.depend
     find . \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
 depend: kerninc
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
     -makedepend $(DEFS) $(PIC_CFLAGS) -o.pio -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) >> Makefile.depend 2> /dev/null
 libc.a: depend $(OBJECTS)
 ,7 → 123,7
 libc.pic.a: depend $(PIC_OBJECTS)
     $(AR) rc $@ $(LIBS) $(PIC_OBJECTS)
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/branches/dynload/uspace/lib/libc/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/sparc64/Makefile.inc
 ,15 → 29,11
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = sparc64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N

/branches/dynload/uspace/lib/libc/arch/ia64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/ia64/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = ia64-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
 CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
 ,10 → 35,10
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c\
-        arch/$(ARCH)/src/ddi.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/ddi.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

/branches/dynload/uspace/lib/libc/arch/arm32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/arm32/Makefile.inc
 ,20 → 30,16
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
-AFLAGS +=
+AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

 /branches/dynload/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,17 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = mips-sgi-irix5
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
 CFLAGS += -mips3
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+        arch/$(UARCH)/src/fibril.S \
+        arch/$(UARCH)/src/tls.c
 LFLAGS += -N

/branches/dynload/uspace/lib/libc/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,16 → 29,12
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32

/branches/dynload/uspace/lib/libc/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/amd64/Makefile.inc
 ,16 → 29,12
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 LFLAGS += -N

/branches/dynload/uspace/lib/libc/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/mips32/Makefile.inc
 ,23 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
--include ../../../Makefile.config
-ifeq ($(CONFIG_MIPS_FPU),y)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-    arch/$(ARCH)/src/fibril.S \
-    arch/$(ARCH)/src/tls.c
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips

/branches/dynload/uspace/lib/libc/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/ia32/Makefile.inc
 ,17 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/setjmp.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/setjmp.S
 LFLAGS += -N

 /branches/dynload/uspace/srv/kbd/Makefile
 ,8 → 29,6
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 ,50 → 47,50
     generic/key_buffer.c
 ARCH_SOURCES = \
-    arch/$(ARCH)/src/kbd.c
+    arch/$(UARCH)/src/kbd.c
-ifeq ($(ARCH), ia32)
+ifeq ($(UARCH), ia32)
     ARCH_SOURCES += \
-        arch/$(ARCH)/src/mouse.c \
-        arch/$(ARCH)/src/scanc.c
+        arch/$(UARCH)/src/mouse.c \
+        arch/$(UARCH)/src/scanc.c
     GENARCH_SOURCES = \
         genarch/src/kbd.c
     CFLAGS += -DMOUSE_ENABLED
 endif
-ifeq ($(ARCH), ia64)
+ifeq ($(UARCH), ia64)
     ARCH_SOURCES += \
-        arch/$(ARCH)/src/mouse.c \
-        arch/$(ARCH)/src/scanc.c \
-        arch/$(ARCH)/src/lkbd.c
+        arch/$(UARCH)/src/mouse.c \
+        arch/$(UARCH)/src/scanc.c \
+        arch/$(UARCH)/src/lkbd.c
     GENARCH_SOURCES = \
         genarch/src/kbd.c
     CFLAGS += -DMOUSE_ENABLED
 endif
-ifeq ($(ARCH), amd64)
+ifeq ($(UARCH), amd64)
     ARCH_SOURCES += \
-        arch/$(ARCH)/src/mouse.c \
-        arch/$(ARCH)/src/scanc.c
+        arch/$(UARCH)/src/mouse.c \
+        arch/$(UARCH)/src/scanc.c
     GENARCH_SOURCES = \
         genarch/src/kbd.c
     CFLAGS += -DMOUSE_ENABLED
 endif
-ifeq ($(ARCH), sparc64)
+ifeq ($(UARCH), sparc64)
     ARCH_SOURCES += \
-        arch/$(ARCH)/src/scanc.c \
-        arch/$(ARCH)/src/sgcn.c
+        arch/$(UARCH)/src/scanc.c \
+        arch/$(UARCH)/src/sgcn.c
     GENARCH_SOURCES = \
         genarch/src/kbd.c \
         genarch/src/nofb.c
 endif
-ifeq ($(ARCH), arm32)
+ifeq ($(UARCH), arm32)
     ARCH_SOURCES += \
-        arch/$(ARCH)/src/kbd_gxemul.c
+        arch/$(UARCH)/src/kbd_gxemul.c
 endif
-ifeq ($(ARCH), mips32)
+ifeq ($(UARCH), mips32)
     GENARCH_SOURCES += \
         genarch/src/nofb.c
 endif
-ifeq ($(ARCH), mips32eb)
+ifeq ($(UARCH), mips32eb)
     GENARCH_SOURCES += \
         genarch/src/nofb.c
 endif
 ,7 → 108,7
 -include Makefile.depend
 links:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
     ln -sfn ../genarch/include include/genarch
 clean:

 /branches/dynload/uspace/srv/kbd/arch/ia64/src/kbd.c
 ,18 → 114,6
-irq_cmd_t ski_cmds[1] = {
-    { CMD_IA64_GETCHAR, 0, 0, 2 }
-};
-irq_code_t ski_kbd = {
-,
-    ski_cmds
-};
 irq_cmd_t ns16550_cmds[1] = {
     { CMD_PORT_READ_1, 0, 0, 2 },
 };
 ,15 → 132,15
 {
     if (sysinfo_value("kbd")) {
         kbd_type=sysinfo_value("kbd.type");
-        if(kbd_type==KBD_SKI) ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ski_kbd);
-        if(kbd_type==KBD_LEGACY) return lkbd_arch_init();
-        if(kbd_type==KBD_NS16550) {
-            ns16550_kbd.cmds[0].addr= (void *)  (sysinfo_value("kbd.port")+RBR_REG);
+        if (kbd_type == KBD_LEGACY)
+            return lkbd_arch_init();
+        if (kbd_type == KBD_NS16550) {
+            ns16550_kbd.cmds[0].addr = (void *) (sysinfo_value("kbd.port") + RBR_REG);
             ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ns16550_kbd);
-            iospace_enable(task_get_id(),ns16550_port=sysinfo_value("kbd.port"),8);
-        }
+            iospace_enable(task_get_id(), ns16550_port = sysinfo_value("kbd.port"), 8);
+        }
         return 0;
-    }
+    }
     return 1;
 }
 ,9 → 158,9
 {
     static unsigned long buf = 0;
     static int count = 0, esc_count=0;
     int scan_code = IPC_GET_ARG2(*call);
     if (scan_code == 0x1b) {
         esc_count++;
         if (esc_count == 3) {
 ,10 → 169,12
     } else {
         esc_count = 0;
     }
-    if(scan_code==0x0d) return 1;   //Delete CR
-    if(scan_code==0x7f) scan_code='\b'; //Convert backspace
+    if (scan_code == 0x0d)
+        return 1;        /* Delete CR */
+    if (scan_code == 0x7f)
+        scan_code='\b';  /* Convert backspace */
     if(scan_code == 0x7e) {
         switch (buf) {
         case NSKEY_F6:
 ,12 → 298,6
     return 1;
 }
 int kbd_ski_process(keybuffer_t *keybuffer, ipc_call_t *call)
 {
     static unsigned long long buf = 0;
 ,11 → 377,12
 int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
 {
     printf("KBD Key pressed: %x(%c)\n",IPC_GET_ARG2(*call),IPC_GET_ARG2(*call));
-    if(kbd_type==KBD_SKI) return kbd_ski_process(keybuffer,call);
-    if(kbd_type==KBD_NS16550) return kbd_ns16550_process(keybuffer,call);
-    if(kbd_type==KBD_LEGACY) return lkbd_arch_process(keybuffer,call);
+    if (kbd_type == KBD_SKI)
+        return kbd_ski_process(keybuffer, call);
+    if (kbd_type == KBD_NS16550)
+        return kbd_ns16550_process(keybuffer,call);
+    if (kbd_type == KBD_LEGACY)
+        return lkbd_arch_process(keybuffer,call);
 }
 ,4 → 389,4
 /**
  * @}
- */
+ */

 /branches/dynload/uspace/srv/kbd/arch/ppc32/src/kbd.c
 ,16 → 40,7
 #include <kbd.h>
 #include <keys.h>
-irq_cmd_t cuda_cmds[1] = {
-    { CMD_PPC32_GETCHAR, 0, 0, 2 }
-};
-irq_code_t cuda_kbd = {
-,
-    cuda_cmds
-};
 #define SPECIAL     255
 #define FUNCTION_KEYS 0x100
 ,7 → 177,7
     if (!sysinfo_value("kbd"))
         return 0;
-    return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &cuda_kbd);
+    return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, 0);
 }

 /branches/dynload/uspace/srv/ns/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,7 → 58,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/console/Makefile
 ,12 → 29,11
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
-include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I. -I../kbd/include -I../fb
 LIBS = $(LIBC_PREFIX)/libc.a
 ,7 → 73,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/rd/Makefile
 ,10 → 29,10
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,7 → 59,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/loader/Makefile
 ,29 → 27,19
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
--include ../../../Makefile.config
 ## Setup toolchain
 #
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(ARCH)/Makefile.inc
+include arch/$(UARCH)/Makefile.inc
 CFLAGS += -Iinclude
 LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,18 → 59,18
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
-    $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+    $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/branches/dynload/uspace/srv/loader/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/srv/loader/arch/sparc64/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__64_BITS__
ARCH_SOURCES := arch/$(ARCH)/sparc64.s
ARCH_SOURCES := arch/$(UARCH)/sparc64.s

/branches/dynload/uspace/srv/loader/arch/ia64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/srv/loader/arch/ia64/Makefile.inc
27,5 → 27,5
#

CFLAGS += -D__64_BITS__
ARCH_SOURCES := arch/$(ARCH)/ia64.s
ARCH_SOURCES := arch/$(UARCH)/ia64.s
AFLAGS += -xexplicit

 /branches/dynload/uspace/srv/loader/arch/arm32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/dynload/uspace/srv/loader/arch/arm32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/arm32.s
ARCH_SOURCES := arch/$(UARCH)/arm32.s

 /branches/dynload/uspace/srv/loader/arch/ppc32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/dynload/uspace/srv/loader/arch/ppc32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/ppc32.s
ARCH_SOURCES := arch/$(UARCH)/ppc32.s

/branches/dynload/uspace/srv/loader/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/dynload/uspace/srv/loader/arch/amd64/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__64_BITS__
ARCH_SOURCES := arch/$(ARCH)/amd64.s
ARCH_SOURCES := arch/$(UARCH)/amd64.s

 /branches/dynload/uspace/srv/loader/arch/mips32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/dynload/uspace/srv/loader/arch/mips32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/mips32.s
ARCH_SOURCES := arch/$(UARCH)/mips32.s

 /branches/dynload/uspace/srv/loader/arch/ia32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The difference from _link.ld.in for regular statically-linked apps
  * is the base address and the special interp section.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/dynload/uspace/srv/loader/arch/ia32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/ia32.s
ARCH_SOURCES := arch/$(UARCH)/ia32.s

 /branches/dynload/uspace/srv/fb/fb.c
 ,23 → 236,28
 }
-/** BGR 8:8:8 conversion
+/** RGB 8:8:8 conversion
  *
  */
 static void rgb_888(void *dst, uint32_t rgb)
 {
-#if defined(FB_INVERT_ENDIAN)
-    ((uint8_t *) dst)[0] = RED(rgb, 8);
-    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
-#else
     ((uint8_t *) dst)[0] = BLUE(rgb, 8);
     ((uint8_t *) dst)[1] = GREEN(rgb, 8);
     ((uint8_t *) dst)[2] = RED(rgb, 8);
-#endif
 }
+/** BGR 8:8:8 conversion
+ *
+ */
+static void bgr_888(void *dst, uint32_t rgb)
+{
+    ((uint8_t *) dst)[0] = RED(rgb, 8);
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
+    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
+}
 /** RGB 5:5:5 conversion
  *
  */
 ,6 → 602,10
         screen.rgb_conv = rgb_888;
         screen.pixelbytes = 3;
         break;
+    case VISUAL_BGR_8_8_8:
+        screen.rgb_conv = bgr_888;
+        screen.pixelbytes = 3;
+        break;
     case VISUAL_RGB_8_8_8_0:
         screen.rgb_conv = rgb_888;
         screen.pixelbytes = 4;

 /branches/dynload/uspace/srv/fb/ega.c
 ,8 → 72,6
 #define NORMAL_COLOR        ega_normal_color
 #define INVERTED_COLOR      ega_inverted_color
-#define EGA_STYLE(fg,bg) ((fg) > (bg) ? NORMAL_COLOR : INVERTED_COLOR)
 /* Allow only 1 connection */
 static int client_connected = 0;
 ,6 → 81,8
 static unsigned int style;
+static unsigned attr_to_ega_style(const attrs_t *a);
 static void clrscr(void)
 {
     int i;
 ,10 → 156,7
     for (i = 0; i < scr_width * scr_height; i++) {
         scr_addr[i * 2] = data[i].character;
-        /* FIXME
-        scr_addr[i * 2 + 1] = EGA_STYLE(data[i].style.fg_color,
-            data[i].style.bg_color);
-        */
+        scr_addr[i * 2 + 1] = attr_to_ega_style(&data[i].attrs);
     }
 }
 ,7 → 185,51
     return i;
 }
+static int style_to_ega_style(int style)
+{
+    unsigned int ega_style;
+    switch (style) {
+    case STYLE_NORMAL:
+        ega_style = INVERTED_COLOR;
+        break;
+    case STYLE_EMPHASIS:
+        ega_style = INVERTED_COLOR | 4;
+        break;
+    default:
+        return INVERTED_COLOR;
+    }
+    return ega_style;
+}
+static unsigned int color_to_ega_style(int fg_color, int bg_color, int attr)
+{
+    unsigned int style;
+    style = (fg_color & 7) | ((bg_color & 7) << 4);
+    if (attr & CATTR_BRIGHT)
+        style = style | 0x08;
+    return style;
+}
+static unsigned int rgb_to_ega_style(uint32_t fg, uint32_t bg)
+{
+    return (fg > bg) ? NORMAL_COLOR : INVERTED_COLOR;
+}
+static unsigned attr_to_ega_style(const attrs_t *a)
+{
+    switch (a->t) {
+    case at_style: return style_to_ega_style(a->a.s.style);
+    case at_rgb: return rgb_to_ega_style(a->a.r.fg_color, a->a.r.bg_color);
+    case at_idx: return color_to_ega_style(a->a.i.fg_color,
+        a->a.i.bg_color, a->a.i.flags);
+    default: return INVERTED_COLOR;
+    }
+}
 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
     int retval;
 ,7 → 237,8
     ipc_call_t call;
     char c;
     unsigned int row, col;
-    int bgcolor,fgcolor;
+    int bg_color, fg_color, attr;
+    uint32_t bg_rgb, fg_rgb;
     keyfield_t *interbuf = NULL;
     size_t intersize = 0;
     int i;
 ,25 → 321,20
             retval = 0;
             break;
         case FB_SET_STYLE:
+            style = style_to_ega_style(IPC_GET_ARG1(call));
             retval = 0;
-            switch (IPC_GET_ARG1(call)) {
-            case STYLE_NORMAL: style = INVERTED_COLOR; break;
-            case STYLE_EMPHASIS: style = INVERTED_COLOR | 4; break;
-            default: retval = EINVAL;
-            }
             break;
         case FB_SET_COLOR:
-            fgcolor = IPC_GET_ARG1(call);
-            bgcolor = IPC_GET_ARG2(call);
-            style = (fgcolor & 7) | ((bgcolor & 7) << 4);
-            if (IPC_GET_ARG3(call) & CATTR_BRIGHT)
-                style = style | 0x08;
+            fg_color = IPC_GET_ARG1(call);
+            bg_color = IPC_GET_ARG2(call);
+            attr = IPC_GET_ARG3(call);
+            style = color_to_ega_style(fg_color, bg_color, attr);
             retval = 0;
             break;
         case FB_SET_RGB_COLOR:
-            fgcolor = IPC_GET_ARG1(call);
-            bgcolor = IPC_GET_ARG2(call);
-            style = EGA_STYLE(fgcolor, bgcolor);
+            fg_rgb = IPC_GET_ARG1(call);
+            bg_rgb = IPC_GET_ARG2(call);
+            style = rgb_to_ega_style(fg_rgb, bg_rgb);
             retval = 0;
             break;
         case FB_VP_DRAW_PIXMAP:
 ,11 → 372,12
     ega_ph_addr = (void *) sysinfo_value("fb.address.physical");
     scr_width = sysinfo_value("fb.width");
     scr_height = sysinfo_value("fb.height");
-    if(sysinfo_value("fb.blinking"))
-    {
-            ega_normal_color &= 0x77;
-            ega_inverted_color &= 0x77;
+    if(sysinfo_value("fb.blinking")) {
+        ega_normal_color &= 0x77;
+        ega_inverted_color &= 0x77;
     }
     style = NORMAL_COLOR;
     iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2);

 /branches/dynload/uspace/srv/fb/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../libipc/include
 ,41 → 46,43
     main.c \
     ppm.c
-ifneq ($(ARCH), ia64)
+ifneq ($(UARCH),ia64)
     SOURCES += fb.c \
         font-8x16.c
     CFLAGS += -DFB_ENABLED
 endif
-ifeq ($(ARCH), ia32)
+ifeq ($(UARCH),ia32)
     SOURCES += ega.c
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(ARCH), ia64)
+ifeq ($(UARCH),ia64)
     SOURCES += ega.c \
-           ski.c \
-           serial_console.c
+        ski.c \
+        serial_console.c
     CFLAGS += -DSKI_ENABLED
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(ARCH), amd64)
+ifeq ($(UARCH),amd64)
     SOURCES += ega.c
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(ARCH), arm32)
-    CFLAGS += -DFB_INVERT_ENDIAN
-endif
-ifeq ($(ARCH), mips32)
+ifeq ($(UARCH),mips32)
     SOURCES += msim.c \
-                   serial_console.c
-    CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN
+        serial_console.c
+    CFLAGS += -DMSIM_ENABLED
 endif
-ifeq ($(ARCH), sparc64)
+ifeq ($(UARCH),sparc64)
     SOURCES += sgcn.c \
-               serial_console.c
+        serial_console.c
     CFLAGS += -DSGCN_ENABLED
 endif
-CFLAGS += -D$(ARCH)
+CFLAGS += -D$(UARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,7 → 100,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/fs/tmpfs/Makefile
 ,12 → 29,11
 ## Setup toolchain
 #
--include ../../../../Makefile.config
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
 LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
 ,7 → 67,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/fs/fat/fat.c
 ,7 → 122,7
     int vfs_phone;
     int rc;
-    printf("FAT: HelenOS FAT file system server.\n");
+    printf("fat: HelenOS FAT file system server.\n");
     rc = fat_idx_init();
     if (rc != EOK)

 /branches/dynload/uspace/srv/fs/fat/Makefile
 ,12 → 29,11
 ## Setup toolchain
 #
--include ../../../../Makefile.config
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
 LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
 ,7 → 69,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/pci/libpci/Makefile
 ,8 → 3,6
 # Modified and ported to HelenOS by Jakub Jermar
--include ../../../../Makefile.config
 LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd)
 include $(LIBC_PREFIX)/Makefile.toolchain

 /branches/dynload/uspace/srv/pci/Makefile
 ,11 → 29,10
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 include $(LIBC_PREFIX)/Makefile.app

 /branches/dynload/uspace/srv/devmap/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../libipc/include
 ,7 → 45,7
 SOURCES = \
     devmap.c
-CFLAGS += -D$(ARCH)
+CFLAGS += -D$(UARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,7 → 62,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/vfs/Makefile
 ,10 → 30,9
 ## Setup toolchain
 #
--include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,7 → 64,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/Makefile
 ,28 → 60,20
     app/init \
     app/bdsh
-ifeq ($(ARCH), amd64)
+ifeq ($(UARCH),amd64)
     DIRS += srv/pci
 endif
-ifeq ($(ARCH), ia32)
+ifeq ($(UARCH),ia32)
     DIRS += srv/pci
 endif
-ifeq ($(ARCH), mips32)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
-ifeq ($(ARCH), mips32eb)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))
 .PHONY: all $(BUILDS) $(CLEANS) clean kerninc
-all: ../Makefile.config kerninc $(BUILDS)
+all: ../Makefile.config ../config.h ../config.defs kerninc $(BUILDS)
 clean: $(CLEANS)

 /branches/dynload/HelenOS.config
 ,5 → 1,6
 #
 # Copyright (c) 2006 Ondrej Palkovsky
+# Copyright (c) 2009 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,11 → 34,9
 @ "amd64" AMD64/Intel EM64T (PC)
 @ "arm32" ARM 32-bit
 @ "ia32" Intel IA-32 (PC)
-@ "ia32xen" Intel IA-32 on Xen hypervisor
 @ "ia64" Intel IA-64
 @ "mips32" MIPS 32-bit
 @ "ppc32" PowerPC 32-bit (iMac G4)
-@ "ppc64" PowerPC 64-bit (iMac G5)
 @ "sparc64" Sun UltraSPARC 64-bit
 ! PLATFORM (choice)
 ,7 → 58,7
 @ "core" Core Solo/Duo
 @ "athlon-xp" Athlon XP
 @ "athlon-mp" Athlon MP
-! [PLATFORM=ia32|PLATFORM=ia32xen] MACHINE (choice)
+! [PLATFORM=ia32] MACHINE (choice)
 % CPU type
 @ "opteron" Opteron
 ,6 → 75,134
 ! RDFMT (choice)
+## Mapping between platform and kernel architecture
+% Kernel architecture
+@ "amd64"
+! [PLATFORM=amd64] KARCH (choice)
+% Kernel architecture
+@ "arm32"
+! [PLATFORM=arm32] KARCH (choice)
+% Kernel architecture
+@ "ia32"
+! [PLATFORM=ia32] KARCH (choice)
+% Kernel architecture
+@ "ia32xen"
+! [PLATFORM=ia32xen] KARCH (choice)
+% Kernel architecture
+@ "ia64"
+! [PLATFORM=ia64] KARCH (choice)
+% Kernel architecture
+@ "mips32"
+! [PLATFORM=mips32] KARCH (choice)
+% Kernel architecture
+@ "ppc32"
+! [PLATFORM=ppc32] KARCH (choice)
+% Kernel architecture
+@ "ppc64"
+! [PLATFORM=ppc64] KARCH (choice)
+% Kernel architecture
+@ "sparc64"
+! [PLATFORM=sparc64] KARCH (choice)
+## Mapping between platform and user space architecture
+% User space architecture
+@ "amd64"
+! [PLATFORM=amd64] UARCH (choice)
+% User space architecture
+@ "arm32"
+! [PLATFORM=arm32] UARCH (choice)
+% User space architecture
+@ "ia32"
+! [PLATFORM=ia32|PLATFORM=ia32xen] UARCH (choice)
+% User space architecture
+@ "ia64"
+! [PLATFORM=ia64] UARCH (choice)
+% User space architecture
+@ "mips32"
+! [PLATFORM=mips32&(MACHINE=msim|MACHINE=simics|MACHINE=lgxemul)] UARCH (choice)
+% User space architecture
+@ "mips32eb"
+! [PLATFORM=mips32&(MACHINE=bgxemul)] UARCH (choice)
+% User space architecture
+@ "ppc32"
+! [PLATFORM=ppc32] UARCH (choice)
+% User space architecture
+@ "ppc64"
+! [PLATFORM=ppc64] UARCH (choice)
+% User space architecture
+@ "sparc64"
+! [PLATFORM=sparc64] UARCH (choice)
+## Mapping between platform and boot architecture
+% Boot architecture
+@ "amd64"
+! [PLATFORM=amd64] BARCH (choice)
+% Boot architecture
+@ "arm32"
+! [PLATFORM=arm32] BARCH (choice)
+% Boot architecture
+@ "ia32"
+! [PLATFORM=ia32] BARCH (choice)
+% Boot architecture
+@ "ia32xen"
+! [PLATFORM=ia32xen] BARCH (choice)
+% Boot architecture
+@ "ia64"
+! [PLATFORM=ia64] BARCH (choice)
+% Boot architecture
+@ "mips32"
+! [PLATFORM=mips32] BARCH (choice)
+% Boot architecture
+@ "ppc32"
+! [PLATFORM=ppc32] BARCH (choice)
+% Boot architecture
+@ "ppc64"
+! [PLATFORM=ppc64] BARCH (choice)
+% Boot architecture
+@ "sparc64"
+! [PLATFORM=sparc64] BARCH (choice)
+## Mapping between platform and image format
+% Image format
+@ "binary"
+! [PLATFORM=mips32&MACHINE=msim] IMAGE (choice)
+% Image format
+@ "ecoff"
+! [PLATFORM=mips32&(MACHINE=simics|MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
 ## Compiler options
 % Compiler
 ,7 → 210,7
 @ "gcc_native" GCC Native
 @ "icc_native" ICC Native
 @ "suncc_native" Sun Studio C Compiler
-! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen] COMPILER (choice)
+! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 % Compiler
 @ "gcc_cross" GCC Cross-compiler
 ,7 → 227,7
 % Compiler
 @ "gcc_cross" GCC Cross-compiler
 @ "gcc_native" GCC Native
-! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=ppc64] COMPILER (choice)
+! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
 ## Debug build options
 ,19 → 236,61
 ! CONFIG_DEBUG (y/n)
+## Kernel configuration
+% Fences
+! [PLATFORM=ia32&(MACHINE=athlon-xp|MACHINE=athlon-mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
+% Fences
+! [(PLATFORM=ia32&(MACHINE=pentium4|MACHINE=core))|PLATFORM=amd64] CONFIG_FENCES_P4 (y)
+% ACPI support
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_ACPI (y)
+% Hierarchical page tables support
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
+% Page hash table support
+! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
+% i8042 controller support
+! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_I8042 (y)
+% Sun keyboard support
+! [PLATFORM=sparc64] CONFIG_SUN_KBD (y)
+% EGA support
+! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_EGA (y)
+% Software integer division support
+! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
+% ASID support
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
+% ASID FIFO support
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
+% OpenFirmware tree support
+! [PLATFORM=sparc64] CONFIG_OFW_TREE (y)
+% FPU support
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64|(PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul))] CONFIG_FPU (y)
 ## Kernel features options
 % Support for SMP
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia32xen|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
+! [(PLATFORM=ia32&MACHINE!=athlon-xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
 % Improved support for hyperthreading
-! [(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia32xen)&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [((PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3)|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
 % Simics BIOS AP boot fix
 ! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_SIMICS_FIX (y/n)
 % Lazy FPU context switching
-! [(PLATFORM=mips32&MACHINE!=msim&MACHINE!=simics)|PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64|PLATFORM=sparc64|PLATFORM=ia32xen] CONFIG_FPU_LAZY (y/n)
+! [CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
 % Use VHPT
 ! [PLATFORM=ia64] CONFIG_VHPT (n/y)
 ,9 → 304,6
 % Support for NS16550 serial port
 ! [PLATFORM=sparc64|(PLATFORM=ia64&MACHINE!=ski)] CONFIG_NS16550 (n/y)
-% Support for Serengeti console
-! [PLATFORM=sparc64] CONFIG_SGCN (y/n)
 % IOSapic on default address support
 ! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
 ,6 → 313,9
 % Interrupt-driven driver for NS16550
 ! [CONFIG_NS16550=y&((PLATFORM!=ia64)|CONFIG_IOSAPIC=y)&MACHINE!=ski] CONFIG_NS16550_INTERRUPT_DRIVEN (y/n)
+% Support for Serengeti console
+! [PLATFORM=sparc64] CONFIG_SGCN (y/n)
 % Virtually indexed D-cache support
 ! [PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n)
 ,10 → 332,10
 ! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
 % Watchpoint on rewriting AS with zero
-! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
+! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
 % Save all interrupt registers
-! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32|PLATFORM=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n)
+! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32)] CONFIG_DEBUG_ALLREGS (y/n)
 % Compile kernel tests
 ! CONFIG_TEST (y/n)
 ,8 → 344,11
 ## Hardware support
 % Framebuffer support
-! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)] CONFIG_FB (y/n)
+! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
+% Framebuffer support
+! [PLATFORM=ppc32|(PLATFORM=sparc64&MACHINE=us)] CONFIG_FB (y)
 % Framebuffer width
 @ "640"
 @ "800"

 /branches/dynload/boot/tools/ia32/gen_vga323.c
 ,8 → 1,36
+/*
+ * Copyright (c) 2008 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 <stdio.h>
-#define RED(i) ((i >> 5) & ((1 << 3) - 1))
-#define GREEN(i) ((i >> 3) & ((1 << 2) - 1))
-#define BLUE(i) (i & ((1 << 3) - 1))
+#define RED(i)    (((i) >> 5) & ((1 << 3) - 1))
+#define GREEN(i)  (((i) >> 3) & ((1 << 2) - 1))
+#define BLUE(i)   ((i) & ((1 << 3) - 1))
 int main(int argc, char *argv[]) {
     unsigned int i;

 /branches/dynload/boot/genarch/ofw.h
 ,7 → 123,7
 extern int ofw_memmap(memmap_t *map);
 extern int ofw_screen(screen_t *screen);
 extern int ofw_macio(macio_t *macio);
-extern int setup_palette(void);
+extern int ofw_setup_palette(void);
 extern void ofw_quiesce(void);
 #endif

 /branches/dynload/boot/genarch/ofw.c
 ,7 → 25,7
  * (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>
 #include <ofwarch.h>
 #include <printf.h>
 ,23 → 372,30
     return true;
 }
+#define RED(i)    (((i) >> 5) & ((1 << 3) - 1))
+#define GREEN(i)  (((i) >> 3) & ((1 << 2) - 1))
+#define BLUE(i)   ((i) & ((1 << 3) - 1))
+#define CLIP(i)   ((i) <= 255 ? (i) : 255)
 /**
  * Sets up the palette for the 8-bit color depth configuration so that the
  * 3:2:3 color scheme can be used. Checks that setting the palette makes sense
  * (appropriate nodes exist in the OBP tree and the color depth is not greater
- * than 8).
+ * than 8).
  *
- * @return  true if the palette has been set, false otherwise
+ * @return true if the palette has been set, false otherwise
+ *
  */
-int setup_palette(void)
+int ofw_setup_palette(void)
 {
     char device_name[BUF_SIZE];
     /* resolve alias */
     if (ofw_get_property(ofw_aliases, "screen", device_name,
-        sizeof(device_name)) <= 0)
+        sizeof(device_name)) <= 0)
         return false;
     /* for depth greater than 8 it makes no sense to set up the palette */
     uint32_t depth;
     phandle device = ofw_find_device(device_name);
 ,15 → 410,12
     ihandle screen = ofw_open(device_name);
     if (screen == -1)
         return false;
     /* setup the palette so that the (inverted) 3:2:3 scheme is usable */
     unsigned int i;
     for (i = 0; i < 256; i++)
-        if (ofw_call("call-method", 6, 1, NULL, "color!", screen,
-- i,
-            i << 5,
-            (i >> 3) << 6,
-            (i >> 5) << 5) != 0);
+        ofw_call("call-method", 6, 1, NULL, "color!", screen,
+- i, CLIP(BLUE(i) * 37), GREEN(i) * 85, CLIP(RED(i) * 37));
     return true;
 }

 /branches/dynload/boot/generic/macros.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2009 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.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef BOOT_MACROS_H_
+#define BOOT_MACROS_H_
+#define SIZE2KB(size) ((size) >> 10)
+#define SIZE2MB(size) ((size) >> 20)
+#define KB2SIZE(kb) ((kb) << 10)
+#define MB2SIZE(mb) ((mb) << 20)
+#define STRING(arg) STRING_ARG(arg)
+#define STRING_ARG(arg) #arg
+#endif
+/** @}
+ */

 /branches/dynload/boot/Makefile
 ,6 → 30,7
 #
 -include ../Makefile.config
+-include ../config.defs
 ## Paths
 #
 ,23 → 39,11
 KERNELDIR = $(BASE)/kernel
 USPACEDIR = $(BASE)/uspace
-ifeq ($(CONFIG_DEBUG),y)
-    DEFS += -DCONFIG_DEBUG
-endif
-ifeq ($(CONFIG_BAT),y)
-    DEFS += -DCONFIG_BAT
-endif
-ifeq ($(CONFIG_AP),y)
-    DEFS += -DCONFIG_AP
-endif
 .PHONY: all build clean generic_clean
-all: ../Makefile.config build
+all: ../Makefile.config ../config.h ../config.defs build
--include arch/$(ARCH)/Makefile.inc
+-include arch/$(BARCH)/Makefile.inc
 generic_clean:
     -rm generic/*.o genarch/*.o

/branches/dynload/boot/arch/ia32xen/grub/stage2_eltorito
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/dynload/boot/arch/ia32xen/grub/xen.gz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/branches/dynload/boot/arch/ia32xen/grub/xen.debug.gz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /branches/dynload/boot/arch/sparc64/Makefile.inc
 ,42 → 28,38
 TMP = distroot
-ifeq ($(CONFIG_AOUT_ISOFS_B),n)
-    SILO_PACKAGE=silo.patched.tar.gz
-endif
 ifeq ($(CONFIG_AOUT_ISOFS_B),y)
-    SILO_PACKAGE=silo.tar.gz
+    SILO_PACKAGE = silo.tar.gz
+else
+    SILO_PACKAGE = silo.patched.tar.gz
 endif
 build: $(BASE)/image.iso
+$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
+    mkdir -p $(TMP)/boot
+    mkdir -p $(TMP)/HelenOS
+    cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
+    cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-SILO_CONF_FILTER = cat
+    cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
 else
-SILO_CONF_FILTER = grep -v initrd
+    cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
 endif
-$(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
-    mkdir -p $(TMP)/boot
-    mkdir -p $(TMP)/HelenOS
-    cat arch/$(ARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
-    cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING $(TMP)/boot
-    cat arch/$(ARCH)/silo/silo.conf | $(SILO_CONF_FILTER) >$(TMP)/boot/silo.conf
-    cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
     gzip -f $(TMP)/HelenOS/image.boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-    cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+    cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
 endif
     mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    $(MAKE) -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+    $(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean: generic_clean
-    $(MAKE) -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+    $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -fr $(TMP)
     -rm -f $(BASE)/image.iso

 /branches/dynload/boot/arch/sparc64/loader/main.c
 ,21 → 36,23
 #include <ofw_tree.h>
 #include "ofwarch.h"
 #include <align.h>
+#include <macros.h>
+#include <string.h>
 bootinfo_t bootinfo;
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif
 ,7 → 275,7
     printf("done.\n");
 #endif
-    setup_palette();
+    ofw_setup_palette();
     printf("\nBooting the kernel...\n");
     jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,

 /branches/dynload/boot/arch/sparc64/loader/ofwarch.c
 ,7 → 32,7
  * @brief   Architecture dependent parts of OpenFirmware interface.
  */
-#include <ofwarch.h>
+#include <ofwarch.h>
 #include <ofw.h>
 #include <printf.h>
 #include <string.h>

 /branches/dynload/boot/arch/sparc64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,16 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     _components.c \

 /branches/dynload/boot/arch/ia64/Makefile.inc
 ,22 → 26,17
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#ifeq ($(MACHINE),ski)
 build: $(BASE)/image.boot
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean: generic_clean
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot
-#endif

 /branches/dynload/boot/arch/ia64/loader/main.c
 ,6 → 1,6
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,11 → 33,12
 #include "_components.h"
 #include <align.h>
 #include <balloc.h>
+#include <macros.h>
 extern bootinfo_t binfo;
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 void write(const char *str, const int len)
 {
 ,13 → 54,13
 #define DEFAULT_SYS_FREQ        100000000 /* 100MHz */
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /branches/dynload/boot/arch/ia64/loader/gefi/Make.defaults
 ,30 → 27,19
 #
 INSTALLROOT=/usr/local
-TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+TOPDIR    := $(shell pwd)
-ARCH       = $(shell uname -m | sed s,i[3456789]86,ia32,)
-INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
+ARCH       = ia64
+INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
 CPPFLAGS   = -DCONFIG_$(ARCH)
-CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
-LDFLAGS    = -nostdlib
-INSTALL    = install
+CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -frename-registers -mfixed-range=f32-f127
+LDFLAGS    = -nostdlib
+INSTALL    = install
-GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
-#  prefix   =
-CC      = $(prefix)gcc
-AS      = $(prefix)as
-LD      = $(prefix)ld
-AR      = $(prefix)ar
-RANLIB  = $(prefix)ranlib
-OBJCOPY = $(prefix)objcopy
-OBJDUMP = $(prefix)objdump
-ifneq ($(GCC_VERSION),2)
-        CFLAGS += -frename-registers
-endif
-CFLAGS += -mfixed-range=f32-f127
+CC         = $(prefix)gcc
+AS         = $(prefix)as
+LD         = $(prefix)ld
+AR         = $(prefix)ar
+RANLIB     = $(prefix)ranlib
+OBJCOPY    = $(prefix)objcopy
+OBJDUMP    = $(prefix)objdump

 /branches/dynload/boot/arch/ia64/loader/gefi/Makefile
 ,7 → 25,7
 SUBDIRS = lib gnuefi inc
-all:    check_gcc $(SUBDIRS)
+all: $(SUBDIRS)
 $(SUBDIRS):
     $(MAKE) -C $@
 ,13 → 39,4
 .PHONY: $(SUBDIRS) clean depend
-#
-# on both platforms you must use gcc 3.0 or higher
-#
-check_gcc:
-ifeq ($(GCC_VERSION),2)
-    @echo "you need to use a version of gcc >= 3.0, you are using `$(CC) --version`"
-    @exit 1
-endif
 include Make.rules

 /branches/dynload/boot/arch/ia64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,7 → 47,7
     LD = ld
     OBJCOPY = objcopy
     OBJDUMP = objdump
-    GEFI_PREXIX =
+    GEFI_PREFIX =
 endif
 ifeq ($(COMPILER),icc_native)
 ,16 → 68,8
 endif
 #-mno-pic means do not use gp + imm22 to address data
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     ../../../generic/printf.c \
 ,7 → 122,6
 hello.efi: image.boot
     make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
     cp gefi/HelenOS/hello.efi ../../../../
-#   cp gefi/HelenOS/hello.efi /boot/efi/
     cp gefi/HelenOS/image.bin ../../../../
 image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)

 /branches/dynload/boot/arch/arm32/Makefile.inc
 ,15 → 28,15
 build: $(BASE)/image.boot
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean:
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot

 /branches/dynload/boot/arch/arm32/loader/main.c
 ,10 → 35,11
  */
-#include "main.h"
+#include "main.h"
 #include "asm.h"
 #include "_components.h"
 #include <printf.h>
+#include <macros.h>
 #include "mm.h"
 ,16 → 47,16
 #define KERNEL_VIRTUAL_ADDRESS 0x80200000
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /branches/dynload/boot/arch/arm32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,20 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
-ifdef MACHINE
-    CFLAGS += "-DMACHINE=$(MACHINE)"
-endif
 SOURCES = \
     main.c \
     boot.S \

 /branches/dynload/boot/arch/ppc32/Makefile.inc
 ,15 → 28,15
 build: $(BASE)/image.boot
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean: generic_clean
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot

 /branches/dynload/boot/arch/ppc32/loader/_link.ld.in
 ,9 → 1,9
-OUTPUT_FORMAT("elf32-powerpc")
-OUTPUT_ARCH(powerpc:common)
-ENTRY(start)
+OUTPUT_FORMAT("elf32-powerpc")
+OUTPUT_ARCH(powerpc:common)
+ENTRY(start)
 SECTIONS {
-    .boot 0x01000000: AT (0) {
+    .boot 0x01000000: AT (0) {
         *(BOOTSTRAP);
         *(REALMODE);
         *(.text);
 ,12 → 10,12
         *(.rodata);
         *(.rodata.*);
-        *(.data);       /* initialized data */
+        *(.data);       /* initialized data */
         *(.sdata);
         *(.sdata2);
         *(.sbss);
-        *(.bss);        /* uninitialized static variables */
-        *(COMMON);      /* global variables */
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
 [[COMPONENTS]]
     }
 }

 /branches/dynload/boot/arch/ppc32/loader/main.c
 ,6 → 32,7
 #include "_components.h"
 #include <ofw.h>
 #include <align.h>
+#include <macros.h>
 #define HEAP_GAP 1024000
 ,16 → 73,16
     }
 }
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif
 ,6 → 177,8
     fix_overlap(&trans, &trans_pa, "translation table", &top);
     fix_overlap(&bootinfo, &bootinfo_pa, "boot info", &top);
+    ofw_setup_palette();
     printf("\nBooting the kernel...\n");
     jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa, (void *) bootinfo.screen.addr, bootinfo.screen.scanline);
 }

 /branches/dynload/boot/arch/ppc32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,16 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=powerpc -msoft-float -m32 -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=powerpc -msoft-float -m32 -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     ofwarch.c \

 /branches/dynload/boot/arch/amd64/Makefile.inc
 ,18 → 57,18
 build: $(BASE)/image.iso
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
-    mkdir -p arch/$(ARCH)/iso/boot/grub
-    cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
+    mkdir -p arch/$(BARCH)/iso/boot/grub
+    cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
 ifneq ($(RDFMT),tmpfs)
-    cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
+    cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
 endif
 ifneq ($(RDFMT),fat)
-    cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
+    cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
 endif
-    cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
+    cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
     for task in $(INIT_TASKS) ; do \
-        cp $$task arch/$(ARCH)/iso/boot/ ; \
+        cp $$task arch/$(BARCH)/iso/boot/ ; \
     done
     for file in $(RD_SRVS) ; do \
         cp $$file $(USPACEDIR)/dist/srv/ ; \
 ,14 → 77,14
         cp $$file $(USPACEDIR)/dist/app/ ; \
     done
 ifeq ($(RDFMT),tmpfs)
-    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
 endif
-    $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
-    rm arch/$(ARCH)/iso/boot/initrd.fs
-    mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
+    $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
+    rm arch/$(BARCH)/iso/boot/initrd.fs
+    mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(BARCH)/iso/
 clean:
     -for file in $(RD_SRVS) ; do \
 ,5 → 93,5
     -for file in $(RD_APPS) ; do \
         rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
     done
-    -rm -fr arch/$(ARCH)/iso
+    -rm -fr arch/$(BARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/dynload/boot/arch/mips32/Makefile.inc
 ,15 → 28,15
 build: $(BASE)/image.boot
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean:
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot

 /branches/dynload/boot/arch/mips32/loader/main.c
 ,6 → 28,7
 #include "main.h"
 #include <printf.h>
+#include <macros.h>
 #include "msim.h"
 #include "asm.h"
 #include "_components.h"
 ,16 → 35,16
 #define KERNEL_VIRTUAL_ADDRESS 0x80100000
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /branches/dynload/boot/arch/mips32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,9 → 39,11
 ifeq ($(IMAGE),binary)
     LD_IN = binary
 endif
 ifeq ($(IMAGE),ecoff)
     LD_IN = ecoff
 endif
 BFD_NAME = elf32-tradlittlemips
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
 ,16 → 65,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mhard-float -mips3 -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mhard-float -mips3 -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     msim.c \

 /branches/dynload/boot/arch/ia32/Makefile.inc
 ,18 → 63,18
 build: $(BASE)/image.iso
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS)
-    mkdir -p arch/$(ARCH)/iso/boot/grub
-    cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS)
+    mkdir -p arch/$(BARCH)/iso/boot/grub
+    cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
 ifneq ($(RDFMT),tmpfs)
-    cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
+    cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
 endif
 ifneq ($(RDFMT),fat)
-    cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
+    cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
 endif
-    cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
+    cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
     for task in $(INIT_TASKS) ; do \
-        cp $$task arch/$(ARCH)/iso/boot/ ; \
+        cp $$task arch/$(BARCH)/iso/boot/ ; \
     done
     for file in $(RD_SRVS) ; do \
         cp $$file $(USPACEDIR)/dist/srv/ ; \
 ,14 → 86,14
         cp $$file $(USPACEDIR)/dist/app/ ; \
     done
 ifeq ($(RDFMT),tmpfs)
-    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
 endif
-    $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
-    rm arch/$(ARCH)/iso/boot/initrd.fs
-    mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
+    $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
+    rm arch/$(BARCH)/iso/boot/initrd.fs
+    mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(BARCH)/iso/
 clean:
     -for file in $(RD_SRVS) ; do \
 ,5 → 105,5
     -for file in $(RD_APPS) ; do \
         rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
     done
-    -rm -fr arch/$(ARCH)/iso
+    -rm -fr arch/$(BARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/dynload/version
 ,8 → 1,42
+#
+# 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.
+#
+## This file defines the release information of HelenOS.
+#
+# The release string RELEASE consists of three or four components
+# (version, patch level, sublevel and optionally an extra level).
+#
+# The NAME string is the code name of the given release.
+#
 VERSION = 0
-PATCHLEVEL = 3
+PATCHLEVEL = 4
 SUBLEVEL = 0
-#EXTRAVERSION = 0
-NAME = Tartare
 ifdef EXTRAVERSION
     RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)
 ,3 → 43,5
 else
     RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 endif
+NAME = Sinister Valentine

 /branches/dynload/Makefile
 ,82 → 31,6
 -include Makefile.config
-## Setup platform configuration
-#
-ifeq ($(PLATFORM),amd64)
-    KARCH = amd64
-    UARCH = amd64
-    BARCH = amd64
-endif
-ifeq ($(PLATFORM),arm32)
-    KARCH = arm32
-    UARCH = arm32
-    BARCH = arm32
-endif
-ifeq ($(PLATFORM),ia32)
-    KARCH = ia32
-    UARCH = ia32
-    BARCH = ia32
-endif
-ifeq ($(PLATFORM),ia64)
-    KARCH = ia64
-    UARCH = ia64
-    BARCH = ia64
-endif
-ifeq ($(PLATFORM),mips32)
-    KARCH = mips32
-    BARCH = mips32
-    ifeq ($(MACHINE),msim)
-        UARCH = mips32
-        IMAGE = binary
-    endif
-    ifeq ($(MACHINE),simics)
-        UARCH = mips32
-        IMAGE = ecoff
-    endif
-    ifeq ($(MACHINE),bgxemul)
-        UARCH = mips32eb
-        IMAGE = ecoff
-    endif
-    ifeq ($(MACHINE),lgxemul)
-        UARCH = mips32
-        IMAGE = ecoff
-    endif
-endif
-ifeq ($(PLATFORM),ppc32)
-    KARCH = ppc32
-    UARCH = ppc32
-    BARCH = ppc32
-endif
-ifeq ($(PLATFORM),ppc64)
-    KARCH = ppc64
-    UARCH = ppc64
-    BARCH = ppc64
-endif
-ifeq ($(PLATFORM),sparc64)
-    KARCH = sparc64
-    UARCH = sparc64
-    BARCH = sparc64
-endif
-ifeq ($(PLATFORM),ia32xen)
-    KARCH = ia32xen
-    UARCH = ia32
-    BARCH = ia32xen
-endif
 .PHONY: all build config distclean clean cscope
 all:
 ,21 → 37,21
     tools/config.py HelenOS.config default
     $(MAKE) -C . build
-build: Makefile.config
-    $(MAKE) -C kernel ARCH=$(KARCH)
-    $(MAKE) -C uspace ARCH=$(UARCH)
-    $(MAKE) -C boot ARCH=$(BARCH) IMAGE=$(IMAGE)
+build: Makefile.config config.h config.defs
+    $(MAKE) -C kernel
+    $(MAKE) -C uspace
+    $(MAKE) -C boot
 config: HelenOS.config
     tools/config.py HelenOS.config
 distclean: clean
-    rm -f Makefile.config tools/*.pyc
+    rm -f Makefile.config config.h config.defs tools/*.pyc
 clean:
-    -$(MAKE) -C kernel clean ARCH=$(KARCH)
-    -$(MAKE) -C uspace clean ARCH=$(UARCH)
-    -$(MAKE) -C boot clean ARCH=$(BARCH) IMAGE=$(IMAGE)
+    -$(MAKE) -C kernel clean
+    -$(MAKE) -C uspace clean
+    -$(MAKE) -C boot clean
 cscope:
     find kernel boot uspace -regex '^.*\.[chsS]$$' -print > srclist

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4341 → Rev 4342