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

Ignore whitespace Rev 4342 → Rev 4341

 /branches/dynload/contrib/default/ia32xen/Makefile.config
 ,0 → 1,44
+# Platform
+PLATFORM = ia32xen
+# CPU type
+MACHINE = pentium4
+# Ramdisk format
+RDFMT = tmpfs
+# Compiler
+COMPILER = gcc_cross
+# Debug build
+CONFIG_DEBUG = y
+# Support for SMP
+CONFIG_SMP = y
+# Improved support for hyperthreading
+CONFIG_HT = y
+# Lazy FPU context switching
+CONFIG_FPU_LAZY = y
+# Support for userspace debuggers
+CONFIG_UDEBUG = n
+# Kernel console support
+CONFIG_KCONSOLE = y
+# Detailed kernel logging
+CONFIG_LOG = n
+# Deadlock detection support for spinlocks
+CONFIG_DEBUG_SPINLOCK = y
+# Watchpoint on rewriting AS with zero
+CONFIG_DEBUG_AS_WATCHPOINT = y
+# Save all interrupt registers
+CONFIG_DEBUG_ALLREGS = y
+# Compile kernel tests
+CONFIG_TEST = y

 /branches/dynload/contrib/default/ppc64/Makefile.config
 ,0 → 1,23
+# Platform
+PLATFORM = ppc64
+# Ramdisk format
+RDFMT = tmpfs
+# Compiler
+COMPILER = gcc_cross
+# Debug build
+CONFIG_DEBUG = y
+# Support for userspace debuggers
+CONFIG_UDEBUG = n
+# Kernel console support
+CONFIG_KCONSOLE = y
+# Detailed kernel logging
+CONFIG_LOG = n
+# Compile kernel tests
+CONFIG_TEST = y

/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
File deleted

/branches/dynload/kernel/test/fpu/fpu1_skip.c
File deleted

/branches/dynload/kernel/test/fpu/sse1_skip.c
File deleted

 /branches/dynload/kernel/test/fpu/mips2.c
 ,6 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifdef mips32
 #include <print.h>
 #include <debug.h>
 ,9 → 38,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 → 56,7
     thread_detach(THREAD);
     waitq_sleep(&can_start);
     for (i = 0; i < ATTEMPTS; i++) {
         asm volatile (
             "mtc1 %0,$1"
 ,13 → 89,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 → 124,7
     if (!quiet)
         printf("Creating %u threads... ", 2 * THREADS);
     for (i = 0; i < THREADS; i++) {
         thread_t *t;
 ,3 → 162,5
     return "Test failed";
 }
+#endif

 /branches/dynload/kernel/test/fpu/fpu1.c
 ,6 → 27,8
  * 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>
 ,3 → 226,5
     return "Test failed";
 }
+#endif

 /branches/dynload/kernel/test/fpu/sse1.c
 ,6 → 26,8
  * 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 → 38,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;
 ,3 → 162,5
     return "Test failed";
 }
+#endif

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

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

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

 /branches/dynload/kernel/genarch/src/fb/fb.c
 ,28 → 120,23
 }
-/** RGB 8:8:8 conversion
+/** BGR 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
  *
  */
 ,10 → 449,6
         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/genarch/src/kbd/key.c
 ,7 → 40,7
 #include <genarch/kbd/scanc_pc.h>
 #endif
-#if (defined(US)) || (defined(US3))
+#if (defined(sparc64))
 #include <genarch/kbd/scanc_sun.h>
 #endif

 /branches/dynload/kernel/genarch/src/kbd/ns16550.c
 ,6 → 39,9
 #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>
 ,9 → 130,11
     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);
 ,21 → 142,23
     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 → 185,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);
 ,6 → 195,15
             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 → 214,7
  */
 void ns16550_poll(void)
 {
-#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
+#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
     ipl_t ipl;
     ipl = interrupts_disable();
 ,7 → 240,7
         uint8_t x;
         x = ns16550_rbr_read(&ns16550);
+#ifndef ia64
         if (x != IGNORE_CODE) {
             if (x & KEY_RELEASE)
                 key_released(x ^ KEY_RELEASE);
 ,6 → 247,15
             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
 ,7 → 37,9
  */
 #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 → 171,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 → 189,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);
 ,13 → 209,12
 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 → 231,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/include/fb/visuals.h
44,7 → 44,6
#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,41 → 33,39
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 \
75,6 → 73,7
genarch/src/kbd/scanc_pc.c
endif

## Sun keyboard
ifeq ($(CONFIG_SUN_KBD),y)
GENARCH_SOURCES += \
genarch/src/kbd/key.c \
81,16 → 80,20
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 \
101,6 → 104,7
genarch/src/ofw/upa.c
endif

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

 /branches/dynload/kernel/generic/include/ddi/irq.h
 ,6 → 46,8
     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,7 → 79,6

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/include/fpu_context.h
 ,6 → 37,10
 #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/src/main/kinit.c
 ,9 → 74,7
 #define ALIVE_CHARS  4
-#ifdef CONFIG_KCONSOLE
 static char alive[ALIVE_CHARS] = "-\\|/";
-#endif
 /** Kernel initialization thread.
  *

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

 /branches/dynload/kernel/generic/src/console/cmd.c
 ,9 → 616,14
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*fnc)(void);
-    fncptr_t fptr;
+    unative_t (*f)(void);
+#ifdef ia64
+    struct {
+        unative_t f;
+        unative_t gp;
+    } fptr;
+#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,9 → 632,15
         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);
-        printf("Result: %#" PRIxn "\n", fnc());
+#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());
     }
     return 1;
 ,10 → 680,15
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*fnc)(unative_t, ...);
+    unative_t (*f)(unative_t,...);
     unative_t arg1 = argv[1].intval;
-    fncptr_t fptr;
+#ifdef ia64
+    struct {
+        unative_t f;
+        unative_t gp;
+    } fptr;
+#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,9 → 697,16
         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);
-        printf("Result: %#" PRIxn "\n", fnc(arg1));
+#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));
     }
     return 1;
 ,11 → 717,16
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*fnc)(unative_t, unative_t, ...);
+    unative_t (*f)(unative_t,unative_t,...);
     unative_t arg1 = argv[1].intval;
     unative_t arg2 = argv[2].intval;
-    fncptr_t fptr;
+#ifdef ia64
+    struct {
+        unative_t f;
+        unative_t gp;
+    }fptr;
+#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,10 → 735,16
         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);
-        printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
+#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));
     }
     return 1;
 ,12 → 755,17
 {
     uintptr_t symaddr;
     char *symbol;
-    unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
+    unative_t (*f)(unative_t,unative_t,unative_t,...);
     unative_t arg1 = argv[1].intval;
     unative_t arg2 = argv[2].intval;
     unative_t arg3 = argv[3].intval;
-    fncptr_t fptr;
+#ifdef ia64
+    struct {
+        unative_t f;
+        unative_t gp;
+    }fptr;
+#endif
     symaddr = get_symbol_addr((char *) argv->buffer);
     if (!symaddr)
         printf("Symbol %s not found.\n", argv->buffer);
 ,10 → 774,16
         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);
-        printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
+#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));
     }
     return 1;
 ,9 → 996,9
     test_t *test;
     for (test = tests; test->name != NULL; test++)
-        printf("%-10s %s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        printf("%s\t\t%s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-    printf("%-10s Run all safe tests\n", "*");
+    printf("*\t\tRun all safe tests\n");
     return 1;
 }

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

 /branches/dynload/kernel/generic/src/ipc/irq.c
 ,6 → 100,7
             *((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;
 ,6 → 107,17
         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/proc/thread.c
 ,7 → 102,7
 thread_id_t last_tid = 0;
 static slab_cache_t *thread_slab;
-#ifdef CONFIG_FPU
+#ifdef ARCH_HAS_FPU
 slab_cache_t *fpu_context_slab;
 #endif
 ,7 → 161,7
     /* call the architecture-specific part of the constructor */
     thr_constructor_arch(t);
-#ifdef CONFIG_FPU
+#ifdef ARCH_HAS_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 CONFIG_FPU
+#ifdef ARCH_HAS_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 CONFIG_FPU
+#ifdef ARCH_HAS_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 CONFIG_FPU
+#ifdef ARCH_HAS_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/udebug/udebug.c
41,7 → 41,6
#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,7 → 44,6
#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/arch/sparc64/src/console.c
 ,7 → 69,6
  */
 static void standard_console_init(ofw_tree_node_t *aliases)
 {
-#ifdef CONFIG_FB
     stdin = NULL;
     ofw_tree_property_t *prop;
 ,10 → 96,6
         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. */
 ,9 → 175,7
  */
 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
 ,19 → 161,5
     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/sparc64/include/types.h
 ,9 → 59,6
 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/include/drivers/ns16550.h
 ,0 → 1,42
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 sparc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_sparc64_NS16550_H_
+#define KERN_sparc64_NS16550_H_
+#endif
+/** @}
+ */

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

#include <arch/types.h>

#define ARCH_HAS_FPU
#define FPU_CONTEXT_ALIGN 8

typedef struct {

 /branches/dynload/kernel/arch/sparc64/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_NAME = elf64-sparc
 BFD_ARCH = sparc
 BFD = binary
 ,8 → 46,46
 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)
 ,50 → 93,47
 endif
 ARCH_SOURCES = \
-    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
+    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
-ifeq ($(CONFIG_FB),y)
-    ARCH_SOURCES += \
-        arch/$(KARCH)/src/drivers/scr.c
-endif
 ifeq ($(CONFIG_SMP),y)
-    ARCH_SOURCES += \
-        arch/$(KARCH)/src/smp/ipi.c \
-        arch/$(KARCH)/src/smp/smp.c
+ARCH_SOURCES += \
+    arch/$(ARCH)/src/smp/ipi.c \
+    arch/$(ARCH)/src/smp/smp.c
 endif
 ifeq ($(CONFIG_TSB),y)
-    ARCH_SOURCES += \
-        arch/$(KARCH)/src/mm/tsb.c
+ARCH_SOURCES += \
+    arch/$(ARCH)/src/mm/tsb.c
 endif
 ifdef CONFIG_Z8530
-    ARCH_SOURCES += \
-        arch/$(KARCH)/src/drivers/fhc.c
+ARCH_SOURCES += \
+    arch/$(ARCH)/src/drivers/fhc.c
 endif

 /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/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)
 ,22 → 281,5
         ;
 }
-/** 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));
 ,9 → 301,5
     }
 }
-void trap_virtual_enable_irqs(uint16_t irqmask)
-{
-}
 /** @}
  */

 /branches/dynload/kernel/arch/ia64/include/interrupt.h
 ,8 → 153,6
 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/types.h
 ,11 → 67,6
 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
 ,11 → 35,13
 #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/include/fpu_context.h
35,6 → 35,7
#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/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_NAME = elf64-little
 BFD_ARCH = ia64-elf64
 TARGET = ia64-pc-linux-gnu
 ,35 → 45,59
 LFLAGS += -EL
 AFLAGS += -mconstant-gp
-DEFS += -D__64_BITS__
+DEFS += -D__64_BITS__ -D$(MACHINE)
+## 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/$(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
+    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
 ifeq ($(MACHINE),ski)
-    ARCH_SOURCES += arch/$(KARCH)/src/ski/ski.c
+    ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c
     DEFS += -DSKI
     BFD = binary
 endif
 ifeq ($(MACHINE),i460GX)
-    DEFS += -DI460GX
+    CONFIG_I8042 = y
+    CONFIG_EGA = y
+    DEFS += -DI460GX -DCONFIG_I8042 -DCONFIG_EGA
     BFD = binary
 endif
+ifeq ($(CONFIG_SMP),y)
+    DEFS += -DCONFIG_SMP
+endif

 /branches/dynload/kernel/arch/arm32/include/types.h
 ,11 → 64,6
 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
 ,17 → 46,6
 {
 }
-/** 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/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, bool silent);
+static void gxemul_write(chardev_t *dev, const char ch);
 static char gxemul_do_read(chardev_t *dev);
 static chardev_operations_t gxemul_ops = {

 /branches/dynload/kernel/arch/arm32/src/arm32.c
 ,7 → 92,7
         .x = 640,
         .y = 480,
         .scan = 1920,
-        .visual = VISUAL_BGR_8_8_8,
+        .visual = VISUAL_RGB_8_8_8,
     };
     fb_init(&prop);
 #endif
 ,22 → 164,9
 void arch_reboot()
 {
     /* not implemented */
-    while (1);
+    for (;;)
+        ;
 }
-/** 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/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm
 BFD = binary
 ,8 → 40,11
 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
 ,23 → 51,50
 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/$(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
+    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

 /branches/dynload/kernel/arch/ppc32/include/types.h
 ,11 → 57,6
 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
 ,17 → 149,6
 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/src/ppc32.c
 ,19 → 167,5
     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/ppc32/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_NAME = elf32-powerpc
 BFD_ARCH = powerpc:common
 BFD = binary
 ,22 → 45,44
 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/$(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
+    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

 /branches/dynload/kernel/arch/ia32xen/src/drivers/xconsole.c
 ,0 → 1,85
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen
+ * @{
+ */
+/**
+ * @file
+ * @brief ia32xen console driver.
+ */
+#include <arch/drivers/xconsole.h>
+#include <putchar.h>
+#include <console/chardev.h>
+#include <console/console.h>
+#include <arch/hypercall.h>
+#define MASK_INDEX(index, ring) ((index) & (sizeof(ring) - 1))
+static void xen_putchar(chardev_t *d, const char ch);
+chardev_t xen_console;
+static chardev_operations_t xen_ops = {
+    .write = xen_putchar
+};
+void xen_console_init(void)
+{
+    chardev_initialize("xen_out", &xen_console, &xen_ops);
+    stdout = &xen_console;
+}
+void xen_putchar(chardev_t *d, const char ch, bool silent)
+{
+    if (!silent) {
+        if (start_info.console.domU.evtchn != 0) {
+            uint32_t cons = console_page.out_cons;
+            uint32_t prod = console_page.out_prod;
+            memory_barrier();
+            if ((prod - cons) > sizeof(console_page.out))
+                return;
+            if (ch == '\n')
+                console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r';
+            console_page.out[MASK_INDEX(prod++, console_page.out)] = ch;
+            write_barrier();
+            console_page.out_prod = prod;
+            xen_notify_remote(start_info.console.domU.evtchn);
+        } else
+            xen_console_io(CONSOLE_IO_WRITE, 1, &ch);
+    }
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/pm.c
 ,0 → 1,206
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen
+ * @{
+ */
+/** @file
+ */
+#include <arch/pm.h>
+#include <config.h>
+#include <arch/types.h>
+#include <arch/interrupt.h>
+#include <arch/asm.h>
+#include <arch/context.h>
+#include <panic.h>
+#include <arch/mm/page.h>
+#include <mm/slab.h>
+#include <memstr.h>
+#include <interrupt.h>
+/*
+ * Early ia32xen configuration functions and data structures.
+ */
+/*
+ * We have no use for segmentation so we set up flat mode. In this
+ * mode, we use, for each privilege level, two segments spanning the
+ * whole memory. One is for code and one is for data.
+ *
+ * One is for GS register which holds pointer to the TLS thread
+ * structure in it's base.
+ */
+descriptor_t gdt[GDT_ITEMS] = {
+    /* NULL descriptor */
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    /* KTEXT descriptor */
+    { 0xffff, 0, 0, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 1, 1, 0 },
+    /* KDATA descriptor */
+    { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_KERNEL, 0xf, 0, 0, 1, 1, 0 },
+    /* UTEXT descriptor */
+    { 0xffff, 0, 0, AR_PRESENT | AR_CODE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
+    /* UDATA descriptor */
+    { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
+    /* TSS descriptor - set up will be completed later */
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    /* TLS descriptor */
+    { 0xffff, 0, 0, AR_PRESENT | AR_DATA | AR_WRITABLE | DPL_USER, 0xf, 0, 0, 1, 1, 0 },
+};
+static trap_info_t traps[IDT_ITEMS + 1];
+static tss_t tss;
+tss_t *tss_p = NULL;
+/* gdtr is changed by kmp before next CPU is initialized */
+ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((uintptr_t) gdt) };
+ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (uintptr_t) gdt };
+void gdt_setbase(descriptor_t *d, uintptr_t base)
+{
+    d->base_0_15 = base & 0xffff;
+    d->base_16_23 = ((base) >> 16) & 0xff;
+    d->base_24_31 = ((base) >> 24) & 0xff;
+}
+void gdt_setlimit(descriptor_t *d, uint32_t limit)
+{
+    d->limit_0_15 = limit & 0xffff;
+    d->limit_16_19 = (limit >> 16) & 0xf;
+}
+void tss_initialize(tss_t *t)
+{
+    memsetb(t, sizeof(struct tss), 0);
+}
+static void trap(void)
+{
+}
+void traps_init(void)
+{
+    index_t i;
+    for (i = 0; i < IDT_ITEMS; i++) {
+        traps[i].vector = i;
+        if (i == VECTOR_SYSCALL)
+            traps[i].flags = 3;
+        else
+            traps[i].flags = 0;
+        traps[i].cs = XEN_CS;
+        traps[i].address = trap;
+    }
+    traps[IDT_ITEMS].vector = 0;
+    traps[IDT_ITEMS].flags = 0;
+    traps[IDT_ITEMS].cs = 0;
+    traps[IDT_ITEMS].address = NULL;
+}
+/* Clean IOPL(12,13) and NT(14) flags in EFLAGS register */
+static void clean_IOPL_NT_flags(void)
+{
+//  asm volatile (
+//      "pushfl\n"
+//      "pop %%eax\n"
+//      "and $0xffff8fff, %%eax\n"
+//      "push %%eax\n"
+//      "popfl\n"
+//      : : : "eax"
+//  );
+}
+/* Clean AM(18) flag in CR0 register */
+static void clean_AM_flag(void)
+{
+//  asm volatile (
+//      "mov %%cr0, %%eax\n"
+//      "and $0xfffbffff, %%eax\n"
+//      "mov %%eax, %%cr0\n"
+//      : : : "eax"
+//  );
+}
+void pm_init(void)
+{
+    descriptor_t *gdt_p = (descriptor_t *) gdtr.base;
+//  gdtr_load(&gdtr);
+    if (config.cpu_active == 1) {
+        traps_init();
+        xen_set_trap_table(traps);
+        /*
+         * NOTE: bootstrap CPU has statically allocated TSS, because
+         * the heap hasn't been initialized so far.
+         */
+        tss_p = &tss;
+    } else {
+        tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC);
+        if (!tss_p)
+            panic("Cannot allocate TSS.");
+    }
+//  tss_initialize(tss_p);
+    gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL;
+    gdt_p[TSS_DES].special = 1;
+    gdt_p[TSS_DES].granularity = 0;
+    gdt_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p);
+    gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1);
+    /*
+     * As of this moment, the current CPU has its own GDT pointing
+     * to its own TSS. We just need to load the TR register.
+     */
+//  tr_load(selector(TSS_DES));
+    clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels and clear NT flag. */
+    clean_AM_flag();          /* Disable alignment check */
+}
+void set_tls_desc(uintptr_t tls)
+{
+    ptr_16_32_t cpugdtr;
+    descriptor_t *gdt_p;
+    gdtr_store(&cpugdtr);
+    gdt_p = (descriptor_t *) cpugdtr.base;
+    gdt_setbase(&gdt_p[TLS_DES], tls);
+    /* Reload gdt register to update GS in CPU */
+    gdtr_load(&cpugdtr);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/smp/smp.c
 ,0 → 1,174
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen
+ * @{
+ */
+/** @file
+ */
+#include <smp/smp.h>
+#include <arch/smp/smp.h>
+#include <arch/smp/mps.h>
+#include <arch/smp/ap.h>
+#include <genarch/acpi/acpi.h>
+#include <genarch/acpi/madt.h>
+#include <config.h>
+#include <synch/waitq.h>
+#include <synch/synch.h>
+#include <arch/pm.h>
+#include <func.h>
+#include <panic.h>
+#include <debug.h>
+#include <arch/asm.h>
+#include <mm/frame.h>
+#include <mm/page.h>
+#include <mm/slab.h>
+#include <mm/as.h>
+#include <print.h>
+#include <memstr.h>
+#ifdef CONFIG_SMP
+static struct smp_config_operations *ops = NULL;
+void smp_init(void)
+{
+    uintptr_t l_apic_address, io_apic_address;
+    if (acpi_madt) {
+        acpi_madt_parse();
+        ops = &madt_config_operations;
+    }
+    if (config.cpu_count == 1) {
+        mps_init();
+        ops = &mps_config_operations;
+    }
+    l_apic_address = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+    if (!l_apic_address)
+        panic("Cannot allocate address for l_apic.");
+    io_apic_address = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+    if (!io_apic_address)
+        panic("Cannot allocate address for io_apic.");
+    if (config.cpu_count > 1) {
+        page_mapping_insert(AS_KERNEL, l_apic_address, (uintptr_t) l_apic,
+                  PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        page_mapping_insert(AS_KERNEL, io_apic_address, (uintptr_t) io_apic,
+                  PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        l_apic = (uint32_t *) l_apic_address;
+        io_apic = (uint32_t *) io_apic_address;
+    }
+}
+/*
+ * Kernel thread for bringing up application processors. It becomes clear
+ * that we need an arrangement like this (AP's being initialized by a kernel
+ * thread), for a thread has its dedicated stack. (The stack used during the
+ * BSP initialization (prior the very first call to scheduler()) will be used
+ * as an initialization stack for each AP.)
+ */
+void kmp(void *arg)
+{
+    unsigned int i;
+    ASSERT(ops != NULL);
+    waitq_initialize(&ap_completion_wq);
+    /*
+     * We need to access data in frame 0.
+     * We boldly make use of kernel address space mapping.
+     */
+    /*
+     * Save 0xa to address 0xf of the CMOS RAM.
+     * BIOS will not do the POST after the INIT signal.
+     */
+    outb(0x70,0xf);
+    outb(0x71,0xa);
+//  pic_disable_irqs(0xffff);
+    apic_init();
+    for (i = 0; i < ops->cpu_count(); i++) {
+        struct descriptor *gdt_new;
+        /*
+         * Skip processors marked unusable.
+         */
+        if (!ops->cpu_enabled(i))
+            continue;
+        /*
+         * The bootstrap processor is already up.
+         */
+        if (ops->cpu_bootstrap(i))
+            continue;
+        if (ops->cpu_apic_id(i) == l_apic_id()) {
+            printf("%s: bad processor entry #%d, will not send IPI to myself\n", __FUNCTION__, i);
+            continue;
+        }
+        /*
+         * Prepare new GDT for CPU in question.
+         */
+        if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS * sizeof(struct descriptor), FRAME_ATOMIC)))
+            panic("Cannot allocate memory for GDT.");
+        memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
+        memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
+        gdtr.base = (uintptr_t) gdt_new;
+        if (l_apic_send_init_ipi(ops->cpu_apic_id(i))) {
+            /*
+             * There may be just one AP being initialized at
+             * the time. After it comes completely up, it is
+             * supposed to wake us up.
+             */
+            if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT)
+                printf("%s: waiting for cpu%d (APIC ID = %d) timed out\n", __FUNCTION__, config.cpu_active > i ? config.cpu_active : i, ops->cpu_apic_id(i));
+        } else
+            printf("INIT IPI for l_apic%d failed\n", ops->cpu_apic_id(i));
+    }
+}
+int smp_irq_to_pin(unsigned int irq)
+{
+    ASSERT(ops != NULL);
+    return ops->irq_to_pin(irq);
+}
+#endif /* CONFIG_SMP */
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/smp/mps.c
 ,0 → 1,433
+/*
+ * Copyright (c) 2001-2005 Jakub Jermar
+ * 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 ia32xen
+ * @{
+ */
+/** @file
+ */
+#ifdef CONFIG_SMP
+#include <config.h>
+#include <print.h>
+#include <debug.h>
+#include <arch/smp/mps.h>
+#include <arch/smp/apic.h>
+#include <arch/smp/smp.h>
+#include <func.h>
+#include <arch/types.h>
+#include <cpu.h>
+#include <arch/asm.h>
+#include <arch/bios/bios.h>
+#include <mm/frame.h>
+/*
+ * MultiProcessor Specification detection code.
+ */
+#define FS_SIGNATURE    0x5f504d5f
+#define CT_SIGNATURE    0x504d4350
+int mps_fs_check(uint8_t *base);
+int mps_ct_check(void);
+int configure_via_ct(void);
+int configure_via_default(uint8_t n);
+int ct_processor_entry(struct __processor_entry *pr);
+void ct_bus_entry(struct __bus_entry *bus);
+void ct_io_apic_entry(struct __io_apic_entry *ioa);
+void ct_io_intr_entry(struct __io_intr_entry *iointr);
+void ct_l_intr_entry(struct __l_intr_entry *lintr);
+void ct_extended_entries(void);
+static struct mps_fs *fs;
+static struct mps_ct *ct;
+struct __processor_entry *processor_entries = NULL;
+struct __bus_entry *bus_entries = NULL;
+struct __io_apic_entry *io_apic_entries = NULL;
+struct __io_intr_entry *io_intr_entries = NULL;
+struct __l_intr_entry *l_intr_entries = NULL;
+unsigned int processor_entry_cnt = 0;
+unsigned int bus_entry_cnt = 0;
+unsigned int io_apic_entry_cnt = 0;
+unsigned int io_intr_entry_cnt = 0;
+unsigned int l_intr_entry_cnt = 0;
+waitq_t ap_completion_wq;
+/*
+ * Implementation of IA-32 SMP configuration interface.
+ */
+static count_t get_cpu_count(void);
+static bool is_cpu_enabled(index_t i);
+static bool is_bsp(index_t i);
+static uint8_t get_cpu_apic_id(index_t i);
+static int mps_irq_to_pin(unsigned int irq);
+struct smp_config_operations mps_config_operations = {
+    .cpu_count = get_cpu_count,
+    .cpu_enabled = is_cpu_enabled,
+    .cpu_bootstrap = is_bsp,
+    .cpu_apic_id = get_cpu_apic_id,
+    .irq_to_pin = mps_irq_to_pin
+};
+count_t get_cpu_count(void)
+{
+    return processor_entry_cnt;
+}
+bool is_cpu_enabled(index_t i)
+{
+    ASSERT(i < processor_entry_cnt);
+    return processor_entries[i].cpu_flags & 0x1;
+}
+bool is_bsp(index_t i)
+{
+    ASSERT(i < processor_entry_cnt);
+    return processor_entries[i].cpu_flags & 0x2;
+}
+uint8_t get_cpu_apic_id(index_t i)
+{
+    ASSERT(i < processor_entry_cnt);
+    return processor_entries[i].l_apic_id;
+}
+/*
+ * Used to check the integrity of the MP Floating Structure.
+ */
+int mps_fs_check(uint8_t *base)
+{
+    int i;
+    uint8_t sum;
+    for (i = 0, sum = 0; i < 16; i++)
+        sum += base[i];
+    return !sum;
+}
+/*
+ * Used to check the integrity of the MP Configuration Table.
+ */
+int mps_ct_check(void)
+{
+    uint8_t *base = (uint8_t *) ct;
+    uint8_t *ext = base + ct->base_table_length;
+    uint8_t sum;
+    int i;
+    /* count the checksum for the base table */
+    for (i=0,sum=0; i < ct->base_table_length; i++)
+        sum += base[i];
+    if (sum)
+        return 0;
+    /* count the checksum for the extended table */
+    for (i=0,sum=0; i < ct->ext_table_length; i++)
+        sum += ext[i];
+    return sum == ct->ext_table_checksum;
+}
+void mps_init(void)
+{
+    uint8_t *addr[2] = { NULL, (uint8_t *) PA2KA(0xf0000) };
+    int i, j, length[2] = { 1024, 64*1024 };
+    /*
+     * Find MP Floating Pointer Structure
+     * 1a. search first 1K of EBDA
+     * 1b. if EBDA is undefined, search last 1K of base memory
+     *  2. search 64K starting at 0xf0000
+     */
+    addr[0] = (uint8_t *) PA2KA(ebda ? ebda : 639 * 1024);
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < length[i]; j += 16) {
+            if (*((uint32_t *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
+                fs = (struct mps_fs *) &addr[i][j];
+                goto fs_found;
+            }
+        }
+    }
+    return;
+fs_found:
+    printf("%p: MPS Floating Pointer Structure\n", fs);
+    if (fs->config_type == 0 && fs->configuration_table) {
+        if (fs->mpfib2 >> 7) {
+            printf("%s: PIC mode not supported\n", __func__);
+            return;
+        }
+        ct = (struct mps_ct *)PA2KA((uintptr_t)fs->configuration_table);
+        config.cpu_count = configure_via_ct();
+    }
+    else
+        config.cpu_count = configure_via_default(fs->config_type);
+    return;
+}
+int configure_via_ct(void)
+{
+    uint8_t *cur;
+    int i, cnt;
+    if (ct->signature != CT_SIGNATURE) {
+        printf("%s: bad ct->signature\n", __func__);
+        return 1;
+    }
+    if (!mps_ct_check()) {
+        printf("%s: bad ct checksum\n", __func__);
+        return 1;
+    }
+    if (ct->oem_table) {
+        printf("%s: ct->oem_table not supported\n", __func__);
+        return 1;
+    }
+    l_apic = (uint32_t *)(uintptr_t)ct->l_apic;
+    cnt = 0;
+    cur = &ct->base_table[0];
+    for (i=0; i < ct->entry_count; i++) {
+        switch (*cur) {
+            /* Processor entry */
+            case 0:
+                processor_entries = processor_entries ? processor_entries : (struct __processor_entry *) cur;
+                processor_entry_cnt++;
+                cnt += ct_processor_entry((struct __processor_entry *) cur);
+                cur += 20;
+                break;
+            /* Bus entry */
+            case 1:
+                bus_entries = bus_entries ? bus_entries : (struct __bus_entry *) cur;
+                bus_entry_cnt++;
+                ct_bus_entry((struct __bus_entry *) cur);
+                cur += 8;
+                break;
+            /* I/O Apic */
+            case 2:
+                io_apic_entries = io_apic_entries ? io_apic_entries : (struct __io_apic_entry *) cur;
+                io_apic_entry_cnt++;
+                ct_io_apic_entry((struct __io_apic_entry *) cur);
+                cur += 8;
+                break;
+            /* I/O Interrupt Assignment */
+            case 3:
+                io_intr_entries = io_intr_entries ? io_intr_entries : (struct __io_intr_entry *) cur;
+                io_intr_entry_cnt++;
+                ct_io_intr_entry((struct __io_intr_entry *) cur);
+                cur += 8;
+                break;
+            /* Local Interrupt Assignment */
+            case 4:
+                l_intr_entries = l_intr_entries ? l_intr_entries : (struct __l_intr_entry *) cur;
+                l_intr_entry_cnt++;
+                ct_l_intr_entry((struct __l_intr_entry *) cur);
+                cur += 8;
+                break;
+            default:
+                /*
+                 * Something is wrong. Fallback to UP mode.
+                 */
+                printf("%s: ct badness\n", __func__);
+                return 1;
+        }
+    }
+    /*
+     * Process extended entries.
+     */
+    ct_extended_entries();
+    return cnt;
+}
+int configure_via_default(uint8_t n)
+{
+    /*
+     * Not yet implemented.
+     */
+    printf("%s: not supported\n", __func__);
+    return 1;
+}
+int ct_processor_entry(struct __processor_entry *pr)
+{
+    /*
+     * Ignore processors which are not marked enabled.
+     */
+    if ((pr->cpu_flags & (1<<0)) == 0)
+        return 0;
+    apic_id_mask |= (1<<pr->l_apic_id);
+    return 1;
+}
+void ct_bus_entry(struct __bus_entry *bus)
+{
+#ifdef MPSCT_VERBOSE
+    char buf[7];
+    memcpy((void *) buf, (void *) bus->bus_type, 6);
+    buf[6] = 0;
+    printf("bus%d: %s\n", bus->bus_id, buf);
+#endif
+}
+void ct_io_apic_entry(struct __io_apic_entry *ioa)
+{
+    static int io_apic_count = 0;
+    /* this ioapic is marked unusable */
+    if ((ioa->io_apic_flags & 1) == 0)
+        return;
+    if (io_apic_count++ > 0) {
+        /*
+         * Multiple IO APIC's are currently not supported.
+         */
+        return;
+    }
+    io_apic = (uint32_t *)(uintptr_t)ioa->io_apic;
+}
+//#define MPSCT_VERBOSE
+void ct_io_intr_entry(struct __io_intr_entry *iointr)
+{
+#ifdef MPSCT_VERBOSE
+    switch (iointr->intr_type) {
+        case 0: printf("INT"); break;
+        case 1: printf("NMI"); break;
+        case 2: printf("SMI"); break;
+        case 3: printf("ExtINT"); break;
+    }
+    putchar(',');
+    switch (iointr->poel&3) {
+        case 0: printf("bus-like"); break;
+        case 1: printf("active high"); break;
+        case 2: printf("reserved"); break;
+        case 3: printf("active low"); break;
+    }
+    putchar(',');
+    switch ((iointr->poel>>2)&3) {
+        case 0: printf("bus-like"); break;
+        case 1: printf("edge-triggered"); break;
+        case 2: printf("reserved"); break;
+        case 3: printf("level-triggered"); break;
+    }
+    putchar(',');
+    printf("bus%d,irq%d", iointr->src_bus_id, iointr->src_bus_irq);
+    putchar(',');
+    printf("io_apic%d,pin%d", iointr->dst_io_apic_id, iointr->dst_io_apic_pin);
+    putchar('\n');
+#endif
+}
+void ct_l_intr_entry(struct __l_intr_entry *lintr)
+{
+#ifdef MPSCT_VERBOSE
+    switch (lintr->intr_type) {
+        case 0: printf("INT"); break;
+        case 1: printf("NMI"); break;
+        case 2: printf("SMI"); break;
+        case 3: printf("ExtINT"); break;
+    }
+    putchar(',');
+    switch (lintr->poel&3) {
+        case 0: printf("bus-like"); break;
+        case 1: printf("active high"); break;
+        case 2: printf("reserved"); break;
+        case 3: printf("active low"); break;
+    }
+    putchar(',');
+    switch ((lintr->poel>>2)&3) {
+        case 0: printf("bus-like"); break;
+        case 1: printf("edge-triggered"); break;
+        case 2: printf("reserved"); break;
+        case 3: printf("level-triggered"); break;
+    }
+    putchar(',');
+    printf("bus%d,irq%d", lintr->src_bus_id, lintr->src_bus_irq);
+    putchar(',');
+    printf("l_apic%d,pin%d", lintr->dst_l_apic_id, lintr->dst_l_apic_pin);
+    putchar('\n');
+#endif
+}
+void ct_extended_entries(void)
+{
+    uint8_t *ext = (uint8_t *) ct + ct->base_table_length;
+    uint8_t *cur;
+    for (cur = ext; cur < ext + ct->ext_table_length; cur += cur[CT_EXT_ENTRY_LEN]) {
+        switch (cur[CT_EXT_ENTRY_TYPE]) {
+            default:
+                printf("%p: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
+                break;
+        }
+    }
+}
+int mps_irq_to_pin(unsigned int irq)
+{
+    unsigned int i;
+    for (i = 0; i < io_intr_entry_cnt; i++) {
+        if (io_intr_entries[i].src_bus_irq == irq && io_intr_entries[i].intr_type == 0)
+            return io_intr_entries[i].dst_io_apic_pin;
+    }
+    return -1;
+}
+#endif /* CONFIG_SMP */
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/smp/apic.c
 ,0 → 1,581
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * 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 ia32xen
+ * @{
+ */
+/** @file
+ */
+#include <arch/types.h>
+#include <arch/smp/apic.h>
+#include <arch/smp/ap.h>
+#include <arch/smp/mps.h>
+#include <mm/page.h>
+#include <time/delay.h>
+#include <interrupt.h>
+#include <arch/interrupt.h>
+#include <print.h>
+#include <arch/asm.h>
+#include <arch.h>
+#ifdef CONFIG_SMP
+/*
+ * Advanced Programmable Interrupt Controller for SMP systems.
+ * Tested on:
+ *  Bochs 2.0.2 - Bochs 2.2.6 with 2-8 CPUs
+ *  Simics 2.0.28 - Simics 2.2.19 2-15 CPUs
+ *  VMware Workstation 5.5 with 2 CPUs
+ *  QEMU 0.8.0 with 2-15 CPUs
+ *  ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 with 2x 200Mhz Pentium CPUs
+ *  ASUS PCH-DL with 2x 3000Mhz Pentium 4 Xeon (HT) CPUs
+ *  MSI K7D Master-L with 2x 2100MHz Athlon MP CPUs
+ */
+/*
+ * These variables either stay configured as initilalized, or are changed by
+ * the MP configuration code.
+ *
+ * Pay special attention to the volatile keyword. Without it, gcc -O2 would
+ * optimize the code too much and accesses to l_apic and io_apic, that must
+ * always be 32-bit, would use byte oriented instructions.
+ */
+volatile uint32_t *l_apic = (uint32_t *) 0xfee00000;
+volatile uint32_t *io_apic = (uint32_t *) 0xfec00000;
+uint32_t apic_id_mask = 0;
+static int apic_poll_errors(void);
+#ifdef LAPIC_VERBOSE
+static char *delmod_str[] = {
+    "Fixed",
+    "Lowest Priority",
+    "SMI",
+    "Reserved",
+    "NMI",
+    "INIT",
+    "STARTUP",
+    "ExtInt"
+};
+static char *destmod_str[] = {
+    "Physical",
+    "Logical"
+};
+static char *trigmod_str[] = {
+    "Edge",
+    "Level"
+};
+static char *mask_str[] = {
+    "Unmasked",
+    "Masked"
+};
+static char *delivs_str[] = {
+    "Idle",
+    "Send Pending"
+};
+static char *tm_mode_str[] = {
+    "One-shot",
+    "Periodic"
+};
+static char *intpol_str[] = {
+    "Polarity High",
+    "Polarity Low"
+};
+#endif /* LAPIC_VERBOSE */
+static void apic_spurious(int n, istate_t *istate);
+static void l_apic_timer_interrupt(int n, istate_t *istate);
+/** Initialize APIC on BSP. */
+void apic_init(void)
+{
+    io_apic_id_t idreg;
+    unsigned int i;
+    exc_register(VECTOR_APIC_SPUR, "apic_spurious", (iroutine) apic_spurious);
+    enable_irqs_function = io_apic_enable_irqs;
+    disable_irqs_function = io_apic_disable_irqs;
+    eoi_function = l_apic_eoi;
+    /*
+     * Configure interrupt routing.
+     * IRQ 0 remains masked as the time signal is generated by l_apic's themselves.
+     * Other interrupts will be forwarded to the lowest priority CPU.
+     */
+    io_apic_disable_irqs(0xffff);
+    exc_register(VECTOR_CLK, "l_apic_timer", (iroutine) l_apic_timer_interrupt);
+    for (i = 0; i < IRQ_COUNT; i++) {
+        int pin;
+        if ((pin = smp_irq_to_pin(i)) != -1) {
+            io_apic_change_ioredtbl(pin, DEST_ALL, IVT_IRQBASE+i, LOPRI);
+        }
+    }
+    /*
+     * Ensure that io_apic has unique ID.
+     */
+    idreg.value = io_apic_read(IOAPICID);
+    if ((1 << idreg.apic_id) & apic_id_mask) {  /* see if IO APIC ID is used already */
+        for (i = 0; i < APIC_ID_COUNT; i++) {
+            if (!((1<<i) & apic_id_mask)) {
+                idreg.apic_id = i;
+                io_apic_write(IOAPICID, idreg.value);
+                break;
+            }
+        }
+    }
+    /*
+     * Configure the BSP's lapic.
+     */
+    l_apic_init();
+    l_apic_debug();
+}
+/** APIC spurious interrupt handler.
+ *
+ * @param n Interrupt vector.
+ * @param istate Interrupted state.
+ */
+void apic_spurious(int n, istate_t *istate)
+{
+#ifdef CONFIG_DEBUG
+    printf("cpu%d: APIC spurious interrupt\n", CPU->id);
+#endif
+}
+/** Poll for APIC errors.
+ *
+ * Examine Error Status Register and report all errors found.
+ *
+ * @return 0 on error, 1 on success.
+ */
+int apic_poll_errors(void)
+{
+    esr_t esr;
+    esr.value = l_apic[ESR];
+    if (esr.send_checksum_error)
+        printf("Send Checksum Error\n");
+    if (esr.receive_checksum_error)
+        printf("Receive Checksum Error\n");
+    if (esr.send_accept_error)
+        printf("Send Accept Error\n");
+    if (esr.receive_accept_error)
+        printf("Receive Accept Error\n");
+    if (esr.send_illegal_vector)
+        printf("Send Illegal Vector\n");
+    if (esr.received_illegal_vector)
+        printf("Received Illegal Vector\n");
+    if (esr.illegal_register_address)
+        printf("Illegal Register Address\n");
+    return !esr.err_bitmap;
+}
+/** Send all CPUs excluding CPU IPI vector.
+ *
+ * @param vector Interrupt vector to be sent.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+int l_apic_broadcast_custom_ipi(uint8_t vector)
+{
+    icr_t icr;
+    icr.lo = l_apic[ICRlo];
+    icr.delmod = DELMOD_FIXED;
+    icr.destmod = DESTMOD_LOGIC;
+    icr.level = LEVEL_ASSERT;
+    icr.shorthand = SHORTHAND_ALL_EXCL;
+    icr.trigger_mode = TRIGMOD_LEVEL;
+    icr.vector = vector;
+    l_apic[ICRlo] = icr.lo;
+    icr.lo = l_apic[ICRlo];
+    if (icr.delivs == DELIVS_PENDING) {
+#ifdef CONFIG_DEBUG
+        printf("IPI is pending.\n");
+#endif
+    }
+    return apic_poll_errors();
+}
+/** Universal Start-up Algorithm for bringing up the AP processors.
+ *
+ * @param apicid APIC ID of the processor to be brought up.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+int l_apic_send_init_ipi(uint8_t apicid)
+{
+    icr_t icr;
+    int i;
+    /*
+     * Read the ICR register in and zero all non-reserved fields.
+     */
+    icr.lo = l_apic[ICRlo];
+    icr.hi = l_apic[ICRhi];
+    icr.delmod = DELMOD_INIT;
+    icr.destmod = DESTMOD_PHYS;
+    icr.level = LEVEL_ASSERT;
+    icr.trigger_mode = TRIGMOD_LEVEL;
+    icr.shorthand = SHORTHAND_NONE;
+    icr.vector = 0;
+    icr.dest = apicid;
+    l_apic[ICRhi] = icr.hi;
+    l_apic[ICRlo] = icr.lo;
+    /*
+     * According to MP Specification, 20us should be enough to
+     * deliver the IPI.
+     */
+    delay(20);
+    if (!apic_poll_errors())
+        return 0;
+    icr.lo = l_apic[ICRlo];
+    if (icr.delivs == DELIVS_PENDING) {
+#ifdef CONFIG_DEBUG
+        printf("IPI is pending.\n");
+#endif
+    }
+    icr.delmod = DELMOD_INIT;
+    icr.destmod = DESTMOD_PHYS;
+    icr.level = LEVEL_DEASSERT;
+    icr.shorthand = SHORTHAND_NONE;
+    icr.trigger_mode = TRIGMOD_LEVEL;
+    icr.vector = 0;
+    l_apic[ICRlo] = icr.lo;
+    /*
+     * Wait 10ms as MP Specification specifies.
+     */
+    delay(10000);
+    if (!is_82489DX_apic(l_apic[LAVR])) {
+        /*
+         * If this is not 82489DX-based l_apic we must send two STARTUP IPI's.
+         */
+        for (i = 0; i < 2; i++) {
+            icr.lo = l_apic[ICRlo];
+            icr.delmod = DELMOD_STARTUP;
+            icr.destmod = DESTMOD_PHYS;
+            icr.level = LEVEL_ASSERT;
+            icr.shorthand = SHORTHAND_NONE;
+            icr.trigger_mode = TRIGMOD_LEVEL;
+            l_apic[ICRlo] = icr.lo;
+            delay(200);
+        }
+    }
+    return apic_poll_errors();
+}
+/** Initialize Local APIC. */
+void l_apic_init(void)
+{
+    lvt_error_t error;
+    lvt_lint_t lint;
+    tpr_t tpr;
+    svr_t svr;
+    icr_t icr;
+    tdcr_t tdcr;
+    lvt_tm_t tm;
+    ldr_t ldr;
+    dfr_t dfr;
+    uint32_t t1, t2;
+    /* Initialize LVT Error register. */
+    error.value = l_apic[LVT_Err];
+    error.masked = true;
+    l_apic[LVT_Err] = error.value;
+    /* Initialize LVT LINT0 register. */
+    lint.value = l_apic[LVT_LINT0];
+    lint.masked = true;
+    l_apic[LVT_LINT0] = lint.value;
+    /* Initialize LVT LINT1 register. */
+    lint.value = l_apic[LVT_LINT1];
+    lint.masked = true;
+    l_apic[LVT_LINT1] = lint.value;
+    /* Task Priority Register initialization. */
+    tpr.value = l_apic[TPR];
+    tpr.pri_sc = 0;
+    tpr.pri = 0;
+    l_apic[TPR] = tpr.value;
+    /* Spurious-Interrupt Vector Register initialization. */
+    svr.value = l_apic[SVR];
+    svr.vector = VECTOR_APIC_SPUR;
+    svr.lapic_enabled = true;
+    svr.focus_checking = true;
+    l_apic[SVR] = svr.value;
+    if (CPU->arch.family >= 6)
+        enable_l_apic_in_msr();
+    /* Interrupt Command Register initialization. */
+    icr.lo = l_apic[ICRlo];
+    icr.delmod = DELMOD_INIT;
+    icr.destmod = DESTMOD_PHYS;
+    icr.level = LEVEL_DEASSERT;
+    icr.shorthand = SHORTHAND_ALL_INCL;
+    icr.trigger_mode = TRIGMOD_LEVEL;
+    l_apic[ICRlo] = icr.lo;
+    /* Timer Divide Configuration Register initialization. */
+    tdcr.value = l_apic[TDCR];
+    tdcr.div_value = DIVIDE_1;
+    l_apic[TDCR] = tdcr.value;
+    /* Program local timer. */
+    tm.value = l_apic[LVT_Tm];
+    tm.vector = VECTOR_CLK;
+    tm.mode = TIMER_PERIODIC;
+    tm.masked = false;
+    l_apic[LVT_Tm] = tm.value;
+    /*
+     * Measure and configure the timer to generate timer
+     * interrupt with period 1s/HZ seconds.
+     */
+    t1 = l_apic[CCRT];
+    l_apic[ICRT] = 0xffffffff;
+    while (l_apic[CCRT] == t1)
+        ;
+    t1 = l_apic[CCRT];
+    delay(1000000/HZ);
+    t2 = l_apic[CCRT];
+    l_apic[ICRT] = t1-t2;
+    /* Program Logical Destination Register. */
+    ldr.value = l_apic[LDR];
+    if (CPU->id < sizeof(CPU->id) * 8)  /* size in bits */
+        ldr.id = (1 << CPU->id);
+    l_apic[LDR] = ldr.value;
+    /* Program Destination Format Register for Flat mode. */
+    dfr.value = l_apic[DFR];
+    dfr.model = MODEL_FLAT;
+    l_apic[DFR] = dfr.value;
+}
+/** Local APIC End of Interrupt. */
+void l_apic_eoi(void)
+{
+    l_apic[EOI] = 0;
+}
+/** Dump content of Local APIC registers. */
+void l_apic_debug(void)
+{
+#ifdef LAPIC_VERBOSE
+    lvt_tm_t tm;
+    lvt_lint_t lint;
+    lvt_error_t error;
+    printf("LVT on cpu%d, LAPIC ID: %d\n", CPU->id, l_apic_id());
+    tm.value = l_apic[LVT_Tm];
+    printf("LVT Tm: vector=%hhd, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
+    lint.value = l_apic[LVT_LINT0];
+    printf("LVT LINT0: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
+    lint.value = l_apic[LVT_LINT1];
+    printf("LVT LINT1: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
+    error.value = l_apic[LVT_Err];
+    printf("LVT Err: vector=%hhd, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
+#endif
+}
+/** Local APIC Timer Interrupt.
+ *
+ * @param n Interrupt vector number.
+ * @param istate Interrupted state.
+ */
+void l_apic_timer_interrupt(int n, istate_t *istate)
+{
+    l_apic_eoi();
+    clock();
+}
+/** Get Local APIC ID.
+ *
+ * @return Local APIC ID.
+ */
+uint8_t l_apic_id(void)
+{
+    l_apic_id_t idreg;
+    idreg.value = l_apic[L_APIC_ID];
+    return idreg.apic_id;
+}
+/** Read from IO APIC register.
+ *
+ * @param address IO APIC register address.
+ *
+ * @return Content of the addressed IO APIC register.
+ */
+uint32_t io_apic_read(uint8_t address)
+{
+    io_regsel_t regsel;
+    regsel.value = io_apic[IOREGSEL];
+    regsel.reg_addr = address;
+    io_apic[IOREGSEL] = regsel.value;
+    return io_apic[IOWIN];
+}
+/** Write to IO APIC register.
+ *
+ * @param address IO APIC register address.
+ * @param x Content to be written to the addressed IO APIC register.
+ */
+void io_apic_write(uint8_t address, uint32_t x)
+{
+    io_regsel_t regsel;
+    regsel.value = io_apic[IOREGSEL];
+    regsel.reg_addr = address;
+    io_apic[IOREGSEL] = regsel.value;
+    io_apic[IOWIN] = x;
+}
+/** Change some attributes of one item in I/O Redirection Table.
+ *
+ * @param pin IO APIC pin number.
+ * @param dest Interrupt destination address.
+ * @param v Interrupt vector to trigger.
+ * @param flags Flags.
+ */
+void io_apic_change_ioredtbl(uint8_t pin, uint8_t dest, uint8_t v, int flags)
+{
+    io_redirection_reg_t reg;
+    int dlvr = DELMOD_FIXED;
+    if (flags & LOPRI)
+        dlvr = DELMOD_LOWPRI;
+    reg.lo = io_apic_read(IOREDTBL + pin * 2);
+    reg.hi = io_apic_read(IOREDTBL + pin * 2 + 1);
+    reg.dest = dest;
+    reg.destmod = DESTMOD_LOGIC;
+    reg.trigger_mode = TRIGMOD_EDGE;
+    reg.intpol = POLARITY_HIGH;
+    reg.delmod = dlvr;
+    reg.intvec = v;
+    io_apic_write(IOREDTBL + pin * 2, reg.lo);
+    io_apic_write(IOREDTBL + pin * 2 + 1, reg.hi);
+}
+/** Mask IRQs in IO APIC.
+ *
+ * @param irqmask Bitmask of IRQs to be masked (0 = do not mask, 1 = mask).
+ */
+void io_apic_disable_irqs(uint16_t irqmask)
+{
+    io_redirection_reg_t reg;
+    unsigned int i;
+    int pin;
+    for (i = 0; i < 16; i++) {
+        if (irqmask & (1 << i)) {
+            /*
+             * Mask the signal input in IO APIC if there is a
+             * mapping for the respective IRQ number.
+             */
+            pin = smp_irq_to_pin(i);
+            if (pin != -1) {
+                reg.lo = io_apic_read(IOREDTBL + pin * 2);
+                reg.masked = true;
+                io_apic_write(IOREDTBL + pin*2, reg.lo);
+            }
+        }
+    }
+}
+/** Unmask IRQs in IO APIC.
+ *
+ * @param irqmask Bitmask of IRQs to be unmasked (0 = do not unmask, 1 = unmask).
+ */
+void io_apic_enable_irqs(uint16_t irqmask)
+{
+    unsigned int i;
+    int pin;
+    io_redirection_reg_t reg;
+    for (i = 0; i < 16; i++) {
+        if (irqmask & (1 << i)) {
+            /*
+             * Unmask the signal input in IO APIC if there is a
+             * mapping for the respective IRQ number.
+             */
+            pin = smp_irq_to_pin(i);
+            if (pin != -1) {
+                reg.lo = io_apic_read(IOREDTBL + pin * 2);
+                reg.masked = false;
+                io_apic_write(IOREDTBL + pin*2, reg.lo);
+            }
+        }
+    }
+}
+#endif /* CONFIG_SMP */
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/smp/ipi.c
 ,0 → 1,48
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen
+ * @{
+ */
+/** @file
+ */
+#ifdef CONFIG_SMP
+#include <smp/ipi.h>
+#include <arch/smp/apic.h>
+void ipi_broadcast_arch(int ipi)
+{
+    (void) l_apic_broadcast_custom_ipi((uint8_t) ipi);
+}
+#endif /* CONFIG_SMP */
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/mm/page.c
 ,0 → 1,86
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/mm/page.h>
+#include <genarch/mm/page_pt.h>
+#include <arch/mm/frame.h>
+#include <mm/frame.h>
+#include <mm/page.h>
+#include <mm/as.h>
+#include <arch/types.h>
+#include <align.h>
+#include <config.h>
+#include <func.h>
+#include <arch/interrupt.h>
+#include <arch/asm.h>
+#include <debug.h>
+#include <memstr.h>
+#include <print.h>
+#include <interrupt.h>
+void page_arch_init(void)
+{
+    if (config.cpu_active == 1) {
+        page_mapping_operations = &pt_mapping_operations;
+        AS_KERNEL->genarch.page_table = (pte_t *) KA2PA(start_info.ptl0);
+    } else
+        SET_PTL0_ADDRESS_ARCH(AS_KERNEL->genarch.page_table);
+}
+void page_fault(int n, istate_t *istate)
+{
+    uintptr_t page;
+    pf_access_t access;
+    page = read_cr2();
+    if (istate->error_word & PFERR_CODE_RSVD)
+        panic("Reserved bit set in page directory.");
+    if (istate->error_word & PFERR_CODE_RW)
+        access = PF_ACCESS_WRITE;
+    else
+        access = PF_ACCESS_READ;
+    if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
+        fault_if_from_uspace(istate, "Page fault: %#x.", page);
+        decode_istate(istate);
+        printf("Page fault address: %#x.\n", page);
+        panic("Page fault.");
+    }
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/mm/tlb.c
 ,0 → 1,75
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ * @ingroup ia32xen_mm
+ */
+#include <mm/tlb.h>
+#include <arch/mm/asid.h>
+#include <arch/asm.h>
+#include <arch/types.h>
+#include <arch/hypercall.h>
+/** Invalidate all entries in TLB. */
+void tlb_invalidate_all(void)
+{
+    mmuext_op_t mmu_ext;
+    mmu_ext.cmd = MMUEXT_TLB_FLUSH_LOCAL;
+    xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF);
+}
+/** Invalidate all entries in TLB that belong to specified address space.
+ *
+ * @param asid This parameter is ignored as the architecture doesn't support it.
+ */
+void tlb_invalidate_asid(asid_t asid)
+{
+    tlb_invalidate_all();
+}
+/** Invalidate TLB entries for specified page range belonging to specified address space.
+ *
+ * @param asid This parameter is ignored as the architecture doesn't support it.
+ * @param page Address of the first page whose entry is to be invalidated.
+ * @param cnt Number of entries to invalidate.
+ */
+void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, count_t cnt)
+{
+    unsigned int i;
+    for (i = 0; i < cnt; i++)
+        invlpg(page + i * PAGE_SIZE);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/mm/frame.c
 ,0 → 1,57
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ * @ingroup ia32xen_mm
+ */
+#include <mm/frame.h>
+#include <config.h>
+void physmem_print(void)
+{
+    printf("Base       Size       Reserved\n");
+    printf("---------- ---------- ---------\n");
+    printf("%#10x %#10x %#10x\n", PFN2ADDR(meminfo.start),
+        PFN2ADDR(meminfo.size), PFN2ADDR(meminfo.reserved));
+}
+void frame_arch_init(void)
+{
+    if (config.cpu_active == 1) {
+        /* The only memory zone */
+        zone_create(meminfo.start, meminfo.size, meminfo.start + meminfo.reserved, 0);
+        frame_mark_unavailable(meminfo.start, meminfo.reserved);
+    }
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/mm/as.c
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 ia32xen_mm
+ * @{
+ */
+/** @file
+ * @ingroup ia32xen_mm
+ */
+#include <arch/mm/as.h>
+#include <genarch/mm/page_pt.h>
+/** Architecture dependent address space init. */
+void as_arch_init(void)
+{
+    as_operations = &as_pt_operations;
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/interrupt.c
 ,0 → 1,248
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen_interrupt
+ * @{
+ */
+/** @file
+ */
+#include <arch/interrupt.h>
+#include <syscall/syscall.h>
+#include <print.h>
+#include <debug.h>
+#include <panic.h>
+#include <func.h>
+#include <cpu.h>
+#include <arch/asm.h>
+#include <mm/tlb.h>
+#include <mm/as.h>
+#include <arch.h>
+#include <symtab.h>
+#include <proc/thread.h>
+#include <proc/task.h>
+#include <synch/spinlock.h>
+#include <arch/ddi/ddi.h>
+#include <ipc/sysipc.h>
+#include <interrupt.h>
+#include <ddi/irq.h>
+/*
+ * Interrupt and exception dispatching.
+ */
+void (* disable_irqs_function)(uint16_t irqmask) = NULL;
+void (* enable_irqs_function)(uint16_t irqmask) = NULL;
+void (* eoi_function)(void) = NULL;
+void decode_istate(istate_t *istate)
+{
+    char *symbol = get_symtab_entry(istate->eip);
+    if (!symbol)
+        symbol = "";
+    if (CPU)
+        printf("----------------EXCEPTION OCCURED (cpu%d)----------------\n", CPU->id);
+    else
+        printf("----------------EXCEPTION OCCURED----------------\n");
+    printf("%%eip: %#x (%s)\n",istate->eip,symbol);
+    printf("ERROR_WORD=%#x\n", istate->error_word);
+    printf("%%cs=%#x,flags=%#x\n", istate->cs, istate->eflags);
+    printf("%%eax=%#x, %%ecx=%#x, %%edx=%#x, %%esp=%#x\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
+#ifdef CONFIG_DEBUG_ALLREGS
+    printf("%%esi=%#x, %%edi=%#x, %%ebp=%#x, %%ebx=%#x\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
+#endif
+    printf("stack: %#x, %#x, %#x, %#x\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
+    printf("       %#x, %#x, %#x, %#x\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
+}
+static void trap_virtual_eoi(void)
+{
+    if (eoi_function)
+        eoi_function();
+    else
+        panic("No eoi_function.");
+}
+static void null_interrupt(int n, istate_t *istate)
+{
+    fault_if_from_uspace(istate, "Unserviced interrupt: %d.", n);
+    decode_istate(istate);
+    panic("Unserviced interrupt: %d.", n);
+}
+/** General Protection Fault. */
+static void gp_fault(int n, istate_t *istate)
+{
+    if (TASK) {
+        count_t ver;
+        spinlock_lock(&TASK->lock);
+        ver = TASK->arch.iomapver;
+        spinlock_unlock(&TASK->lock);
+        if (CPU->arch.iomapver_copy != ver) {
+            /*
+             * This fault can be caused by an early access
+             * to I/O port because of an out-dated
+             * I/O Permission bitmap installed on CPU.
+             * Install the fresh copy and restart
+             * the instruction.
+             */
+            io_perm_bitmap_install();
+            return;
+        }
+        fault_if_from_uspace(istate, "General protection fault.");
+    }
+    decode_istate(istate);
+    panic("General protection fault.");
+}
+static void ss_fault(int n, istate_t *istate)
+{
+    fault_if_from_uspace(istate, "Stack fault.");
+    decode_istate(istate);
+    panic("Stack fault.");
+}
+static void simd_fp_exception(int n, istate_t *istate)
+{
+    uint32_t mxcsr;
+    asm
+    (
+        "stmxcsr %0;\n"
+        :"=m"(mxcsr)
+    );
+    fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx.",
+                 (unative_t)mxcsr);
+    decode_istate(istate);
+    printf("MXCSR: %#zx\n",(unative_t)(mxcsr));
+    panic("SIMD FP exception(19).");
+}
+static void nm_fault(int n, istate_t *istate)
+{
+#ifdef CONFIG_FPU_LAZY
+    scheduler_fpu_lazy_request();
+#else
+    fault_if_from_uspace(istate, "FPU fault.");
+    panic("FPU fault.");
+#endif
+}
+#ifdef CONFIG_SMP
+static void tlb_shootdown_ipi(int n, istate_t *istate)
+{
+    trap_virtual_eoi();
+    tlb_shootdown_ipi_recv();
+}
+#endif
+/** Handler of IRQ exceptions */
+static void irq_interrupt(int n, istate_t *istate)
+{
+    ASSERT(n >= IVT_IRQBASE);
+    int inum = n - IVT_IRQBASE;
+    bool ack = false;
+    ASSERT(inum < IRQ_COUNT);
+    ASSERT((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
+    irq_t *irq = irq_dispatch_and_lock(inum);
+    if (irq) {
+        /*
+         * The IRQ handler was found.
+         */
+        if (irq->preack) {
+            /* Send EOI before processing the interrupt */
+            trap_virtual_eoi();
+            ack = true;
+        }
+        irq->handler(irq, irq->arg);
+        spinlock_unlock(&irq->lock);
+    } else {
+        /*
+         * Spurious interrupt.
+         */
+#ifdef CONFIG_DEBUG
+        printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
+#endif
+    }
+    if (!ack)
+        trap_virtual_eoi();
+}
+void interrupt_init(void)
+{
+    int i;
+    for (i = 0; i < IVT_ITEMS; i++)
+        exc_register(i, "null", (iroutine) null_interrupt);
+    for (i = 0; i < IRQ_COUNT; i++) {
+        if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
+            exc_register(IVT_IRQBASE + i, "irq", (iroutine) irq_interrupt);
+    }
+    exc_register(7, "nm_fault", (iroutine) nm_fault);
+    exc_register(12, "ss_fault", (iroutine) ss_fault);
+    exc_register(13, "gp_fault", (iroutine) gp_fault);
+    exc_register(19, "simd_fp", (iroutine) simd_fp_exception);
+#ifdef CONFIG_SMP
+    exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", (iroutine) tlb_shootdown_ipi);
+#endif
+}
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+    if (enable_irqs_function)
+        enable_irqs_function(irqmask);
+    else
+        panic("No enable_irqs_function.");
+}
+void trap_virtual_disable_irqs(uint16_t irqmask)
+{
+    if (disable_irqs_function)
+        disable_irqs_function(irqmask);
+    else
+        panic("No disable_irqs_function.");
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/asm.S
 ,0 → 1,124
+#
+# Copyright (c) 2001-2004 Jakub Jermar
+# 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.
+#
+## very low and hardware-level functions
+# Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int has no error word
+# and 1 means interrupt with error word
+#define ERROR_WORD_INTERRUPT_LIST 0x00027D00
+.text
+.global xen_callback
+.global xen_failsafe_callback
+.global enable_l_apic_in_msr
+.global memcpy
+.global memcpy_from_uspace
+.global memcpy_from_uspace_failover_address
+.global memcpy_to_uspace
+.global memcpy_to_uspace_failover_address
+xen_callback:
+    iret
+xen_failsafe_callback:
+    iret
+#define MEMCPY_DST  4
+#define MEMCPY_SRC  8
+#define MEMCPY_SIZE 12
+/** Copy memory to/from userspace.
+ *
+ * This is almost conventional memcpy().
+ * The difference is that there is a failover part
+ * to where control is returned from a page fault
+ * if the page fault occurs during copy_from_uspace()
+ * or copy_to_uspace().
+ *
+ * @param MEMCPY_DST(%esp)  Destination address.
+ * @param MEMCPY_SRC(%esp)  Source address.
+ * @param MEMCPY_SIZE(%esp) Size.
+ *
+ * @return MEMCPY_DST(%esp) on success and 0 on failure.
+ */
+memcpy:
+memcpy_from_uspace:
+memcpy_to_uspace:
+    movl %edi, %edx             /* save %edi */
+    movl %esi, %eax             /* save %esi */
+    movl MEMCPY_SIZE(%esp), %ecx
+    shrl $2, %ecx               /* size / 4 */
+    movl MEMCPY_DST(%esp), %edi
+    movl MEMCPY_SRC(%esp), %esi
+    rep movsl               /* copy as much as possible word by word */
+    movl MEMCPY_SIZE(%esp), %ecx
+    andl $3, %ecx               /* size % 4 */
+    jz 0f
+    rep movsb               /* copy the rest byte by byte */
+:
+    movl %edx, %edi
+    movl %eax, %esi
+    movl MEMCPY_DST(%esp), %eax     /* MEMCPY_DST(%esp), success */
+    ret
+/*
+ * We got here from as_page_fault() after the memory operations
+ * above had caused a page fault.
+ */
+memcpy_from_uspace_failover_address:
+memcpy_to_uspace_failover_address:
+    movl %edx, %edi
+    movl %eax, %esi
+    xorl %eax, %eax             /* return 0, failure */
+    ret
+## Enable local APIC
+#
+# Enable local APIC in MSR.
+#
+enable_l_apic_in_msr:
+    push %eax
+    movl $0x1b, %ecx
+    rdmsr
+    orl $(1<<11),%eax
+    orl $(0xfee00000),%eax
+    wrmsr
+    pop %eax
+    ret

 /branches/dynload/kernel/arch/ia32xen/src/userspace.c
 ,0 → 1,93
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen
+ * @{
+ */
+/** @file
+ */
+#include <userspace.h>
+#include <arch/pm.h>
+#include <arch/types.h>
+#include <arch.h>
+#include <proc/uarg.h>
+#include <mm/as.h>
+/** Enter userspace
+ *
+ * Change CPU protection level to 3, enter userspace.
+ *
+ */
+void userspace(uspace_arg_t *kernel_uarg)
+{
+    uint32_t ipl = interrupts_disable();
+    asm volatile (
+        /*
+         * Clear nested task flag.
+         */
+        "pushfl\n"
+        "pop %%eax\n"
+        "and $0xffffbfff, %%eax\n"
+        "push %%eax\n"
+        "popfl\n"
+        /* Set up GS register (TLS) */
+        "movl %6, %%gs\n"
+        "pushl %0\n"
+        "pushl %1\n"
+        "pushl %2\n"
+        "pushl %3\n"
+        "pushl %4\n"
+        "movl %5, %%eax\n"
+        /* %ebx is defined to hold pcb_ptr - set it to 0 */
+        "xorl %%ebx, %%ebx\n"
+        "iret\n"
+        :
+        : "i" (selector(UDATA_DES) | PL_USER),
+          "r" (kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+          "r" (ipl),
+          "i" (selector(UTEXT_DES) | PL_USER),
+          "r" (kernel_uarg->uspace_entry),
+          "r" (kernel_uarg->uspace_uarg),
+          "r" (selector(TLS_DES))
+        : "eax"
+    );
+    /* Unreachable */
+    for(;;)
+        ;
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/ia32xen.c
 ,0 → 1,218
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen
+ * @{
+ */
+/** @file
+ */
+#include <arch.h>
+#include <main/main.h>
+#include <arch/types.h>
+#include <align.h>
+#include <arch/pm.h>
+#include <arch/drivers/xconsole.h>
+#include <arch/mm/page.h>
+#include <arch/context.h>
+#include <config.h>
+#include <arch/interrupt.h>
+#include <arch/asm.h>
+#include <genarch/acpi/acpi.h>
+#include <arch/bios/bios.h>
+#include <interrupt.h>
+#include <arch/debugger.h>
+#include <proc/thread.h>
+#include <syscall/syscall.h>
+#include <console/console.h>
+#include <ddi/irq.h>
+start_info_t start_info;
+memzone_t meminfo;
+extern void xen_callback(void);
+extern void xen_failsafe_callback(void);
+void arch_pre_main(void)
+{
+    pte_t pte;
+    memsetb(&pte, sizeof(pte), 0);
+    pte.present = 1;
+    pte.writeable = 1;
+    pte.frame_address = ADDR2PFN((uintptr_t) start_info.shared_info);
+    ASSERT(xen_update_va_mapping(&shared_info, pte, UVMF_INVLPG) == 0);
+    if (!(start_info.flags & SIF_INITDOMAIN)) {
+        /* Map console frame */
+        pte.present = 1;
+        pte.writeable = 1;
+        pte.frame_address = start_info.console.domU.mfn;
+        ASSERT(xen_update_va_mapping(&console_page, pte, UVMF_INVLPG) == 0);
+    } else
+        start_info.console.domU.evtchn = 0;
+    ASSERT(xen_set_callbacks(XEN_CS, xen_callback, XEN_CS, xen_failsafe_callback) == 0);
+    /* Create identity mapping */
+    meminfo.start = ADDR2PFN(ALIGN_UP(KA2PA(start_info.ptl0), PAGE_SIZE)) + start_info.pt_frames;
+    meminfo.size = start_info.frames - meminfo.start;
+    meminfo.reserved = 0;
+    uintptr_t pa;
+    index_t last_ptl0 = 0;
+    for (pa = PFN2ADDR(meminfo.start); pa < PFN2ADDR(meminfo.start + meminfo.size); pa += FRAME_SIZE) {
+        uintptr_t va = PA2KA(pa);
+        if ((PTL0_INDEX(va) != last_ptl0) && (GET_PTL1_FLAGS(start_info.ptl0, PTL0_INDEX(va)) & PAGE_NOT_PRESENT)) {
+            /* New page directory entry needed */
+            uintptr_t tpa = PFN2ADDR(meminfo.start + meminfo.reserved);
+            uintptr_t tva = PA2KA(tpa);
+            memsetb((void *) tva, PAGE_SIZE, 0);
+            pte_t *tptl3 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(tva)));
+            SET_FRAME_ADDRESS(tptl3, PTL3_INDEX(tva), 0);
+            SET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(va), tpa);
+            SET_FRAME_ADDRESS(tptl3, PTL3_INDEX(tva), tpa);
+            last_ptl0 = PTL0_INDEX(va);
+            meminfo.reserved++;
+        }
+        pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(va)));
+        SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(va), pa);
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(va), PAGE_PRESENT | PAGE_WRITE);
+    }
+    /* Put initial stack safely in the mapped area */
+    stack_safe = PA2KA(PFN2ADDR(meminfo.start + meminfo.reserved));
+}
+void arch_pre_mm_init(void)
+{
+    pm_init();
+    if (config.cpu_active == 1) {
+        interrupt_init();
+//      bios_init();
+    }
+}
+void arch_post_mm_init(void)
+{
+    if (config.cpu_active == 1) {
+        /* Initialize IRQ routing */
+        irq_init(IRQ_COUNT, IRQ_COUNT);
+        /* Video */
+        xen_console_init();
+        /* Enable debugger */
+        debugger_init();
+        /* Merge all memory zones to 1 big zone */
+        zone_merge_all();
+    }
+}
+void arch_post_cpu_init(void)
+{
+}
+void arch_pre_smp_init(void)
+{
+    if (config.cpu_active == 1) {
+#ifdef CONFIG_SMP
+        acpi_init();
+#endif /* CONFIG_SMP */
+    }
+}
+void arch_post_smp_init(void)
+{
+}
+void calibrate_delay_loop(void)
+{
+//  i8254_calibrate_delay_loop();
+    if (config.cpu_active == 1) {
+        /*
+         * This has to be done only on UP.
+         * On SMP, i8254 is not used for time keeping and its interrupt pin remains masked.
+         */
+//      i8254_normal_operation();
+    }
+}
+/** Set thread-local-storage pointer
+ *
+ * TLS pointer is set in GS register. That means, the GS contains
+ * selector, and the descriptor->base is the correct address.
+ */
+unative_t sys_tls_set(unative_t addr)
+{
+    THREAD->arch.tls = addr;
+    set_tls_desc(addr);
+    return 0;
+}
+/** Acquire console back for kernel
+ *
+ */
+void arch_grab_console(void)
+{
+}
+/** Return console to userspace
+ *
+ */
+void arch_release_console(void)
+{
+}
+void arch_reboot(void)
+{
+    // TODO
+    while (1);
+}
+/** @}
+ */

/branches/dynload/kernel/arch/ia32xen/src/context.S
0,0 → 1,0
link ../../ia32/src/context.S
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /branches/dynload/kernel/arch/ia32xen/src/boot/boot.S
 ,0 → 1,102
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include <arch/mm/page.h>
+#include <arch/hypercall.h>
+#define ELFNOTE(name, type, desctype, descval) \
+    .section .note.name; \
+    .align 4; \
+    .long 2f - 1f; \
+    .long 4f - 3f; \
+    .long type; \
+:.asciz #name; \
+:.align 4; \
+:desctype descval; \
+:.align 4
+ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS,          .asciz, "HelenOS")
+ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION,     .asciz, RELEASE)
+ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION,       .asciz, "xen-3.0")
+ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,         .long,  PA2KA(BOOT_OFFSET))
+ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET,      .long,  0)
+ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,             .long,  kernel_image_start)
+ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE,    .long,  hypercall_page)
+ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,          .asciz, "auto_translated_physmap|supervisor_mode_kernel")
+ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,          .asciz, "no")
+ELFNOTE(Xen, XEN_ELFNOTE_LOADER,            .asciz, "generic")
+.text
+.code32
+.align 4
+.global kernel_image_start
+kernel_image_start:
+    # copy start_info (esi initialized by Xen)
+    movl $start_info, %edi
+    movl $START_INFO_SIZE >> 2, %ecx
+    cld
+    rep movsb
+    # switch to temporal kernel stack
+    movl $kernel_stack, %esp
+    call arch_pre_main
+    call main_bsp                               # never returns
+    cli
+    hlt
+kernel_stack_bottom:
+    .space TEMP_STACK_SIZE
+kernel_stack:
+.section K_TEXT_START, "aw", @progbits
+.global hypercall_page
+.org 0
+hypercall_page:
+    .space PAGE_SIZE
+.global shared_info
+.org 0x1000
+shared_info:
+    .space PAGE_SIZE
+.global console_page
+.org 0x2000
+console_page:
+    .space PAGE_SIZE
+# Xen 3.0.3 ELF loader is somehow buggy
+# thus this workaround
+.global dummy_fill
+dummy_fill:
+    .space (1024 * 1024)

 /branches/dynload/kernel/arch/ia32xen/src/proc/scheduler.c
 ,0 → 1,81
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen_proc
+ * @{
+ */
+/** @file
+ */
+#include <proc/scheduler.h>
+#include <cpu.h>
+#include <proc/task.h>
+#include <proc/thread.h>
+#include <arch.h>
+#include <arch/context.h>   /* SP_DELTA */
+#include <arch/debugger.h>
+#include <arch/pm.h>
+#include <arch/asm.h>
+#include <arch/ddi/ddi.h>
+/** Perform ia32 specific tasks needed before the new task is run.
+ *
+ * Interrupts are disabled.
+ */
+void before_task_runs_arch(void)
+{
+//  io_perm_bitmap_install();
+}
+/** Perform ia32 specific tasks needed before the new thread is scheduled.
+ *
+ * THREAD is locked and interrupts are disabled.
+ */
+void before_thread_runs_arch(void)
+{
+    CPU->arch.tss->esp0 = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+    CPU->arch.tss->ss0 = selector(KDATA_DES);
+    /* Set up TLS in GS register */
+//  set_tls_desc(THREAD->arch.tls);
+#ifdef CONFIG_DEBUG_AS_WATCHPOINT
+    /* Set watchpoint on AS to ensure that nobody sets it to zero */
+    if (CPU->id < BKPOINTS_MAX)
+        breakpoint_add(&((the_t *) THREAD->kstack)->as,
+                   BKPOINT_WRITE | BKPOINT_CHECK_ZERO,
+                   CPU->id);
+#endif
+}
+void after_thread_ran_arch(void)
+{
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/proc/task.c
 ,0 → 1,61
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 ia32xen_proc
+ * @{
+ */
+/** @file
+ */
+#include <proc/task.h>
+#include <arch/types.h>
+#include <adt/bitmap.h>
+#include <mm/slab.h>
+/** Perform ia32 specific task initialization.
+ *
+ * @param t Task to be initialized.
+ */
+void task_create_arch(task_t *t)
+{
+    t->arch.iomapver = 0;
+    bitmap_initialize(&t->arch.iomap, NULL, 0);
+}
+/** Perform ia32 specific task destruction.
+ *
+ * @param t Task to be initialized.
+ */
+void task_destroy_arch(task_t *t)
+{
+    if (t->arch.iomap.map)
+        free(t->arch.iomap.map);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/src/proc/thread.c
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 ia32xen_proc
+ * @{
+ */
+/** @file
+ */
+#include <proc/thread.h>
+/** Perform ia32xen specific thread initialization.
+ *
+ * @param t Thread to be initialized.
+ */
+void thread_create_arch(thread_t *t)
+{
+    t->arch.tls = 0;
+}
+/** @}
+ */

/branches/dynload/kernel/arch/ia32xen/src/fpu_context.c
0,0 → 1,0
link ../../ia32/src/fpu_context.c
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/debug
0,0 → 1,0
link ../../ia32/src/debug
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/cpu
0,0 → 1,0
link ../../ia32/src/cpu
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/bios
0,0 → 1,0
link ../../ia32/src/bios
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/delay.s
0,0 → 1,0
link ../../ia32/src/delay.s
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/ddi
0,0 → 1,0
link ../../ia32/src/ddi
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/debugger.c
0,0 → 1,0
link ../../ia32/src/debugger.c
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/src/atomic.S
0,0 → 1,0
link ../../ia32/src/atomic.S
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /branches/dynload/kernel/arch/ia32xen/Makefile.inc
 ,0 → 1,139
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Toolchain configuration
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf32-i386
+BFD_ARCH = i386
+BFD = elf32-i386
+TARGET = i686-pc-linux-gnu
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
+DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
+CMN1 = -m32
+GCC_CFLAGS += $(CMN1)
+ICC_CFLAGS += $(CMN1)
+SUNCC_CFLAGS += $(CMN1)
+## Accepted CPUs
+#
+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
+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
+## Accepted configuration directives
+#
+ifeq ($(CONFIG_SMP),y)
+    DEFS += -DCONFIG_SMP
+endif
+ifeq ($(CONFIG_HT),y)
+    DEFS += -DCONFIG_HT
+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/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/ia32xen.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/xconsole.c \
+    arch/$(ARCH)/src/boot/boot.S \
+    arch/$(ARCH)/src/fpu_context.c \
+    arch/$(ARCH)/src/debugger.c

 /branches/dynload/kernel/arch/ia32xen/include/mm/page.h
 ,0 → 1,257
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_PAGE_H_
+#define KERN_ia32xen_PAGE_H_
+#include <arch/mm/frame.h>
+#define PAGE_WIDTH  FRAME_WIDTH
+#define PAGE_SIZE   FRAME_SIZE
+#ifdef KERNEL
+#ifndef __ASM__
+#   define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
+#   define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
+#else
+#   define KA2PA(x) ((x) - 0x80000000)
+#   define PA2KA(x) ((x) + 0x80000000)
+#endif
+/*
+ * Implementation of generic 4-level page table interface.
+ * IA-32 has 2-level page tables, so PTL1 and PTL2 are left out.
+ */
+/* Number of entries in each level. */
+#define PTL0_ENTRIES_ARCH   1024
+#define PTL1_ENTRIES_ARCH   0
+#define PTL2_ENTRIES_ARCH   0
+#define PTL3_ENTRIES_ARCH   1024
+/* Page table size for each level. */
+#define PTL0_SIZE_ARCH      ONE_FRAME
+#define PTL1_SIZE_ARCH      0
+#define PTL2_SIZE_ARCH      0
+#define PTL3_SIZE_ARCH      ONE_FRAME
+/* Macros calculating indices into page tables in each level. */
+#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ff)
+#define PTL1_INDEX_ARCH(vaddr)  0
+#define PTL2_INDEX_ARCH(vaddr)  0
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
+/* Get PTE address accessors for each level. */
+#define GET_PTL1_ADDRESS_ARCH(ptl0, i) \
+    ((pte_t *) MA2PA((((pte_t *) (ptl0))[(i)].frame_address) << 12))
+#define GET_PTL2_ADDRESS_ARCH(ptl1, i) \
+    (ptl1)
+#define GET_PTL3_ADDRESS_ARCH(ptl2, i) \
+    (ptl2)
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i) \
+    ((uintptr_t) MA2PA((((pte_t *) (ptl3))[(i)].frame_address) << 12))
+/* Set PTE address accessors for each level. */
+#define SET_PTL0_ADDRESS_ARCH(ptl0) \
+{ \
+    mmuext_op_t mmu_ext; \
+    \
+    mmu_ext.cmd = MMUEXT_NEW_BASEPTR; \
+    mmu_ext.mfn = ADDR2PFN(PA2MA(ptl0)); \
+    ASSERT(xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF) == 0); \
+}
+#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) \
+{ \
+    mmuext_op_t mmu_ext; \
+    \
+    mmu_ext.cmd = MMUEXT_PIN_L1_TABLE; \
+    mmu_ext.mfn = ADDR2PFN(PA2MA(a)); \
+    ASSERT(xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF) == 0); \
+    \
+    mmu_update_t update; \
+    \
+    update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl0))[(i)])); \
+    update.val = PA2MA(a); \
+    ASSERT(xen_mmu_update(&update, 1, NULL, DOMID_SELF) == 0); \
+}
+#define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
+#define SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
+#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) \
+{ \
+    mmu_update_t update; \
+    \
+    update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl3))[(i)])); \
+    update.val = PA2MA(a); \
+    ASSERT(xen_mmu_update(&update, 1, NULL, DOMID_SELF) == 0); \
+}
+/* Get PTE flags accessors for each level. */
+#define GET_PTL1_FLAGS_ARCH(ptl0, i) \
+    get_pt_flags((pte_t *) (ptl0), (index_t) (i))
+#define GET_PTL2_FLAGS_ARCH(ptl1, i) \
+    PAGE_PRESENT
+#define GET_PTL3_FLAGS_ARCH(ptl2, i) \
+    PAGE_PRESENT
+#define GET_FRAME_FLAGS_ARCH(ptl3, i) \
+    get_pt_flags((pte_t *) (ptl3), (index_t) (i))
+/* Set PTE flags accessors for each level. */
+#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
+    set_pt_flags((pte_t *) (ptl0), (index_t) (i), (x))
+#define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
+#define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
+#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
+    set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
+/* Query macros for the last level. */
+#define PTE_VALID_ARCH(p) \
+    (*((uint32_t *) (p)) != 0)
+#define PTE_PRESENT_ARCH(p) \
+    ((p)->present != 0)
+#define PTE_GET_FRAME_ARCH(p) \
+    ((p)->frame_address << FRAME_WIDTH)
+#define PTE_WRITABLE_ARCH(p) \
+    ((p)->writeable != 0)
+#define PTE_EXECUTABLE_ARCH(p) \
+#ifndef __ASM__
+#include <mm/mm.h>
+#include <arch/hypercall.h>
+#include <arch/interrupt.h>
+/* Page fault error codes. */
+/** When bit on this position is 0, the page fault was caused by a not-present
+ * page.
+ */
+#define PFERR_CODE_P        (1 << 0)
+/** When bit on this position is 1, the page fault was caused by a write. */
+#define PFERR_CODE_RW       (1 << 1)
+/** When bit on this position is 1, the page fault was caused in user mode. */
+#define PFERR_CODE_US       (1 << 2)
+/** When bit on this position is 1, a reserved bit was set in page directory. */
+#define PFERR_CODE_RSVD     (1 << 3)
+typedef struct {
+    uint64_t ptr;      /**< Machine address of PTE */
+    union {            /**< New contents of PTE */
+        uint64_t val;
+        pte_t pte;
+    };
+} mmu_update_t;
+typedef struct {
+    unsigned int cmd;
+    union {
+        unsigned long mfn;
+        unsigned long linear_addr;
+    };
+    union {
+        unsigned int nr_ents;
+        void *vcpumask;
+    };
+} mmuext_op_t;
+static inline int xen_update_va_mapping(const void *va, const pte_t pte,
+    const unsigned int flags)
+{
+    return hypercall4(XEN_UPDATE_VA_MAPPING, va, pte, 0, flags);
+}
+static inline int xen_mmu_update(const mmu_update_t *req,
+    const unsigned int count, unsigned int *success_count, domid_t domid)
+{
+    return hypercall4(XEN_MMU_UPDATE, req, count, success_count, domid);
+}
+static inline int xen_mmuext_op(const mmuext_op_t *op, const unsigned int count,
+    unsigned int *success_count, domid_t domid)
+{
+    return hypercall4(XEN_MMUEXT_OP, op, count, success_count, domid);
+}
+static inline int get_pt_flags(pte_t *pt, index_t i)
+{
+    pte_t *p = &pt[i];
+    return ((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT |
+        (!p->present) << PAGE_PRESENT_SHIFT |
+        p->uaccessible << PAGE_USER_SHIFT |
+<< PAGE_READ_SHIFT |
+        p->writeable << PAGE_WRITE_SHIFT |
+<< PAGE_EXEC_SHIFT |
+        p->global << PAGE_GLOBAL_SHIFT);
+}
+static inline void set_pt_flags(pte_t *pt, index_t i, int flags)
+{
+    pte_t p = pt[i];
+    p.page_cache_disable = !(flags & PAGE_CACHEABLE);
+    p.present = !(flags & PAGE_NOT_PRESENT);
+    p.uaccessible = (flags & PAGE_USER) != 0;
+    p.writeable = (flags & PAGE_WRITE) != 0;
+    p.global = (flags & PAGE_GLOBAL) != 0;
+    /*
+     * Ensure that there is at least one bit set even if the present bit is cleared.
+     */
+    p.soft_valid = true;
+    mmu_update_t update;
+    update.ptr = PA2MA(KA2PA(&(pt[i])));
+    update.pte = p;
+    xen_mmu_update(&update, 1, NULL, DOMID_SELF);
+}
+extern void page_arch_init(void);
+extern void page_fault(int n, istate_t *istate);
+#endif /* __ASM__ */
+#endif /* KERNEL */
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/mm/frame.h
 ,0 → 1,57
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_FRAME_H_
+#define KERN_ia32xen_FRAME_H_
+#define FRAME_WIDTH 12  /* 4K */
+#define FRAME_SIZE  (1 << FRAME_WIDTH)
+#ifdef KERNEL
+#ifndef __ASM__
+#define PA2MA(x)    ((start_info.pm_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))
+#define MA2PA(x)    ((mp_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))
+extern void frame_arch_init(void);
+extern void physmem_print(void);
+#endif /* __ASM__ */
+#endif /* KERNEL */
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/mm/as.h
 ,0 → 1,64
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen_mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_AS_H_
+#define KERN_ia32xen_AS_H_
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
+#define KERNEL_ADDRESS_SPACE_START_ARCH     ((unsigned long) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH       ((unsigned long) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH       ((unsigned long) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH     ((unsigned long) 0x7fffffff)
+#define USTACK_ADDRESS_ARCH (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
+typedef struct {
+} as_arch_t;
+#include <genarch/mm/as_pt.h>
+#define as_constructor_arch(as, flags)      (as != as)
+#define as_destructor_arch(as)          (as != as)
+#define as_create_arch(as, flags)       (as != as)
+#define as_install_arch(as)
+#define as_deinstall_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
+extern void as_arch_init(void);
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/mm/asid.h
 ,0 → 1,55
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen_mm
+ * @{
+ */
+/** @file
+ * @ingroup ia32xen_mm
+ */
+/*
+ * ia32xen has no hardware support for address space identifiers.
+ * This file is provided to do nop-implementation of mm/asid.h
+ * interface.
+ */
+#ifndef KERN_ia32xen_ASID_H_
+#define KERN_ia32xen_ASID_H_
+typedef int asid_t;
+#define ASID_MAX_ARCH       3
+#define asid_get()      (ASID_START+1)
+#define asid_put(asid)
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/mm/tlb.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ia32xen_mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_TLB_H_
+#define KERN_ia32xen_TLB_H_
+#define tlb_arch_init()
+#define tlb_print()
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/types.h
 ,0 → 1,83
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * 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 ia32xen
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_TYPES_H_
+#define KERN_ia32xen_TYPES_H_
+#define NULL 0
+#define false 0
+#define true 1
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed long int32_t;
+typedef signed long long int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long uint32_t;
+typedef unsigned long long uint64_t;
+typedef uint32_t size_t;
+typedef uint32_t count_t;
+typedef uint32_t index_t;
+typedef uint32_t uintptr_t;
+typedef uint32_t pfn_t;
+typedef uint8_t ipl_t;
+typedef uint32_t unative_t;
+typedef int32_t native_t;
+/** Page Table Entry. */
+typedef struct {
+    unsigned present : 1;
+    unsigned writeable : 1;
+    unsigned uaccessible : 1;
+    unsigned page_write_through : 1;
+    unsigned page_cache_disable : 1;
+    unsigned accessed : 1;
+    unsigned dirty : 1;
+    unsigned pat : 1;
+    unsigned global : 1;
+    unsigned soft_valid : 1;    /**< Valid content even if the present bit is not set. */
+    unsigned avl : 2;
+    unsigned frame_address : 20;
+} __attribute__ ((packed)) pte_t;
+#endif
+/** @}
+ */

/branches/dynload/kernel/arch/ia32xen/include/context_offset.h
0,0 → 1,0
link ../../ia32/include/context_offset.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /branches/dynload/kernel/arch/ia32xen/include/pm.h
 ,0 → 1,159
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_PM_H_
+#define KERN_ia32xen_PM_H_
+#define IDT_ITEMS 64
+#define GDT_ITEMS 7
+#define NULL_DES    0
+#define KTEXT_DES   1
+#define KDATA_DES   2
+#define UTEXT_DES   3
+#define UDATA_DES   4
+#define TSS_DES     5
+#define TLS_DES     6 /* Pointer to Thread-Local-Storage data */
+#define selector(des)   ((des) << 3)
+#define PL_KERNEL   1
+#define PL_USER     3
+#define AR_PRESENT  (1<<7)
+#define AR_DATA     (2<<3)
+#define AR_CODE     (3<<3)
+#define AR_WRITABLE (1<<1)
+#define AR_INTERRUPT    (0xe)
+#define AR_TSS      (0x9)
+#define DPL_KERNEL  (PL_KERNEL<<5)
+#define DPL_USER    (PL_USER<<5)
+#define TSS_BASIC_SIZE  104
+#define TSS_IOMAP_SIZE  (16*1024+1) /* 16K for bitmap + 1 terminating byte for convenience */
+#define IO_PORTS    (64*1024)
+#ifndef __ASM__
+#include <arch/types.h>
+#include <arch/context.h>
+struct ptr_16_32 {
+    uint16_t limit;
+    uint32_t base;
+} __attribute__ ((packed));
+typedef struct ptr_16_32 ptr_16_32_t;
+struct descriptor {
+    unsigned limit_0_15: 16;
+    unsigned base_0_15: 16;
+    unsigned base_16_23: 8;
+    unsigned access: 8;
+    unsigned limit_16_19: 4;
+    unsigned available: 1;
+    unsigned unused: 1;
+    unsigned special: 1;
+    unsigned granularity : 1;
+    unsigned base_24_31: 8;
+} __attribute__ ((packed));
+typedef struct descriptor  descriptor_t;
+struct tss {
+    uint16_t link;
+    unsigned : 16;
+    uint32_t esp0;
+    uint16_t ss0;
+    unsigned : 16;
+    uint32_t esp1;
+    uint16_t ss1;
+    unsigned : 16;
+    uint32_t esp2;
+    uint16_t ss2;
+    unsigned : 16;
+    uint32_t cr3;
+    uint32_t eip;
+    uint32_t eflags;
+    uint32_t eax;
+    uint32_t ecx;
+    uint32_t edx;
+    uint32_t ebx;
+    uint32_t esp;
+    uint32_t ebp;
+    uint32_t esi;
+    uint32_t edi;
+    uint16_t es;
+    unsigned : 16;
+    uint16_t cs;
+    unsigned : 16;
+    uint16_t ss;
+    unsigned : 16;
+    uint16_t ds;
+    unsigned : 16;
+    uint16_t fs;
+    unsigned : 16;
+    uint16_t gs;
+    unsigned : 16;
+    uint16_t ldtr;
+    unsigned : 16;
+    unsigned : 16;
+    uint16_t iomap_base;
+    uint8_t iomap[TSS_IOMAP_SIZE];
+} __attribute__ ((packed));
+typedef struct tss tss_t;
+extern ptr_16_32_t gdtr;
+extern ptr_16_32_t bootstrap_gdtr;
+extern ptr_16_32_t protected_ap_gdtr;
+extern struct tss *tss_p;
+extern descriptor_t gdt[];
+extern void pm_init(void);
+extern void gdt_setbase(descriptor_t *d, uintptr_t base);
+extern void gdt_setlimit(descriptor_t *d, uint32_t limit);
+extern void traps_init(void);
+extern void tss_initialize(tss_t *t);
+extern void set_tls_desc(uintptr_t tls);
+#endif /* __ASM__ */
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/hypercall.h
 ,0 → 1,381
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef KERN_ia32xen_HYPERCALL_H_
+#define KERN_ia32xen_HYPERCALL_H_
+#ifndef __ASM__
+#   include <arch/types.h>
+#   include <macros.h>
+#endif
+#define GUEST_CMDLINE   1024
+#define VIRT_CPUS   32
+#define START_INFO_SIZE 1104
+#define BOOT_OFFSET     0x0000
+#define TEMP_STACK_SIZE 0x1000
+#define XEN_VIRT_START  0xFC000000
+#define XEN_CS          0xe019
+#define XEN_ELFNOTE_INFO            0
+#define XEN_ELFNOTE_ENTRY           1
+#define XEN_ELFNOTE_HYPERCALL_PAGE  2
+#define XEN_ELFNOTE_VIRT_BASE       3
+#define XEN_ELFNOTE_PADDR_OFFSET    4
+#define XEN_ELFNOTE_XEN_VERSION     5
+#define XEN_ELFNOTE_GUEST_OS        6
+#define XEN_ELFNOTE_GUEST_VERSION   7
+#define XEN_ELFNOTE_LOADER          8
+#define XEN_ELFNOTE_PAE_MODE        9
+#define XEN_ELFNOTE_FEATURES        10
+#define XEN_ELFNOTE_BSD_SYMTAB      11
+#define mp_map ((pfn_t *) XEN_VIRT_START)
+#define SIF_PRIVILEGED  (1 << 0)  /**< Privileged domain */
+#define SIF_INITDOMAIN  (1 << 1)  /**< Iinitial control domain */
+#define XEN_CONSOLE_VGA     0x03
+#define XEN_CONSOLE_VESA    0x23
+#define XEN_SET_TRAP_TABLE      0
+#define XEN_MMU_UPDATE          1
+#define XEN_SET_CALLBACKS       4
+#define XEN_UPDATE_VA_MAPPING   14
+#define XEN_EVENT_CHANNEL_OP    16
+#define XEN_VERSION             17
+#define XEN_CONSOLE_IO          18
+#define XEN_MMUEXT_OP           26
+/*
+ * Commands for XEN_CONSOLE_IO
+ */
+#define CONSOLE_IO_WRITE    0
+#define CONSOLE_IO_READ     1
+#define MMUEXT_PIN_L1_TABLE      0
+#define MMUEXT_PIN_L2_TABLE      1
+#define MMUEXT_PIN_L3_TABLE      2
+#define MMUEXT_PIN_L4_TABLE      3
+#define MMUEXT_UNPIN_TABLE       4
+#define MMUEXT_NEW_BASEPTR       5
+#define MMUEXT_TLB_FLUSH_LOCAL   6
+#define MMUEXT_INVLPG_LOCAL      7
+#define MMUEXT_TLB_FLUSH_MULTI   8
+#define MMUEXT_INVLPG_MULTI      9
+#define MMUEXT_TLB_FLUSH_ALL    10
+#define MMUEXT_INVLPG_ALL       11
+#define MMUEXT_FLUSH_CACHE      12
+#define MMUEXT_SET_LDT          13
+#define MMUEXT_NEW_USER_BASEPTR 15
+#define EVTCHNOP_SEND           4
+#define UVMF_NONE               0        /**< No flushing at all */
+#define UVMF_TLB_FLUSH          1        /**< Flush entire TLB(s) */
+#define UVMF_INVLPG             2        /**< Flush only one entry */
+#define UVMF_FLUSHTYPE_MASK     3
+#define UVMF_MULTI              0        /**< Flush subset of TLBs */
+#define UVMF_LOCAL              0        /**< Flush local TLB */
+#define UVMF_ALL                (1 << 2) /**< Flush all TLBs */
+#define DOMID_SELF (0x7FF0U)
+#define DOMID_IO   (0x7FF1U)
+#ifndef __ASM__
+typedef uint16_t domid_t;
+typedef uint32_t evtchn_t;
+typedef struct {
+    uint32_t version;
+    uint32_t pad0;
+    uint64_t tsc_timestamp;   /**< TSC at last update of time vals */
+    uint64_t system_time;     /**< Time, in nanosecs, since boot */
+    uint32_t tsc_to_system_mul;
+    int8_t tsc_shift;
+    int8_t pad1[3];
+} vcpu_time_info_t;
+typedef struct {
+    uint32_t cr2;
+    uint32_t pad[5];
+} arch_vcpu_info_t;
+typedef struct arch_shared_info {
+    pfn_t max_pfn;                  /**< max pfn that appears in table */
+    uint32_t pfn_to_mfn_frame_list_list;
+    uint32_t nmi_reason;
+} arch_shared_info_t;
+typedef struct {
+    uint8_t evtchn_upcall_pending;
+    ipl_t evtchn_upcall_mask;
+    evtchn_t evtchn_pending_sel;
+    arch_vcpu_info_t arch;
+    vcpu_time_info_t time;
+} vcpu_info_t;
+typedef struct {
+    vcpu_info_t vcpu_info[VIRT_CPUS];
+    evtchn_t evtchn_pending[32];
+    evtchn_t evtchn_mask[32];
+    uint32_t wc_version;                  /**< Version counter */
+    uint32_t wc_sec;                      /**< Secs  00:00:00 UTC, Jan 1, 1970 */
+    uint32_t wc_nsec;                     /**< Nsecs 00:00:00 UTC, Jan 1, 1970 */
+    arch_shared_info_t arch;
+} shared_info_t;
+typedef struct {
+    int8_t magic[32];           /**< "xen-<version>-<platform>" */
+    uint32_t frames;            /**< Available frames */
+    shared_info_t *shared_info; /**< Shared info structure (machine address) */
+    uint32_t flags;             /**< SIF_xxx flags */
+    pfn_t store_mfn;            /**< Shared page (machine page) */
+    evtchn_t store_evtchn;      /**< Event channel for store communication */
+    union {
+        struct {
+            pfn_t mfn;          /**< Console page (machine page) */
+            evtchn_t evtchn;    /**< Event channel for console messages */
+        } domU;
+        struct {
+            uint32_t info_off;  /**< Offset of console_info struct */
+            uint32_t info_size; /**< Size of console_info struct from start */
+        } dom0;
+    } console;
+    pte_t *ptl0;                /**< Boot PTL0 (kernel address) */
+    uint32_t pt_frames;         /**< Number of bootstrap page table frames */
+    pfn_t *pm_map;              /**< Physical->machine frame map (kernel address) */
+    void *mod_start;            /**< Modules start (kernel address) */
+    uint32_t mod_len;           /**< Modules size (bytes) */
+    int8_t cmd_line[GUEST_CMDLINE];
+} start_info_t;
+typedef struct {
+    uint8_t video_type;
+    union {
+        struct {
+            uint16_t font_height;
+            uint16_t cursor_x;
+            uint16_t cursor_y;
+            uint16_t rows;
+            uint16_t columns;
+        } vga;
+        struct {
+            uint16_t width;
+            uint16_t height;
+            uint16_t bytes_per_line;
+            uint16_t bits_per_pixel;
+            uint32_t lfb_base;
+            uint32_t lfb_size;
+            uint8_t red_pos;
+            uint8_t red_size;
+            uint8_t green_pos;
+            uint8_t green_size;
+            uint8_t blue_pos;
+            uint8_t blue_size;
+            uint8_t rsvd_pos;
+            uint8_t rsvd_size;
+        } vesa_lfb;
+    } info;
+} console_info_t;
+typedef struct {
+    pfn_t start;
+    pfn_t size;
+    pfn_t reserved;
+} memzone_t;
+extern start_info_t start_info;
+extern shared_info_t shared_info;
+extern memzone_t meminfo;
+typedef struct {
+    uint8_t vector;     /**< Exception vector */
+    uint8_t flags;      /**< 0-3: privilege level; 4: clear event enable */
+    uint16_t cs;        /**< Code selector */
+    void *address;      /**< Code offset */
+} trap_info_t;
+typedef struct {
+    evtchn_t port;
+} evtchn_send_t;
+typedef struct {
+    uint32_t cmd;
+    union {
+        evtchn_send_t send;
+    };
+} evtchn_op_t;
+#define force_evtchn_callback() ((void) xen_version(0, 0))
+#define hypercall0(id)  \
+    ({  \
+        unative_t ret;  \
+        asm volatile (  \
+            "call hypercall_page + (" STRING(id) " * 32)\n" \
+            : "=a" (ret)    \
+            :   \
+            : "memory"  \
+        );  \
+        ret;    \
+    })
+#define hypercall1(id, p1)  \
+    ({  \
+        unative_t ret, __ign1;  \
+        asm volatile (  \
+            "call hypercall_page + (" STRING(id) " * 32)\n" \
+            : "=a" (ret), \
+              "=b" (__ign1) \
+            : "1" (p1)  \
+            : "memory"  \
+        );  \
+        ret;    \
+    })
+#define hypercall2(id, p1, p2)  \
+    ({  \
+        unative_t ret, __ign1, __ign2;  \
+        asm volatile (  \
+            "call hypercall_page + (" STRING(id) " * 32)\n" \
+            : "=a" (ret), \
+              "=b" (__ign1),    \
+              "=c" (__ign2) \
+            : "1" (p1), \
+              "2" (p2)  \
+            : "memory"  \
+        );  \
+        ret;    \
+    })
+#define hypercall3(id, p1, p2, p3)  \
+    ({  \
+        unative_t ret, __ign1, __ign2, __ign3;  \
+        asm volatile (  \
+            "call hypercall_page + (" STRING(id) " * 32)\n" \
+            : "=a" (ret), \
+              "=b" (__ign1),    \
+              "=c" (__ign2),    \
+              "=d" (__ign3) \
+            : "1" (p1), \
+              "2" (p2), \
+              "3" (p3)  \
+            : "memory"  \
+        );  \
+        ret;    \
+    })
+#define hypercall4(id, p1, p2, p3, p4)  \
+    ({  \
+        unative_t ret, __ign1, __ign2, __ign3, __ign4;  \
+        asm volatile (  \
+            "call hypercall_page + (" STRING(id) " * 32)\n" \
+            : "=a" (ret), \
+              "=b" (__ign1),    \
+              "=c" (__ign2),    \
+              "=d" (__ign3),    \
+              "=S" (__ign4) \
+            : "1" (p1), \
+              "2" (p2), \
+              "3" (p3), \
+              "4" (p4)  \
+            : "memory"  \
+        );  \
+        ret;    \
+    })
+#define hypercall5(id, p1, p2, p3, p4, p5)  \
+    ({  \
+        unative_t ret, __ign1, __ign2, __ign3, __ign4, __ign5;  \
+        asm volatile (  \
+            "call hypercall_page + (" STRING(id) " * 32)\n" \
+            : "=a" (ret), \
+              "=b" (__ign1),    \
+              "=c" (__ign2),    \
+              "=d" (__ign3),    \
+              "=S" (__ign4),    \
+              "=D" (__ign5) \
+            : "1" (p1), \
+              "2" (p2), \
+              "3" (p3), \
+              "4" (p4), \
+              "5" (p5)  \
+            : "memory"  \
+        );  \
+        ret;    \
+    })
+static inline int xen_console_io(const unsigned int cmd, const unsigned int count, const char *str)
+{
+    return hypercall3(XEN_CONSOLE_IO, cmd, count, str);
+}
+static inline int xen_set_callbacks(const unsigned int event_selector, const void *event_address, const unsigned int failsafe_selector, void *failsafe_address)
+{
+    return hypercall4(XEN_SET_CALLBACKS, event_selector, event_address, failsafe_selector, failsafe_address);
+}
+static inline int xen_set_trap_table(const trap_info_t *table)
+{
+    return hypercall1(XEN_SET_TRAP_TABLE, table);
+}
+static inline int xen_version(const unsigned int cmd, const void *arg)
+{
+    return hypercall2(XEN_VERSION, cmd, arg);
+}
+static inline int xen_notify_remote(evtchn_t channel)
+{
+    evtchn_op_t op;
+    op.cmd = EVTCHNOP_SEND;
+    op.send.port = channel;
+    return hypercall1(XEN_EVENT_CHANNEL_OP, &op);
+}
+#endif
+#endif

 /branches/dynload/kernel/arch/ia32xen/include/asm.h
 ,0 → 1,272
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2005 Sergey Bondari
+ * 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.
+ */
+/** @addtogroup ia32xen
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_ASM_H_
+#define KERN_ia32xen_ASM_H_
+#include <arch/pm.h>
+#include <arch/types.h>
+#include <arch/barrier.h>
+#include <config.h>
+extern void enable_l_apic_in_msr(void);
+extern void asm_delay_loop(uint32_t t);
+extern void asm_fake_loop(uint32_t t);
+/** Halt CPU
+ *
+ * Halt the current CPU until interrupt event.
+ */
+#define cpu_halt() ((void) 0)
+#define cpu_sleep() ((void) 0)
+#define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \
+    { \
+    unative_t res; \
+    asm volatile ("movl %%" #reg ", %0" : "=r" (res) ); \
+    return res; \
+    }
+#define GEN_WRITE_REG(reg) static inline void write_ ##reg (unative_t regn) \
+    { \
+    asm volatile ("movl %0, %%" #reg : : "r" (regn)); \
+    }
+GEN_READ_REG(cr0);
+GEN_READ_REG(cr2);
+GEN_READ_REG(dr0);
+GEN_READ_REG(dr1);
+GEN_READ_REG(dr2);
+GEN_READ_REG(dr3);
+GEN_READ_REG(dr6);
+GEN_READ_REG(dr7);
+GEN_WRITE_REG(dr0);
+GEN_WRITE_REG(dr1);
+GEN_WRITE_REG(dr2);
+GEN_WRITE_REG(dr3);
+GEN_WRITE_REG(dr6);
+GEN_WRITE_REG(dr7);
+/** Byte to port
+ *
+ * Output byte to port
+ *
+ * @param port Port to write to
+ * @param val Value to write
+ */
+static inline void outb(uint16_t port, uint8_t val) { asm volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
+/** Word to port
+ *
+ * Output word to port
+ *
+ * @param port Port to write to
+ * @param val Value to write
+ */
+static inline void outw(uint16_t port, uint16_t val) { asm volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) ); }
+/** Double word to port
+ *
+ * Output double word to port
+ *
+ * @param port Port to write to
+ * @param val Value to write
+ */
+static inline void outl(uint16_t port, uint32_t val) { asm volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) ); }
+/** Byte from port
+ *
+ * Get byte from port
+ *
+ * @param port Port to read from
+ * @return Value read
+ */
+static inline uint8_t inb(uint16_t port) { uint8_t val; asm volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; }
+/** Word from port
+ *
+ * Get word from port
+ *
+ * @param port Port to read from
+ * @return Value read
+ */
+static inline uint16_t inw(uint16_t port) { uint16_t val; asm volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port) ); return val; }
+/** Double word from port
+ *
+ * Get double word from port
+ *
+ * @param port Port to read from
+ * @return Value read
+ */
+static inline uint32_t inl(uint16_t port) { uint32_t val; asm volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port) ); return val; }
+/** Enable interrupts.
+ *
+ * Enable interrupts and return previous
+ * value of EFLAGS.
+ *
+ * @return Old interrupt priority level.
+ */
+static inline ipl_t interrupts_enable(void)
+{
+    // FIXME SMP
+    ipl_t v = shared_info.vcpu_info[0].evtchn_upcall_mask;
+    write_barrier();
+    shared_info.vcpu_info[0].evtchn_upcall_mask = 0;
+    write_barrier();
+    if (shared_info.vcpu_info[0].evtchn_upcall_pending)
+        force_evtchn_callback();
+    return v;
+}
+/** Disable interrupts.
+ *
+ * Disable interrupts and return previous
+ * value of EFLAGS.
+ *
+ * @return Old interrupt priority level.
+ */
+static inline ipl_t interrupts_disable(void)
+{
+    // FIXME SMP
+    ipl_t v = shared_info.vcpu_info[0].evtchn_upcall_mask;
+    shared_info.vcpu_info[0].evtchn_upcall_mask = 1;
+    write_barrier();
+    return v;
+}
+/** Restore interrupt priority level.
+ *
+ * Restore EFLAGS.
+ *
+ * @param ipl Saved interrupt priority level.
+ */
+static inline void interrupts_restore(ipl_t ipl)
+{
+    if (ipl == 0)
+        interrupts_enable();
+    else
+        interrupts_disable();
+}
+/** Return interrupt priority level.
+ *
+ * @return EFLAFS.
+ */
+static inline ipl_t interrupts_read(void)
+{
+    // FIXME SMP
+    return shared_info.vcpu_info[0].evtchn_upcall_mask;
+}
+/** Return base address of current stack
+ *
+ * Return the base address of the current stack.
+ * The stack is assumed to be STACK_SIZE bytes long.
+ * The stack must start on page boundary.
+ */
+static inline uintptr_t get_stack_base(void)
+{
+    uintptr_t v;
+    asm volatile ("andl %%esp, %0\n" : "=r" (v) : "0" (~(STACK_SIZE-1)));
+    return v;
+}
+/** Return current IP address */
+static inline uintptr_t * get_ip()
+{
+    uintptr_t *ip;
+    asm volatile (
+        "mov %%eip, %0"
+        : "=r" (ip)
+        );
+    return ip;
+}
+/** Invalidate TLB Entry.
+ *
+ * @param addr Address on a page whose TLB entry is to be invalidated.
+ */
+static inline void invlpg(uintptr_t addr)
+{
+    asm volatile ("invlpg %0\n" :: "m" (*(unative_t *)addr));
+}
+/** Load GDTR register from memory.
+ *
+ * @param gdtr_reg Address of memory from where to load GDTR.
+ */
+static inline void gdtr_load(ptr_16_32_t *gdtr_reg)
+{
+    asm volatile ("lgdtl %0\n" : : "m" (*gdtr_reg));
+}
+/** Store GDTR register to memory.
+ *
+ * @param gdtr_reg Address of memory to where to load GDTR.
+ */
+static inline void gdtr_store(ptr_16_32_t *gdtr_reg)
+{
+    asm volatile ("sgdtl %0\n" : : "m" (*gdtr_reg));
+}
+/** Load TR from descriptor table.
+ *
+ * @param sel Selector specifying descriptor of TSS segment.
+ */
+static inline void tr_load(uint16_t sel)
+{
+    asm volatile ("ltr %0" : : "r" (sel));
+}
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ia32xen/include/drivers/xconsole.h
 ,0 → 1,56
+/*
+ * 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.
+ */
+/** @addtogroup ia32xen
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia32xen_XCONSOLE_H_
+#define KERN_ia32xen_XCONSOLE_H_
+#include <arch/types.h>
+typedef struct {
+    char in[1024];
+    char out[2048];
+    uint32_t in_cons;
+    uint32_t in_prod;
+    uint32_t out_cons;
+    uint32_t out_prod;
+} xencons_t;
+extern xencons_t console_page;
+extern void xen_console_init(void);
+#endif
+/** @}
+ */

/branches/dynload/kernel/arch/ia32xen/include/cycle.h
0,0 → 1,0
link ../../ia32/include/cycle.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/interrupt.h
0,0 → 1,0
link ../../ia32/include/interrupt.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/fpu_context.h
0,0 → 1,0
link ../../ia32/include/fpu_context.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/byteorder.h
0,0 → 1,0
link ../../ia32/include/byteorder.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/cpuid.h
0,0 → 1,0
link ../../ia32/include/cpuid.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/elf.h
0,0 → 1,0
link ../../ia32/include/elf.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/bios
0,0 → 1,0
link ../../ia32/include/bios
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/memstr.h
0,0 → 1,0
link ../../ia32/include/memstr.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/arg.h
0,0 → 1,0
link ../../ia32/include/arg.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/smp
0,0 → 1,0
link ../../ia32/include/smp
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/ddi
0,0 → 1,0
link ../../ia32/include/ddi
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/atomic.h
0,0 → 1,0
link ../../ia32/include/atomic.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/arch.h
0,0 → 1,0
link ../../ia32/include/arch.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/proc
0,0 → 1,0
link ../../ia32/include/proc
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/faddr.h
0,0 → 1,0
link ../../ia32/include/faddr.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/debugger.h
0,0 → 1,0
link ../../ia32/include/debugger.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/context.h
0,0 → 1,0
link ../../ia32/include/context.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/debug.h
0,0 → 1,0
link ../../ia32/include/debug.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/barrier.h
0,0 → 1,0
link ../../ia32/include/barrier.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/ia32xen/include/cpu.h
0,0 → 1,0
link ../../ia32/include/cpu.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /branches/dynload/kernel/arch/ia32xen/_link.ld.in
 ,0 → 1,45
+/** ia32xen linker script
+ */
+#include <arch/hypercall.h>
+#include <arch/mm/page.h>
+ENTRY(kernel_image_start)
+PHDRS {
+    image PT_LOAD FLAGS(7); /* RWE */
+    note PT_NOTE FLAGS(4);  /* R__ */
+}
+SECTIONS {
+    .image PA2KA(BOOT_OFFSET): AT (BOOT_OFFSET) {
+        ktext_start = .;
+        *(K_TEXT_START);
+        *(.text);
+        ktext_end = .;
+        kdata_start = .;
+        *(.data);           /* initialized data */
+        *(.rodata*);            /* string literals */
+        *(COMMON);          /* global variables */
+        hardcoded_load_address = .;
+        LONG(PA2KA(0));
+        hardcoded_ktext_size = .;
+        LONG(ktext_end - ktext_start);
+        hardcoded_kdata_size = .;
+        LONG(kdata_end - kdata_start);
+        symbol_table = .;
+        *(symtab.*);                /* Symbol table, must be LAST symbol! */
+        *(.bss);            /* uninitialized static variables */
+        kdata_end = .;
+    } :image
+    .notes : {
+        *(.note.Xen);
+    } :note
+    /DISCARD/ : {
+        *(.note.GNU-stack);
+        *(.comment);
+    }
+}

 /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/amd64/src/amd64.c
 ,19 → 226,5
     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 __64_BITS__
-    #define getip(x)  ((x)->rip)
+#ifdef amd64
+#   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 __64_BITS__
+#ifdef amd64
     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/include/types.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup amd64
+/** @addtogroup amd64
  * @{
  */
 /** @file
 ,9 → 59,6
 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
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_NAME = elf64-x86-64
 BFD_ARCH = i386:x86-64
 BFD = binary
 ,7 → 45,7
 ICC_CFLAGS += $(CMN1)
 SUNCC_CFLAGS += -m64 -xmodel=kernel
-DEFS += -D__64_BITS__
+DEFS += -DMACHINE=$(MACHINE) -D__64_BITS__
 ## Accepted CPUs
 #
 ,40 → 55,78
     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/$(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
+    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
 ifeq ($(CONFIG_SMP),y)
     ARCH_SOURCES += \
-        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
+        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
 endif

 /branches/dynload/kernel/arch/ppc64/src/mm/tlb.c
 ,0 → 1,85
+/*
+ * 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.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#include <mm/tlb.h>
+/** Initialize Page Hash Table.
+ *
+ * Setup the Page Hash Table with no entries.
+ *
+ */
+void tlb_arch_init(void)
+{
+    tlb_invalidate_all();
+}
+void tlb_invalidate_all(void)
+{
+    asm volatile (
+        "tlbsync\n"
+    );
+}
+/** Invalidate all entries in TLB that belong to specified address space.
+ *
+ * @param asid This parameter is ignored as the architecture doesn't support it.
+ */
+void tlb_invalidate_asid(asid_t asid)
+{
+    tlb_invalidate_all();
+}
+/** Invalidate TLB entries for specified page range belonging to specified address space.
+ *
+ * @param asid This parameter is ignored as the architecture doesn't support it.
+ * @param page Address of the first page whose entry is to be invalidated.
+ * @param cnt Number of entries to invalidate.
+ */
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
+{
+    tlb_invalidate_all();
+}
+/** Print contents of Page Hash Table. */
+void tlb_print(void)
+{
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/mm/page.c
 ,0 → 1,304
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/mm/page.h>
+#include <genarch/mm/page_pt.h>
+#include <arch/mm/frame.h>
+#include <arch/asm.h>
+#include <mm/frame.h>
+#include <mm/page.h>
+#include <mm/as.h>
+#include <arch.h>
+#include <arch/types.h>
+#include <arch/exception.h>
+#include <align.h>
+#include <config.h>
+#include <print.h>
+#include <symtab.h>
+static phte_t *phte;
+/** Try to find PTE for faulting address
+ *
+ * Try to find PTE for faulting address.
+ * The as->lock must be held on entry to this function
+ * if lock is true.
+ *
+ * @param as       Address space.
+ * @param lock     Lock/unlock the address space.
+ * @param badvaddr Faulting virtual address.
+ * @param access   Access mode that caused the fault.
+ * @param istate   Pointer to interrupted state.
+ * @param pfrc     Pointer to variable where as_page_fault() return code will be stored.
+ * @return         PTE on success, NULL otherwise.
+ *
+ */
+static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access,
+                     istate_t *istate, int *pfrc)
+{
+    /*
+     * Check if the mapping exists in page tables.
+     */
+    pte_t *pte = page_mapping_find(as, badvaddr);
+    if ((pte) && (pte->p)) {
+        /*
+         * Mapping found in page tables.
+         * Immediately succeed.
+         */
+        return pte;
+    } else {
+        int rc;
+        /*
+         * Mapping not found in page tables.
+         * Resort to higher-level page fault handler.
+         */
+        page_table_unlock(as, lock);
+        switch (rc = as_page_fault(badvaddr, access, istate)) {
+            case AS_PF_OK:
+                /*
+                 * The higher-level page fault handler succeeded,
+                 * The mapping ought to be in place.
+                 */
+                page_table_lock(as, lock);
+                pte = page_mapping_find(as, badvaddr);
+                ASSERT((pte) && (pte->p));
+                *pfrc = 0;
+                return pte;
+            case AS_PF_DEFER:
+                page_table_lock(as, lock);
+                *pfrc = rc;
+                return NULL;
+            case AS_PF_FAULT:
+                page_table_lock(as, lock);
+                *pfrc = rc;
+                return NULL;
+            default:
+                panic("Unexpected rc (%d).", rc);
+        }
+    }
+}
+static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
+{
+    char *symbol = "";
+    char *sym2 = "";
+    char *s = get_symtab_entry(istate->pc);
+    if (s)
+        symbol = s;
+    s = get_symtab_entry(istate->lr);
+    if (s)
+        sym2 = s;
+    panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr, istate->pc, symbol, sym2);
+}
+static void pht_insert(const uintptr_t vaddr, const pfn_t pfn)
+{
+    uint32_t page = (vaddr >> 12) & 0xffff;
+    uint32_t api = (vaddr >> 22) & 0x3f;
+    uint32_t vsid;
+    asm volatile (
+        "mfsrin %0, %1\n"
+        : "=r" (vsid)
+        : "r" (vaddr)
+    );
+    /* Primary hash (xor) */
+    uint32_t h = 0;
+    uint32_t hash = vsid ^ page;
+    uint32_t base = (hash & 0x3ff) << 3;
+    uint32_t i;
+    bool found = false;
+    /* Find unused or colliding
+       PTE in PTEG */
+    for (i = 0; i < 8; i++) {
+        if ((!phte[base + i].v) || ((phte[base + i].vsid == vsid) && (phte[base + i].api == api))) {
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        /* Secondary hash (not) */
+        uint32_t base2 = (~hash & 0x3ff) << 3;
+        /* Find unused or colliding
+           PTE in PTEG */
+        for (i = 0; i < 8; i++) {
+            if ((!phte[base2 + i].v) || ((phte[base2 + i].vsid == vsid) && (phte[base2 + i].api == api))) {
+                found = true;
+                base = base2;
+                h = 1;
+                break;
+            }
+        }
+        if (!found) {
+            // TODO: A/C precedence groups
+            i = page % 8;
+        }
+    }
+    phte[base + i].v = 1;
+    phte[base + i].vsid = vsid;
+    phte[base + i].h = h;
+    phte[base + i].api = api;
+    phte[base + i].rpn = pfn;
+    phte[base + i].r = 0;
+    phte[base + i].c = 0;
+    phte[base + i].pp = 2; // FIXME
+}
+/** Process Instruction/Data Storage Interrupt
+ *
+ * @param data   True if Data Storage Interrupt.
+ * @param istate Interrupted register context.
+ *
+ */
+void pht_refill(bool data, istate_t *istate)
+{
+    uintptr_t badvaddr;
+    pte_t *pte;
+    int pfrc;
+    as_t *as;
+    bool lock;
+    if (AS == NULL) {
+        as = AS_KERNEL;
+        lock = false;
+    } else {
+        as = AS;
+        lock = true;
+    }
+    if (data) {
+        asm volatile (
+            "mfdar %0\n"
+            : "=r" (badvaddr)
+        );
+    } else
+        badvaddr = istate->pc;
+    page_table_lock(as, lock);
+    pte = find_mapping_and_check(as, lock, badvaddr, PF_ACCESS_READ /* FIXME */, istate, &pfrc);
+    if (!pte) {
+        switch (pfrc) {
+            case AS_PF_FAULT:
+                goto fail;
+                break;
+            case AS_PF_DEFER:
+                /*
+                 * The page fault came during copy_from_uspace()
+                 * or copy_to_uspace().
+                 */
+                page_table_unlock(as, lock);
+                return;
+            default:
+                panic("Unexpected pfrc (%d).", pfrc);
+        }
+    }
+    pte->a = 1; /* Record access to PTE */
+    pht_insert(badvaddr, pte->pfn);
+    page_table_unlock(as, lock);
+    return;
+fail:
+    page_table_unlock(as, lock);
+    pht_refill_fail(badvaddr, istate);
+}
+void pht_init(void)
+{
+    memsetb(phte, 1 << PHT_BITS, 0);
+}
+void page_arch_init(void)
+{
+    if (config.cpu_active == 1) {
+        page_mapping_operations = &pt_mapping_operations;
+        uintptr_t cur;
+        int flags;
+        for (cur = 128 << 20; cur < last_frame; cur += FRAME_SIZE) {
+            flags = PAGE_CACHEABLE | PAGE_WRITE;
+            if ((PA2KA(cur) >= config.base) && (PA2KA(cur) < config.base + config.kernel_size))
+                flags |= PAGE_GLOBAL;
+            page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
+        }
+        /* Allocate page hash table */
+        phte_t *physical_phte = (phte_t *) frame_alloc(PHT_ORDER, FRAME_KA | FRAME_ATOMIC);
+        ASSERT((uintptr_t) physical_phte % (1 << PHT_BITS) == 0);
+        pht_init();
+        asm volatile (
+            "mtsdr1 %0\n"
+            :
+            : "r" ((uintptr_t) physical_phte)
+        );
+    }
+}
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
+{
+    if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
+        panic("Unable to map physical memory %p (%" PRIs " bytes).", physaddr, size)
+    uintptr_t virtaddr = PA2KA(last_frame);
+    pfn_t i;
+    for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
+        page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
+    last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
+    return virtaddr;
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/mm/frame.c
 ,0 → 1,84
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/boot.h>
+#include <arch/mm/frame.h>
+#include <mm/frame.h>
+#include <align.h>
+#include <macros.h>
+#include <print.h>
+uintptr_t last_frame = 0;
+void physmem_print(void)
+{
+    unsigned int i;
+    printf("Base       Size\n");
+    printf("---------- ----------\n");
+    for (i = 0; i < bootinfo.memmap.count; i++) {
+        printf("%#10x %#10x\n", bootinfo.memmap.zones[i].start,
+            bootinfo.memmap.zones[i].size);
+    }
+}
+void frame_arch_init(void)
+{
+    pfn_t minconf = 2;
+    count_t i;
+    pfn_t start, conf;
+    size_t size;
+    for (i = 0; i < bootinfo.memmap.count; i++) {
+        start = ADDR2PFN(ALIGN_UP(bootinfo.memmap.zones[i].start, FRAME_SIZE));
+        size = SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, FRAME_SIZE));
+        if ((minconf < start) || (minconf >= start + size))
+            conf = start;
+        else
+            conf = minconf;
+        zone_create(start, size, conf, 0);
+        if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
+            last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
+    }
+    /* First is exception vector, second is 'implementation specific', third and fourth is reserved */
+    frame_mark_unavailable(0, 4);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/mm/as.c
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 ppc64mm
+  * @{
+ */
+/** @file
+ */
+#include <arch/mm/as.h>
+#include <genarch/mm/page_pt.h>
+/** Architecture dependent address space init. */
+void as_arch_init(void)
+{
+    as_operations = &as_pt_operations;
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/ppc64.c
 ,0 → 1,144
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#include <arch.h>
+#include <arch/boot/boot.h>
+#include <arch/interrupt.h>
+#include <genarch/fb/fb.h>
+#include <genarch/fb/visuals.h>
+#include <userspace.h>
+#include <proc/uarg.h>
+#include <console/console.h>
+bootinfo_t bootinfo;
+void arch_pre_main(void)
+{
+    /* Setup usermode */
+    init.cnt = bootinfo.taskmap.count;
+    uint32_t i;
+    for (i = 0; i < bootinfo.taskmap.count; i++) {
+        init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
+        init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+    }
+}
+void arch_pre_mm_init(void)
+{
+    /* Initialize dispatch table */
+    interrupt_init();
+    /* Start decrementer */
+    start_decrementer();
+}
+void arch_post_mm_init(void)
+{
+    if (config.cpu_active == 1) {
+        /* Initialize framebuffer */
+        unsigned int visual;
+        switch (bootinfo.screen.bpp) {
+        case 8:
+            visual = VISUAL_INDIRECT_8;
+            break;
+        case 16:
+            visual = VISUAL_RGB_5_5_5;
+            break;
+        case 24:
+            visual = VISUAL_RGB_8_8_8;
+            break;
+        case 32:
+            visual = VISUAL_RGB_0_8_8_8;
+            break;
+        default:
+            panic("Unsupported bits per pixel.");
+        }
+        fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.scanline, visual);
+        /* Merge all zones to 1 big zone */
+        zone_merge_all();
+    }
+}
+void arch_post_cpu_init(void)
+{
+}
+void arch_pre_smp_init(void)
+{
+}
+void arch_post_smp_init(void)
+{
+}
+void calibrate_delay_loop(void)
+{
+}
+void userspace(uspace_arg_t *kernel_uarg)
+{
+    userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry);
+    /* Unreachable */
+    for (;;)
+        ;
+}
+/** Acquire console back for kernel
+ *
+ */
+void arch_grab_console(void)
+{
+}
+/** Return console to userspace
+ *
+ */
+void arch_release_console(void)
+{
+}
+void arch_reboot(void)
+{
+    // TODO
+    while (1);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/asm.S
 ,0 → 1,315
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include <arch/asm/regname.h>
+.text
+.global userspace_asm
+.global iret
+.global iret_syscall
+.global memsetb
+.global memcpy
+.global memcpy_from_uspace
+.global memcpy_to_uspace
+.global memcpy_from_uspace_failover_address
+.global memcpy_to_uspace_failover_address
+userspace_asm:
+    # r3 = uspace_uarg
+    # r4 = stack
+    # r5 = entry
+    # disable interrupts
+    mfmsr r31
+    rlwinm r31, r31, 0, 17, 15
+    mtmsr r31
+    # set entry point
+    mtsrr0 r5
+    # set problem state, enable interrupts
+    ori r31, r31, msr_pr
+    ori r31, r31, msr_ee
+    mtsrr1 r31
+    # set stack
+    mr sp, r4
+    # %r3 is defined to hold pcb_ptr - set it to 0
+    xor r3, r3, r3
+    # jump to userspace
+    rfi
+iret:
+    # disable interrupts
+    mfmsr r31
+    rlwinm r31, r31, 0, 17, 15
+    mtmsr r31
+    lwz r0, 8(sp)
+    lwz r2, 12(sp)
+    lwz r3, 16(sp)
+    lwz r4, 20(sp)
+    lwz r5, 24(sp)
+    lwz r6, 28(sp)
+    lwz r7, 32(sp)
+    lwz r8, 36(sp)
+    lwz r9, 40(sp)
+    lwz r10, 44(sp)
+    lwz r11, 48(sp)
+    lwz r13, 52(sp)
+    lwz r14, 56(sp)
+    lwz r15, 60(sp)
+    lwz r16, 64(sp)
+    lwz r17, 68(sp)
+    lwz r18, 72(sp)
+    lwz r19, 76(sp)
+    lwz r20, 80(sp)
+    lwz r21, 84(sp)
+    lwz r22, 88(sp)
+    lwz r23, 92(sp)
+    lwz r24, 96(sp)
+    lwz r25, 100(sp)
+    lwz r26, 104(sp)
+    lwz r27, 108(sp)
+    lwz r28, 112(sp)
+    lwz r29, 116(sp)
+    lwz r30, 120(sp)
+    lwz r31, 124(sp)
+    lwz r12, 128(sp)
+    mtcr r12
+    lwz r12, 132(sp)
+    mtsrr0 r12
+    lwz r12, 136(sp)
+    mtsrr1 r12
+    lwz r12, 140(sp)
+    mtlr r12
+    lwz r12, 144(sp)
+    mtctr r12
+    lwz r12, 148(sp)
+    mtxer r12
+    lwz r12, 152(sp)
+    lwz sp, 156(sp)
+    rfi
+iret_syscall:
+    # reset decrementer
+    li r31, 1000
+    mtdec r31
+    # disable interrupts
+    mfmsr r31
+    rlwinm r31, r31, 0, 17, 15
+    mtmsr r31
+    lwz r0, 8(sp)
+    lwz r2, 12(sp)
+    lwz r4, 20(sp)
+    lwz r5, 24(sp)
+    lwz r6, 28(sp)
+    lwz r7, 32(sp)
+    lwz r8, 36(sp)
+    lwz r9, 40(sp)
+    lwz r10, 44(sp)
+    lwz r11, 48(sp)
+    lwz r13, 52(sp)
+    lwz r14, 56(sp)
+    lwz r15, 60(sp)
+    lwz r16, 64(sp)
+    lwz r17, 68(sp)
+    lwz r18, 72(sp)
+    lwz r19, 76(sp)
+    lwz r20, 80(sp)
+    lwz r21, 84(sp)
+    lwz r22, 88(sp)
+    lwz r23, 92(sp)
+    lwz r24, 96(sp)
+    lwz r25, 100(sp)
+    lwz r26, 104(sp)
+    lwz r27, 108(sp)
+    lwz r28, 112(sp)
+    lwz r29, 116(sp)
+    lwz r30, 120(sp)
+    lwz r31, 124(sp)
+    lwz r12, 128(sp)
+    mtcr r12
+    lwz r12, 132(sp)
+    mtsrr0 r12
+    lwz r12, 136(sp)
+    mtsrr1 r12
+    lwz r12, 140(sp)
+    mtlr r12
+    lwz r12, 144(sp)
+    mtctr r12
+    lwz r12, 148(sp)
+    mtxer r12
+    lwz r12, 152(sp)
+    lwz sp, 156(sp)
+    rfi
+memsetb:
+    rlwimi r5, r5, 8, 16, 23
+    rlwimi r5, r5, 16, 0, 15
+    addi r14, r3, -4
+    cmplwi 0, r4, 4
+    blt 7f
+    stwu r5, 4(r14)
+    beqlr
+    andi. r15, r14, 3
+    add r4, r15, r4
+    subf r14, r15, r14
+    srwi r15, r4, 2
+    mtctr r15
+    bdz 6f
+:
+        stwu r5, 4(r14)
+        bdnz 1b
+:
+    andi. r4, r4, 3
+:
+    cmpwi 0, r4, 0
+    beqlr
+    mtctr r4
+    addi r6, r6, 3
+:
+    stbu r5, 1(r14)
+    bdnz 8b
+    blr
+memcpy:
+memcpy_from_uspace:
+memcpy_to_uspace:
+    srwi. r7, r5, 3
+    addi r6, r3, -4
+    addi r4, r4, -4
+    beq 2f
+    andi. r0, r6, 3
+    mtctr r7
+    bne 5f
+:
+    lwz r7, 4(r4)
+    lwzu r8, 8(r4)
+    stw r7, 4(r6)
+    stwu r8, 8(r6)
+    bdnz 1b
+    andi. r5, r5, 7
+:
+    cmplwi 0, r5, 4
+    blt 3f
+    lwzu r0, 4(r4)
+    addi r5, r5, -4
+    stwu r0, 4(r6)
+:
+    cmpwi 0, r5, 0
+    beqlr
+    mtctr r5
+    addi r4, r4, 3
+    addi r6, r6, 3
+:
+    lbzu r0, 1(r4)
+    stbu r0, 1(r6)
+    bdnz 4b
+    blr
+:
+    subfic r0, r0, 4
+    mtctr r0
+:
+    lbz r7, 4(r4)
+    addi r4, r4, 1
+    stb r7, 4(r6)
+    addi r6, r6, 1
+    bdnz 6b
+    subf r5, r0, r5
+    rlwinm. r7, r5, 32-3, 3, 31
+    beq 2b
+    mtctr r7
+    b 1b
+memcpy_from_uspace_failover_address:
+memcpy_to_uspace_failover_address:
+    b memcpy_from_uspace_failover_address

 /branches/dynload/kernel/arch/ppc64/src/cpu/cpu.c
 ,0 → 1,60
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#include <arch/cpu.h>
+#include <arch/cpuid.h>
+#include <cpu.h>
+#include <arch.h>
+#include <print.h>
+void cpu_arch_init(void)
+{
+}
+void cpu_identify(void)
+{
+    cpu_info_t info;
+    cpu_version(&info);
+    CPU->arch.version = info.version;
+    CPU->arch.revision = info.revision;
+}
+void cpu_print_report(cpu_t *m)
+{
+    printf("cpu%u: version=%d, revision=%d\n", m->id, m->arch.version, m->arch.revision);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/interrupt.c
 ,0 → 1,108
+/*
+ * 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.
+ */
+/** @addtogroup ppc64interrupt
+ * @{
+ */
+/** @file
+ */
+#include <ddi/irq.h>
+#include <interrupt.h>
+#include <arch/interrupt.h>
+#include <arch/types.h>
+#include <arch.h>
+#include <time/clock.h>
+#include <ipc/sysipc.h>
+#include <arch/drivers/pic.h>
+#include <arch/mm/tlb.h>
+#include <print.h>
+void start_decrementer(void)
+{
+    asm volatile (
+        "mtdec %0\n"
+        :
+        : "r" (1000)
+    );
+}
+/** Handler of external interrupts */
+static void exception_external(int n, istate_t *istate)
+{
+    int inum;
+    while ((inum = pic_get_pending()) != -1) {
+        bool ack = false;
+        irq_t *irq = irq_dispatch_and_lock(inum);
+        if (irq) {
+            /*
+             * The IRQ handler was found.
+             */
+            if (irq->preack) {
+                /* Acknowledge the interrupt before processing */
+                pic_ack_interrupt(inum);
+                ack = true;
+            }
+            irq->handler(irq, irq->arg);
+            spinlock_unlock(&irq->lock);
+        } else {
+            /*
+             * Spurious interrupt.
+             */
+#ifdef CONFIG_DEBUG
+            printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, inum);
+#endif
+        }
+        if (!ack)
+            pic_ack_interrupt(inum);
+    }
+}
+static void exception_decrementer(int n, istate_t *istate)
+{
+    clock();
+    start_decrementer();
+}
+/* Initialize basic tables for exception dispatching */
+void interrupt_init(void)
+{
+    exc_register(VECTOR_EXTERNAL, "external", exception_external);
+    exc_register(VECTOR_DECREMENTER, "timer", exception_decrementer);
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/context.S
 ,0 → 1,61
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include <arch/asm/regname.h>
+#include <arch/context_offset.h>
+.text
+.global context_save_arch
+.global context_restore_arch
+context_save_arch:
+    CONTEXT_SAVE_ARCH_CORE r3
+    mflr r4
+    stw r4, OFFSET_PC(r3)
+    mfcr r4
+    stw r4, OFFSET_CR(r3)
+    # context_save returns 1
+    li r3, 1
+    blr
+context_restore_arch:
+    CONTEXT_RESTORE_ARCH_CORE r3
+    lwz r4, OFFSET_CR(r3)
+    mtcr r4
+    lwz r4, OFFSET_PC(r3)
+    mtlr r4
+    # context_restore returns 0
+    li r3, 0
+    blr

 /branches/dynload/kernel/arch/ppc64/src/ddi/ddi.c
 ,0 → 1,55
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 ppc64ddi
+ * @{
+ */
+/** @file
+ */
+#include <ddi/ddi.h>
+#include <proc/task.h>
+#include <arch/types.h>
+/** Enable I/O space range for task.
+ *
+ * Interrupts are disabled and task is locked.
+ *
+ * @param task Task.
+ * @param ioaddr Startign I/O space address.
+ * @param size Size of the enabled I/O range.
+ *
+ * @return 0 on success or an error code from errno.h.
+ */
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
+{
+    return 0;
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/drivers/pic.c
 ,0 → 1,94
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * 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 ppc64
+ * @{
+ */
+/** @file
+ */
+#include <arch/drivers/pic.h>
+#include <mm/page.h>
+#include <byteorder.h>
+#include <bitops.h>
+static volatile uint32_t *pic;
+void pic_init(uintptr_t base, size_t size)
+{
+    pic = (uint32_t *) hw_map(base, size);
+}
+void pic_enable_interrupt(int intnum)
+{
+    if (intnum < 32) {
+        pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum);
+    } else {
+        pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32));
+    }
+}
+void pic_disable_interrupt(int intnum)
+{
+    if (intnum < 32) {
+        pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum));
+    } else {
+        pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32)));
+    }
+}
+void pic_ack_interrupt(int intnum)
+{
+    if (intnum < 32)
+        pic[PIC_ACK_LOW] = 1 << intnum;
+    else
+        pic[PIC_ACK_HIGH] = 1 << (intnum - 32);
+}
+/** Return number of pending interrupt */
+int pic_get_pending(void)
+{
+    int pending;
+    pending = pic[PIC_PENDING_LOW];
+    if (pending)
+        return fnzb32(pending);
+    pending = pic[PIC_PENDING_HIGH];
+    if (pending)
+        return fnzb32(pending) + 32;
+    return -1;
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/exception.S
 ,0 → 1,237
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include <arch/asm/regname.h>
+#include <arch/mm/page.h>
+.section K_UNMAPPED_TEXT_START, "ax"
+.macro CONTEXT_STORE
+    # save R12 in SPRG1, backup CR in R12
+    # save SP in SPRG2
+    mtsprg1 r12
+    mfcr r12
+    mtsprg2 sp
+    # check whether SP is in kernel
+    andis. sp, sp, 0x8000
+    bne 1f
+        # stack is in user-space
+        mfsprg0 sp
+    b 2f
+:
+        # stack is in kernel
+        mfsprg2 sp
+        subis sp, sp, 0x8000
+:
+    subi sp, sp, 160
+    stw r0, 8(sp)
+    stw r2, 12(sp)
+    stw r3, 16(sp)
+    stw r4, 20(sp)
+    stw r5, 24(sp)
+    stw r6, 28(sp)
+    stw r7, 32(sp)
+    stw r8, 36(sp)
+    stw r9, 40(sp)
+    stw r10, 44(sp)
+    stw r11, 48(sp)
+    stw r13, 52(sp)
+    stw r14, 56(sp)
+    stw r15, 60(sp)
+    stw r16, 64(sp)
+    stw r17, 68(sp)
+    stw r18, 72(sp)
+    stw r19, 76(sp)
+    stw r20, 80(sp)
+    stw r21, 84(sp)
+    stw r22, 88(sp)
+    stw r23, 92(sp)
+    stw r24, 96(sp)
+    stw r25, 100(sp)
+    stw r26, 104(sp)
+    stw r27, 108(sp)
+    stw r28, 112(sp)
+    stw r29, 116(sp)
+    stw r30, 120(sp)
+    stw r31, 124(sp)
+    stw r12, 128(sp)
+    mfsrr0 r12
+    stw r12, 132(sp)
+    mfsrr1 r12
+    stw r12, 136(sp)
+    mflr r12
+    stw r12, 140(sp)
+    mfctr r12
+    stw r12, 144(sp)
+    mfxer r12
+    stw r12, 148(sp)
+    mfsprg1 r12
+    stw r12, 152(sp)
+    mfsprg2 r12
+    stw r12, 156(sp)
+.endm
+.org 0x060
+jump_to_kernel:
+    lis r12, iret@ha
+    addi r12, r12, iret@l
+    mtlr r12
+    mfmsr r12
+    ori r12, r12, (msr_ir | msr_dr)@l
+    mtsrr1 r12
+    addis sp, sp, 0x8000
+    mr r4, sp
+    addi r4, r4, 8
+    rfi
+jump_to_kernel_syscall:
+    lis r12, syscall_handler@ha
+    addi r12, r12, syscall_handler@l
+    mtsrr0 r12
+    lis r12, iret_syscall@ha
+    addi r12, r12, iret_syscall@l
+    mtlr r12
+    mfmsr r12
+    ori r12, r12, (msr_ir | msr_dr)@l
+    mtsrr1 r12
+    addis sp, sp, 0x8000
+    rfi
+.org 0x100
+.global exc_system_reset
+exc_system_reset:
+    b exc_system_reset
+.org 0x200
+.global exc_machine_check
+exc_machine_check:
+    b exc_machine_check
+.org 0x300
+.global exc_data_storage
+exc_data_storage:
+    CONTEXT_STORE
+    lis r12, pht_refill@ha
+    addi r12, r12, pht_refill@l
+    mtsrr0 r12
+    li r3, 1
+    b jump_to_kernel
+.org 0x400
+.global exc_instruction_storage
+exc_instruction_storage:
+    CONTEXT_STORE
+    lis r12, pht_refill@ha
+    addi r12, r12, pht_refill@l
+    mtsrr0 r12
+    li r3, 0
+    b jump_to_kernel
+.org 0x500
+.global exc_external
+exc_external:
+    b exc_external
+.org 0x600
+.global exc_alignment
+exc_alignment:
+    b exc_alignment
+.org 0x700
+.global exc_program
+exc_program:
+    b exc_program
+.org 0x800
+.global exc_fp_unavailable
+exc_fp_unavailable:
+    b exc_fp_unavailable
+.org 0x900
+.global exc_decrementer
+exc_decrementer:
+    CONTEXT_STORE
+    lis r12, exc_dispatch@ha
+    addi r12, r12, exc_dispatch@l
+    mtsrr0 r12
+    li r3, 10
+    b jump_to_kernel
+.org 0xa00
+.global exc_reserved0
+exc_reserved0:
+    b exc_reserved0
+.org 0xb00
+.global exc_reserved1
+exc_reserved1:
+    b exc_reserved1
+.org 0xc00
+.global exc_syscall
+exc_syscall:
+    CONTEXT_STORE
+    b jump_to_kernel_syscall
+.org 0xd00
+.global exc_trace
+exc_trace:
+    b exc_trace

 /branches/dynload/kernel/arch/ppc64/src/fpu_context.S
 ,0 → 1,105
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include <arch/asm/regname.h>
+#include <arch/context_offset.h>
+.text
+.global fpu_context_save
+.global fpu_context_restore
+.global fpu_init
+.global fpu_enable
+.global fpu_disable
+.macro FPU_CONTEXT_STORE r
+    stfd fr14, OFFSET_FR14(\r)
+    stfd fr15, OFFSET_FR15(\r)
+    stfd fr16, OFFSET_FR16(\r)
+    stfd fr17, OFFSET_FR17(\r)
+    stfd fr18, OFFSET_FR18(\r)
+    stfd fr19, OFFSET_FR19(\r)
+    stfd fr20, OFFSET_FR20(\r)
+    stfd fr21, OFFSET_FR21(\r)
+    stfd fr22, OFFSET_FR22(\r)
+    stfd fr23, OFFSET_FR23(\r)
+    stfd fr24, OFFSET_FR24(\r)
+    stfd fr25, OFFSET_FR25(\r)
+    stfd fr26, OFFSET_FR26(\r)
+    stfd fr27, OFFSET_FR27(\r)
+    stfd fr28, OFFSET_FR28(\r)
+    stfd fr29, OFFSET_FR29(\r)
+    stfd fr30, OFFSET_FR30(\r)
+    stfd fr31, OFFSET_FR31(\r)
+.endm
+.macro FPU_CONTEXT_LOAD r
+    lfd fr14, OFFSET_FR14(\r)
+    lfd fr15, OFFSET_FR15(\r)
+    lfd fr16, OFFSET_FR16(\r)
+    lfd fr17, OFFSET_FR17(\r)
+    lfd fr18, OFFSET_FR18(\r)
+    lfd fr19, OFFSET_FR19(\r)
+    lfd fr20, OFFSET_FR20(\r)
+    lfd fr21, OFFSET_FR21(\r)
+    lfd fr22, OFFSET_FR22(\r)
+    lfd fr23, OFFSET_FR23(\r)
+    lfd fr24, OFFSET_FR24(\r)
+    lfd fr25, OFFSET_FR25(\r)
+    lfd fr26, OFFSET_FR26(\r)
+    lfd fr27, OFFSET_FR27(\r)
+    lfd fr28, OFFSET_FR28(\r)
+    lfd fr29, OFFSET_FR29(\r)
+    lfd fr30, OFFSET_FR30(\r)
+    lfd fr31, OFFSET_FR31(\r)
+.endm
+fpu_context_save:
+//  FPU_CONTEXT_STORE r3
+//
+//  mffs fr0
+//  stfd fr0, OFFSET_FPSCR(r3)
+    blr
+fpu_context_restore:
+//  FPU_CONTEXT_LOAD r3
+//
+//  lfd fr0, OFFSET_FPSCR(r3)
+//  mtfsf 7, fr0
+    blr
+fpu_init:
+    blr
+fpu_enable:
+    blr
+fpu_disable:
+    blr

 /branches/dynload/kernel/arch/ppc64/src/boot/boot.S
 ,0 → 1,81
+#
+# Copyright (c) 2005 Jakub Jermar
+# 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 <arch/asm/regname.h>
+#include <arch/boot/boot.h>
+.section K_TEXT_START, "ax"
+.global kernel_image_start
+kernel_image_start:
+    # load temporal kernel stack
+    lis sp, kernel_stack@ha
+    addi sp, sp, kernel_stack@l
+    # set kernel stack for interrupt handling
+    mr r31, sp
+    subis r31, r31, 0x8000
+    mtsprg0 r31
+    # r3 contains physical address of bootinfo_t
+    # r4 contains size of bootinfo_t
+    addis r3, r3, 0x8000
+    lis r31, bootinfo@ha
+    addi r31, r31, bootinfo@l  # r31 = bootinfo
+    cmpwi r4, 0
+    beq bootinfo_end
+    bootinfo_loop:
+        lwz r30, 0(r3)
+        stw r30, 0(r31)
+        addi r3, r3, 4
+        addi r31, r31, 4
+        subi r4, r4, 4
+        cmpwi r4, 0
+        bgt bootinfo_loop
+    bootinfo_end:
+    bl arch_pre_main
+    b main_bsp
+.section K_DATA_START, "aw", @progbits
+.align 12
+kernel_stack_bottom:
+    .space TEMP_STACK_SIZE
+kernel_stack:

 /branches/dynload/kernel/arch/ppc64/src/proc/scheduler.c
 ,0 → 1,63
+/*
+ * 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.
+ */
+/** @addtogroup ppc64proc
+ * @{
+ */
+/** @file
+ */
+#include <arch/mm/page.h>
+#include <arch/boot/boot.h>
+#include <proc/scheduler.h>
+#include <proc/thread.h>
+#include <arch.h>
+/** Perform ppc64 specific tasks needed before the new task is run. */
+void before_task_runs_arch(void)
+{
+}
+/** Perform ppc64 specific tasks needed before the new thread is scheduled. */
+void before_thread_runs_arch(void)
+{
+    pht_init();
+    tlb_invalidate_all();
+    asm volatile (
+        "mtsprg0 %0\n"
+        :
+        : "r" (KA2PA(&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]))
+    );
+}
+void after_thread_ran_arch(void)
+{
+}
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/src/debug/panic.s
 ,0 → 1,38
+#
+# Copyright (c) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include <arch/asm/macro.h>
+.text
+.global panic_printf
+panic_printf:
+    lis %r14, halt@ha
+    addi %r14, %r14, halt@l
+    mtlr %r14   # fake stack to make printf return to halt
+    b printf

 /branches/dynload/kernel/arch/ppc64/src/dummy.s
 ,0 → 1,38
+#
+# Copyright (c) 2005 Jakub Jermar
+# 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.
+#
+.text
+.global asm_delay_loop
+.global sys_tls_set
+sys_tls_set:
+    b sys_tls_set
+asm_delay_loop:
+    blr

 /branches/dynload/kernel/arch/ppc64/include/exception.h
 ,0 → 1,102
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_EXCEPTION_H_
+#define KERN_ppc64_EXCEPTION_H_
+#include <arch/types.h>
+typedef struct {
+    uint64_t r0;
+    uint64_t r2;
+    uint64_t r3;
+    uint64_t r4;
+    uint64_t r5;
+    uint64_t r6;
+    uint64_t r7;
+    uint64_t r8;
+    uint64_t r9;
+    uint64_t r10;
+    uint64_t r11;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t r16;
+    uint64_t r17;
+    uint64_t r18;
+    uint64_t r19;
+    uint64_t r20;
+    uint64_t r21;
+    uint64_t r22;
+    uint64_t r23;
+    uint64_t r24;
+    uint64_t r25;
+    uint64_t r26;
+    uint64_t r27;
+    uint64_t r28;
+    uint64_t r29;
+    uint64_t r30;
+    uint64_t r31;
+    uint64_t cr;
+    uint64_t pc;
+    uint64_t srr1;
+    uint64_t lr;
+    uint64_t ctr;
+    uint64_t xer;
+    uint64_t r12;
+    uint64_t sp;
+} istate_t;
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
+{
+    istate->pc = retaddr;
+}
+/** Return true if exception happened while in userspace */
+#include <panic.h>
+static inline int istate_from_uspace(istate_t *istate)
+{
+    panic("istate_from_uspace not yet implemented.");
+    return 0;
+}
+static inline unative_t istate_get_pc(istate_t *istate)
+{
+    return istate->pc;
+}
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/mm/page.h
 ,0 → 1,184
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_PAGE_H_
+#define KERN_ppc64_PAGE_H_
+#include <arch/mm/frame.h>
+#define PAGE_WIDTH  FRAME_WIDTH
+#define PAGE_SIZE   FRAME_SIZE
+#ifdef KERNEL
+#ifndef __ASM__
+#   define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
+#   define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
+#else
+#   define KA2PA(x) ((x) - 0x80000000)
+#   define PA2KA(x) ((x) + 0x80000000)
+#endif
+/*
+ * Implementation of generic 4-level page table interface,
+ * the hardware Page Hash Table is used as cache.
+ *
+ * Page table layout:
+ * - 32-bit virtual addressess
+ * - Offset is 12 bits => pages are 4K long
+ * - PTL0 has 1024 entries (10 bits)
+ * - PTL1 is not used
+ * - PTL2 is not used
+ * - PLT3 has 1024 entries (10 bits)
+ */
+/* Number of entries in each level. */
+#define PTL0_ENTRIES_ARCH   1024
+#define PTL1_ENTRIES_ARCH   0
+#define PTL2_ENTRIES_ARCH   0
+#define PTL3_ENTRIES_ARCH   1024
+/* Sizes of page tables in each level. */
+#define PTL0_SIZE_ARCH      ONE_FRAME
+#define PTL1_SIZE_ARCH      0
+#define PTL2_SIZE_ARCH      0
+#define PTL3_SIZE_ARCH      ONE_FRAME
+/* Macros calculating indices into page tables in each level. */
+#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ff)
+#define PTL1_INDEX_ARCH(vaddr)  0
+#define PTL2_INDEX_ARCH(vaddr)  0
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
+/* Get PTE address accessors for each level. */
+#define GET_PTL1_ADDRESS_ARCH(ptl0, i) \
+    (((pte_t *) (ptl0))[(i)].pfn << 12)
+#define GET_PTL2_ADDRESS_ARCH(ptl1, i) \
+    (ptl1)
+#define GET_PTL3_ADDRESS_ARCH(ptl2, i) \
+    (ptl2)
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i) \
+    (((pte_t *) (ptl3))[(i)].pfn << 12)
+/* Set PTE address accessors for each level. */
+#define SET_PTL0_ADDRESS_ARCH(ptl0)
+#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) \
+    (((pte_t *) (ptl0))[(i)].pfn = (a) >> 12)
+#define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
+#define SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
+#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) \
+    (((pte_t *) (ptl3))[(i)].pfn = (a) >> 12)
+/* Get PTE flags accessors for each level. */
+#define GET_PTL1_FLAGS_ARCH(ptl0, i) \
+    get_pt_flags((pte_t *) (ptl0), (index_t) (i))
+#define GET_PTL2_FLAGS_ARCH(ptl1, i) \
+    PAGE_PRESENT
+#define GET_PTL3_FLAGS_ARCH(ptl2, i) \
+    PAGE_PRESENT
+#define GET_FRAME_FLAGS_ARCH(ptl3, i) \
+    get_pt_flags((pte_t *) (ptl3), (index_t) (i))
+/* Set PTE flags accessors for each level. */
+#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \
+    set_pt_flags((pte_t *) (ptl0), (index_t) (i), (x))
+#define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
+#define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
+#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
+    set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
+/* Macros for querying the last-level PTEs. */
+#define PTE_VALID_ARCH(pte)         (*((uint32_t *) (pte)) != 0)
+#define PTE_PRESENT_ARCH(pte)           ((pte)->p != 0)
+#define PTE_GET_FRAME_ARCH(pte)         ((uintptr_t) ((pte)->pfn << 12))
+#define PTE_WRITABLE_ARCH(pte)          1
+#define PTE_EXECUTABLE_ARCH(pte)        1
+#ifndef __ASM__
+#include <mm/mm.h>
+#include <arch/interrupt.h>
+static inline int get_pt_flags(pte_t *pt, index_t i)
+{
+    pte_t *p = &pt[i];
+    return ((1 << PAGE_CACHEABLE_SHIFT) |
+        ((!p->p) << PAGE_PRESENT_SHIFT) |
+        (1 << PAGE_USER_SHIFT) |
+        (1 << PAGE_READ_SHIFT) |
+        (1 << PAGE_WRITE_SHIFT) |
+        (1 << PAGE_EXEC_SHIFT) |
+        (p->g << PAGE_GLOBAL_SHIFT));
+}
+static inline void set_pt_flags(pte_t *pt, index_t i, int flags)
+{
+    pte_t *p = &pt[i];
+    p->p = !(flags & PAGE_NOT_PRESENT);
+    p->g = (flags & PAGE_GLOBAL) != 0;
+    p->valid = 1;
+}
+extern void page_arch_init(void);
+#define PHT_BITS    16
+#define PHT_ORDER   4
+typedef struct {
+    unsigned v : 1;          /**< Valid */
+    unsigned vsid : 24;      /**< Virtual Segment ID */
+    unsigned h : 1;          /**< Primary/secondary hash */
+    unsigned api : 6;        /**< Abbreviated Page Index */
+    unsigned rpn : 20;       /**< Real Page Number */
+    unsigned reserved0 : 3;
+    unsigned r : 1;          /**< Reference */
+    unsigned c : 1;          /**< Change */
+    unsigned wimg : 4;       /**< Access control */
+    unsigned reserved1 : 1;
+    unsigned pp : 2;         /**< Page protection */
+} phte_t;
+extern void pht_refill(bool data, istate_t *istate);
+extern void pht_init(void);
+#endif /* __ASM__ */
+#endif /* KERNEL */
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/mm/frame.h
 ,0 → 1,57
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_FRAME_H_
+#define KERN_ppc64_FRAME_H_
+#define FRAME_WIDTH     12  /* 4K */
+#define FRAME_SIZE      (1 << FRAME_WIDTH)
+#ifdef KERNEL
+#ifndef __ASM__
+#include <arch/types.h>
+extern uintptr_t last_frame;
+extern void frame_arch_init(void);
+extern void physmem_print(void);
+#endif /* __ASM__ */
+#endif /* KERNEL */
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/mm/as.h
 ,0 → 1,64
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_AS_H_
+#define KERN_ppc64_AS_H_
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
+#define KERNEL_ADDRESS_SPACE_START_ARCH     ((unsigned long) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH       ((unsigned long) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH       ((unsigned long) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH     ((unsigned long) 0x7fffffff)
+#define USTACK_ADDRESS_ARCH (0x7fffffff - (PAGE_SIZE - 1))
+typedef struct {
+} as_arch_t;
+#include <genarch/mm/as_pt.h>
+#define as_constructor_arch(as, flags)      (as != as)
+#define as_destructor_arch(as)          (as != as)
+#define as_create_arch(as, flags)       (as != as)
+#define as_install_arch(as)
+#define as_deinstall_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
+extern void as_arch_init(void);
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/mm/asid.h
 ,0 → 1,48
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ppc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_ASID_H_
+#define KERN_ppc64_ASID_H_
+typedef int asid_t;
+#define ASID_MAX_ARCH       3
+#define asid_get()      (ASID_START+1)
+#define asid_put(asid)
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/mm/tlb.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ppc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_TLB_H_
+#define KERN_ppc64_TLB_H_
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/memstr.h
 ,0 → 1,48
+/*
+ * Copyright (c) 2005 Sergey Bondari
+ * 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 ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_MEMSTR_H_
+#define KERN_ppc64_MEMSTR_H_
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
+extern int memcmp(const void *a, const void *b, size_t cnt);
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/barrier.h
 ,0 → 1,51
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_BARRIER_H_
+#define KERN_ppc64_BARRIER_H_
+#define CS_ENTER_BARRIER()  asm volatile ("" ::: "memory")
+#define CS_LEAVE_BARRIER()  asm volatile ("" ::: "memory")
+#define memory_barrier()    asm volatile ("sync" ::: "memory")
+#define read_barrier()      asm volatile ("sync" ::: "memory")
+#define write_barrier()     asm volatile ("eieio" ::: "memory")
+#define smc_coherence(a)
+#define smc_coherence_block(a, l)
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/types.h
 ,0 → 1,72
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_TYPES_H_
+#define KERN_ppc64_TYPES_H_
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed long int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long uint64_t;
+typedef uint64_t size_t;
+typedef uint64_t count_t;
+typedef uint64_t index_t;
+typedef uint64_t uintptr_t;
+typedef uint64_t pfn_t;
+typedef uint64_t ipl_t;
+typedef uint64_t unative_t;
+typedef int64_t native_t;
+/** Page Table Entry. */
+typedef struct {
+    unsigned p : 1;       /**< Present bit. */
+    unsigned a : 1;       /**< Accessed bit. */
+    unsigned g : 1;       /**< Global bit. */
+    unsigned valid : 1;   /**< Valid content even if not present. */
+    unsigned pfn : 20;    /**< Physical frame number. */
+} pte_t;
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/context_offset.h
 ,0 → 1,132
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef KERN_ppc64_CONTEXT_OFFSET_H_
+#define KERN_ppc64_CONTEXT_OFFSET_H_
+#define OFFSET_SP    0x0
+#define OFFSET_PC    0x8
+#define OFFSET_R2    0x10
+#define OFFSET_R13   0x18
+#define OFFSET_R14   0x20
+#define OFFSET_R15   0x28
+#define OFFSET_R16   0x30
+#define OFFSET_R17   0x38
+#define OFFSET_R18   0x40
+#define OFFSET_R19   0x48
+#define OFFSET_R20   0x50
+#define OFFSET_R21   0x58
+#define OFFSET_R22   0x60
+#define OFFSET_R23   0x68
+#define OFFSET_R24   0x70
+#define OFFSET_R25   0x78
+#define OFFSET_R26   0x80
+#define OFFSET_R27   0x88
+#define OFFSET_R28   0x90
+#define OFFSET_R29   0x98
+#define OFFSET_R30   0xa0
+#define OFFSET_R31   0xa8
+#define OFFSET_CR    0xb0
+#define OFFSET_FR14  0x0
+#define OFFSET_FR15  0x8
+#define OFFSET_FR16  0x10
+#define OFFSET_FR17  0x18
+#define OFFSET_FR18  0x20
+#define OFFSET_FR19  0x28
+#define OFFSET_FR20  0x30
+#define OFFSET_FR21  0x38
+#define OFFSET_FR22  0x40
+#define OFFSET_FR23  0x48
+#define OFFSET_FR24  0x50
+#define OFFSET_FR25  0x58
+#define OFFSET_FR26  0x60
+#define OFFSET_FR27  0x68
+#define OFFSET_FR28  0x70
+#define OFFSET_FR29  0x78
+#define OFFSET_FR30  0x80
+#define OFFSET_FR31  0x88
+#define OFFSET_FPSCR 0x90
+#ifdef __ASM__
+# include <arch/asm/regname.h>
+# ctx: address of the structure with saved context
+.macro CONTEXT_SAVE_ARCH_CORE ctx:req
+    stw sp, OFFSET_SP(\ctx)
+    stw r2, OFFSET_R2(\ctx)
+    stw r13, OFFSET_R13(\ctx)
+    stw r14, OFFSET_R14(\ctx)
+    stw r15, OFFSET_R15(\ctx)
+    stw r16, OFFSET_R16(\ctx)
+    stw r17, OFFSET_R17(\ctx)
+    stw r18, OFFSET_R18(\ctx)
+    stw r19, OFFSET_R19(\ctx)
+    stw r20, OFFSET_R20(\ctx)
+    stw r21, OFFSET_R21(\ctx)
+    stw r22, OFFSET_R22(\ctx)
+    stw r23, OFFSET_R23(\ctx)
+    stw r24, OFFSET_R24(\ctx)
+    stw r25, OFFSET_R25(\ctx)
+    stw r26, OFFSET_R26(\ctx)
+    stw r27, OFFSET_R27(\ctx)
+    stw r28, OFFSET_R28(\ctx)
+    stw r29, OFFSET_R29(\ctx)
+    stw r30, OFFSET_R30(\ctx)
+    stw r31, OFFSET_R31(\ctx)
+.endm
+# ctx: address of the structure with saved context
+.macro CONTEXT_RESTORE_ARCH_CORE ctx:req
+    lwz sp, OFFSET_SP(\ctx)
+    lwz r2, OFFSET_R2(\ctx)
+    lwz r13, OFFSET_R13(\ctx)
+    lwz r14, OFFSET_R14(\ctx)
+    lwz r15, OFFSET_R15(\ctx)
+    lwz r16, OFFSET_R16(\ctx)
+    lwz r17, OFFSET_R17(\ctx)
+    lwz r18, OFFSET_R18(\ctx)
+    lwz r19, OFFSET_R19(\ctx)
+    lwz r20, OFFSET_R20(\ctx)
+    lwz r21, OFFSET_R21(\ctx)
+    lwz r22, OFFSET_R22(\ctx)
+    lwz r23, OFFSET_R23(\ctx)
+    lwz r24, OFFSET_R24(\ctx)
+    lwz r25, OFFSET_R25(\ctx)
+    lwz r26, OFFSET_R26(\ctx)
+    lwz r27, OFFSET_R27(\ctx)
+    lwz r28, OFFSET_R28(\ctx)
+    lwz r29, OFFSET_R29(\ctx)
+    lwz r30, OFFSET_R30(\ctx)
+    lwz r31, OFFSET_R31(\ctx)
+.endm
+#endif /* __ASM__ */
+#endif

 /branches/dynload/kernel/arch/ppc64/include/byteorder.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_BYTEORDER_H_
+#define KERN_ppc64_BYTEORDER_H_
+#define ARCH_IS_BIG_ENDIAN
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/cpu.h
 ,0 → 1,48
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_CPU_H_
+#define KERN_ppc64_CPU_H_
+#include <arch/asm.h>
+typedef struct {
+    int version;
+    int revision;
+} cpu_arch_t;
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/drivers/pic.h
 ,0 → 1,56
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * 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 ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_PIC_H_
+#define KERN_ppc64_PIC_H_
+#include <arch/types.h>
+#define PIC_PENDING_LOW    8
+#define PIC_PENDING_HIGH   4
+#define PIC_MASK_LOW       9
+#define PIC_MASK_HIGH      5
+#define PIC_ACK_LOW        10
+#define PIC_ACK_HIGH       6
+void pic_init(uintptr_t base, size_t size);
+void pic_enable_interrupt(int intnum);
+void pic_disable_interrupt(int intnum);
+void pic_ack_interrupt(int intnum);
+int pic_get_pending(void);
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/fpu_context.h
 ,0 → 1,67
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_FPU_CONTEXT_H_
+#define KERN_ppc64_FPU_CONTEXT_H_
+#ifndef KERN_ppc64_TYPES_H_
+# include <arch/types.h>
+#endif
+typedef struct {
+    uint64_t fr14;
+    uint64_t fr15;
+    uint64_t fr16;
+    uint64_t fr17;
+    uint64_t fr18;
+    uint64_t fr19;
+    uint64_t fr20;
+    uint64_t fr21;
+    uint64_t fr22;
+    uint64_t fr23;
+    uint64_t fr24;
+    uint64_t fr25;
+    uint64_t fr26;
+    uint64_t fr27;
+    uint64_t fr28;
+    uint64_t fr29;
+    uint64_t fr30;
+    uint64_t fr31;
+    uint32_t fpscr;
+} __attribute__ ((packed)) fpu_context_t;
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/context.h
 ,0 → 1,75
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_CONTEXT_H_
+#define KERN_ppc64_CONTEXT_H_
+#include <arch/types.h>
+#define SP_DELTA    16
+typedef struct {
+    uintptr_t sp;
+    uintptr_t pc;
+    uint64_t r2;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t r16;
+    uint64_t r17;
+    uint64_t r18;
+    uint64_t r19;
+    uint64_t r20;
+    uint64_t r21;
+    uint64_t r22;
+    uint64_t r23;
+    uint64_t r24;
+    uint64_t r25;
+    uint64_t r26;
+    uint64_t r27;
+    uint64_t r28;
+    uint64_t r29;
+    uint64_t r30;
+    uint64_t r31;
+    uint64_t cr;
+    ipl_t ipl;
+} __attribute__ ((packed)) context_t;
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/cpuid.h
 ,0 → 1,56
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_CPUID_H_
+#define KERN_ppc64_CPUID_H_
+#include <arch/types.h>
+typedef struct {
+    uint16_t version;
+    uint16_t revision;
+} __attribute__ ((packed)) cpu_info_t;
+static inline void cpu_version(cpu_info_t *info)
+{
+    asm volatile (
+        "mfpvr %0\n"
+        : "=r" (*info)
+    );
+}
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/asm/regname.h
 ,0 → 1,215
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_REGNAME_H_
+#define KERN_ppc64_REGNAME_H_
+/* Condition Register Bit Fields */
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
+/* General Purpose Registers (GPRs) */
+#define r0  0
+#define r1  1
+#define r2  2
+#define r3  3
+#define r4  4
+#define r5  5
+#define r6  6
+#define r7  7
+#define r8  8
+#define r9  9
+#define r10 10
+#define r11 11
+#define r12 12
+#define r13 13
+#define r14 14
+#define r15 15
+#define r16 16
+#define r17 17
+#define r18 18
+#define r19 19
+#define r20 20
+#define r21 21
+#define r22 22
+#define r23 23
+#define r24 24
+#define r25 25
+#define r26 26
+#define r27 27
+#define r28 28
+#define r29 29
+#define r30 30
+#define r31 31
+/* GPR Aliases */
+#define sp  1
+/* Floating Point Registers (FPRs) */
+#define fr0     0
+#define fr1     1
+#define fr2     2
+#define fr3     3
+#define fr4     4
+#define fr5     5
+#define fr6     6
+#define fr7     7
+#define fr8     8
+#define fr9     9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+#define vr0     0
+#define vr1     1
+#define vr2     2
+#define vr3     3
+#define vr4     4
+#define vr5     5
+#define vr6     6
+#define vr7     7
+#define vr8     8
+#define vr9     9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
+/* Special Purpose Registers (SPRs) */
+#define xer     1
+#define lr      8
+#define ctr     9
+#define dec     22
+#define sdr1    25
+#define srr0    26
+#define srr1    27
+#define sprg0   272
+#define sprg1   273
+#define sprg2   274
+#define sprg3   275
+#define prv     287
+#define hid0    1008
+/* MSR bits */
+#define msr_ir  (1 << 4)
+#define msr_dr  (1 << 5)
+#define msr_pr  (1 << 14)
+#define msr_ee  (1 << 15)
+/* HID0 bits */
+#define hid0_ice    (1 << 15)
+#define hid0_dce    (1 << 14)
+#define hid0_icfi   (1 << 11)
+#define hid0_dci    (1 << 10)
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/interrupt.h
 ,0 → 1,55
+/*
+ * 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.
+ */
+/** @addtogroup ppc64interrupt
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_INTERRUPT_H_
+#define KERN_ppc64_INTERRUPT_H_
+#include <arch/exception.h>
+#define IVT_ITEMS 16
+#define IVT_FIRST 0
+#define VECTOR_DATA_STORAGE 2
+#define VECTOR_INSTRUCTION_STORAGE 3
+#define VECTOR_EXTERNAL 4
+#define VECTOR_DECREMENTER 8
+extern void start_decrementer(void);
+extern void interrupt_init(void);
+extern void extint_handler(int n, istate_t *istate);
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/cycle.h
 ,0 → 1,46
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_CYCLE_H_
+#define KERN_ppc64_CYCLE_H_
+static inline uint64_t get_cycle(void)
+{
+    return 0;
+}
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/elf.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2006 Sergey Bondari
+ * 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 ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_ELF_H_
+#define KERN_ppc64_ELF_H_
+#define ELF_MACHINE     EM_PPC64
+#define ELF_DATA_ENCODING   ELFDATA2MSB
+#define ELF_CLASS       ELFCLASS32
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/arg.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_ARG_H_
+#define KERN_ppc64_ARG_H_
+#include <stdarg.h>
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/atomic.h
 ,0 → 1,97
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_ATOMIC_H_
+#define KERN_ppc64_ATOMIC_H_
+static inline void atomic_inc(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, 1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc"
+    );
+}
+static inline void atomic_dec(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, -1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc"
+    );
+}
+static inline long atomic_postinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count - 1;
+}
+static inline long atomic_postdec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count + 1;
+}
+static inline long atomic_preinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count;
+}
+static inline long atomic_predec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count;
+}
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/boot/boot.h
 ,0 → 1,92
+/*
+ * 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.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_BOOT_H_
+#define KERN_ppc64_BOOT_H_
+#define BOOT_OFFSET     0x4000
+/* Temporary stack size for boot process */
+#define TEMP_STACK_SIZE 0x100
+#define TASKMAP_MAX_RECORDS 32
+#define MEMMAP_MAX_RECORDS 32
+#ifndef __ASM__
+#include <arch/types.h>
+typedef struct {
+    uintptr_t addr;
+    uint64_t size;
+} utask_t;
+typedef struct {
+    uint32_t count;
+    utask_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
+typedef struct {
+    uintptr_t start;
+    uint64_t size;
+} memzone_t;
+typedef struct {
+    uint64_t total;
+    uint32_t count;
+    memzone_t zones[MEMMAP_MAX_RECORDS];
+} memmap_t;
+typedef struct {
+    uintptr_t addr;
+    unsigned int width;
+    unsigned int height;
+    unsigned int bpp;
+    unsigned int scanline;
+} screen_t;
+typedef struct {
+    taskmap_t taskmap;
+    memmap_t memmap;
+    screen_t screen;
+} bootinfo_t;
+extern bootinfo_t bootinfo;
+#endif
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/arch.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_ARCH_H_
+#define KERN_ppc64_ARCH_H_
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/proc/task.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 ppc64proc
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_TASK_H_
+#define KERN_ppc64_TASK_H_
+typedef struct {
+} task_arch_t;
+#define task_create_arch(t)
+#define task_destroy_arch(t)
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/proc/thread.h
 ,0 → 1,48
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64proc
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_THREAD_H_
+#define KERN_ppc64_THREAD_H_
+typedef struct {
+} thread_arch_t;
+#define thr_constructor_arch(t)
+#define thr_destructor_arch(t)
+#define thread_create_arch(t)
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/asm.h
 ,0 → 1,161
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_ASM_H_
+#define KERN_ppc64_ASM_H_
+#include <arch/types.h>
+#include <config.h>
+/** Enable interrupts.
+ *
+ * Enable interrupts and return previous
+ * value of EE.
+ *
+ * @return Old interrupt priority level.
+ */
+static inline ipl_t interrupts_enable(void)
+{
+    ipl_t v;
+    ipl_t tmp;
+    asm volatile (
+        "mfmsr %0\n"
+        "mfmsr %1\n"
+        "ori %1, %1, 1 << 15\n"
+        "mtmsr %1\n"
+        : "=r" (v), "=r" (tmp)
+    );
+    return v;
+}
+/** Disable interrupts.
+ *
+ * Disable interrupts and return previous
+ * value of EE.
+ *
+ * @return Old interrupt priority level.
+ */
+static inline ipl_t interrupts_disable(void)
+{
+    ipl_t v;
+    ipl_t tmp;
+    asm volatile (
+        "mfmsr %0\n"
+        "mfmsr %1\n"
+        "rlwinm %1, %1, 0, 17, 15\n"
+        "mtmsr %1\n"
+        : "=r" (v), "=r" (tmp)
+    );
+    return v;
+}
+/** Restore interrupt priority level.
+ *
+ * Restore EE.
+ *
+ * @param ipl Saved interrupt priority level.
+ */
+static inline void interrupts_restore(ipl_t ipl)
+{
+    ipl_t tmp;
+    asm volatile (
+        "mfmsr %1\n"
+        "rlwimi  %0, %1, 0, 17, 15\n"
+        "cmpw 0, %0, %1\n"
+        "beq 0f\n"
+        "mtmsr %0\n"
+        "0:\n"
+        : "=r" (ipl), "=r" (tmp)
+        : "0" (ipl)
+        : "cr0"
+    );
+}
+/** Return interrupt priority level.
+ *
+ * Return EE.
+ *
+ * @return Current interrupt priority level.
+ */
+static inline ipl_t interrupts_read(void)
+{
+    ipl_t v;
+    asm volatile (
+        "mfmsr %0\n"
+        : "=r" (v)
+    );
+    return v;
+}
+/** Return base address of current stack.
+ *
+ * Return the base address of the current stack.
+ * The stack is assumed to be STACK_SIZE bytes long.
+ * The stack must start on page boundary.
+ */
+static inline uintptr_t get_stack_base(void)
+{
+    uintptr_t v;
+    asm volatile (
+        "and %0, %%sp, %1\n"
+        : "=r" (v)
+        : "r" (~(STACK_SIZE - 1))
+    );
+    return v;
+}
+static inline void cpu_sleep(void)
+{
+}
+static inline void cpu_halt(void)
+{
+    asm volatile (
+        "b 0\n"
+    );
+}
+void asm_delay_loop(uint32_t t);
+extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/faddr.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup ppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_FADDR_H_
+#define KERN_ppc64_FADDR_H_
+#include <arch/types.h>
+#define FADDR(fptr)     ((uintptr_t) (fptr))
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/include/debug.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2005
+ * 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 ppc64debug
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_DEBUG_H_
+#define KERN_ppc64_DEBUG_H_
+#endif
+/** @}
+ */

 /branches/dynload/kernel/arch/ppc64/Makefile.inc
 ,0 → 1,76
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Toolchain configuration
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64
+BFD = binary
+TARGET = ppc64-linux-gnu
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc64
+GCC_CFLAGS += -mcpu=powerpc64 -msoft-float -m64
+AFLAGS += -a64
+LFLAGS += -no-check-sections -N
+DEFS += -D__64_BITS__
+## Own configuration directives
+#
+CONFIG_FB = y
+## Compile with hierarchical page tables support.
+#
+CONFIG_PAGE_PT = y
+DEFS += -DCONFIG_PAGE_PT
+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/ppc64.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/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

 /branches/dynload/kernel/arch/ppc64/_link.ld.in
 ,0 → 1,58
+/** PPC64 linker script
+ *
+ * umapped section:
+ *  kernel text
+ *  kernel data
+ * mapped section:
+ *  kernel text
+ *  kernel data
+ *
+ */
+#include <arch/boot/boot.h>
+#include <arch/mm/page.h>
+ENTRY(kernel_image_start)
+OUTPUT_FORMAT("elf64-powerpc")
+OUTPUT_ARCH(powerpc:common64)
+SECTIONS {
+    .unmapped 0: AT (0) {
+        unmapped_ktext_start = .;
+        *(K_UNMAPPED_TEXT_START);
+        unmapped_ktext_end = .;
+        unmapped_kdata_start = .;
+        *(K_UNMAPPED_DATA_START);
+        unmapped_kdata_start = .;
+    }
+    .mapped PA2KA(BOOT_OFFSET): AT (BOOT_OFFSET) {
+        ktext_start = .;
+        *(K_TEXT_START);
+        *(.text);
+        ktext_end = .;
+        kdata_start = .;
+        *(K_DATA_START);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        hardcoded_ktext_size = .;
+        LONG(ktext_end - ktext_start);
+        hardcoded_kdata_size = .;
+        LONG(kdata_end - kdata_start);
+        hardcoded_load_address = .;
+        LONG(PA2KA(BOOT_OFFSET));
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+        symbol_table = .;
+        *(symtab.*);            /* Symbol table, must be LAST symbol!*/
+        kdata_end = .;
+    }
+}

/branches/dynload/kernel/arch/mips32/src/drivers/msim.c
76,6 → 76,7
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/mips32/src/mm/frame.c
 ,7 → 75,7
  */
 static bool frame_available(pfn_t frame)
 {
-#ifdef msim
+#if MACHINE == msim
     /* MSIM device (dprinter) */
     if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
         return false;
 ,13 → 85,13
         return false;
 #endif
-#ifdef simics
+#if MACHINE == simics
     /* Simics device (serial line) */
     if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH))
         return false;
 #endif
-#if defined(lgxemul) || defined(bgxemul)
+#if (MACHINE == lgxemul) || (MACHINE == 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 defined(lgxemul) || defined(bgxemul)
+#if (MACHINE == lgxemul) || (MACHINE == bgxemul)
                     else {
                         ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
                         if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)

 /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();
 }
 ,26 → 132,11
         .x = 640,
         .y = 480,
         .scan = 1920,
-        .visual = VISUAL_BGR_8_8_8,
+        .visual = VISUAL_RGB_8_8_8,
     };
     fb_init(&gxemul_prop);
 #endif
-#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
+    sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
 }
 void arch_post_cpu_init(void)
 ,7 → 161,8
         (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. */
 ,22 → 195,9
 {
     ___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/asm.S
 ,7 → 159,7
 .global fpu_context_save
 fpu_context_save:
-#ifdef CONFIG_FPU
+#ifdef ARCH_HAS_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 CONFIG_FPU
+#ifdef ARCH_HAS_FPU
     fpu_gp_restore 0,$a0
     fpu_gp_restore 1,$a0
     fpu_gp_restore 2,$a0

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

 /branches/dynload/kernel/arch/mips32/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel
 ,8 → 41,20
 GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
-DEFS += -D__32_BITS__ -D$(MACHINE) -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS)
+DEFS += -D__32_BITS__ -DMACHINE=$(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 → 61,7
 ifeq ($(MACHINE),lgxemul)
     BFD_NAME = elf32-tradlittlemips
     BFD = binary
-    GCC_CFLAGS += -mips3
+    GCC_CFLAGS += -DFB_INVERT_ENDIAN -DARCH_HAS_FPU -mips3
 endif
 ifeq ($(MACHINE),bgxemul)
     BFD_NAME = elf32-bigmips
 ,7 → 68,7
     BFD = ecoff-bigmips
     TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
     TARGET = mips-sgi-irix5
-    GCC_CFLAGS += -EB -DBIG_ENDIAN -mips3
+    GCC_CFLAGS += -EB -DBIG_ENDIAN -DARCH_HAS_FPU -mips3
 endif
 ifeq ($(MACHINE),simics)
     # SIMICS 4kc emulation is broken, although for instructions
 ,25 → 85,31
     GCC_CFLAGS += -mhard-float -mips3
 endif
+## Compile with support for software integer division.
+#
+CONFIG_SOFTINT = y
 ARCH_SOURCES = \
-    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
+    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

 /branches/dynload/kernel/arch/mips32/include/types.h
 ,11 → 57,6
 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/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_FPU
+# ifdef CONFIG_MIPS_FPU
     mfc1 $t0,$20
     sw $t0, OFFSET_F20(\ctx)
 ,7 → 150,7
     mfc1 $t0,$30
     sw $t0, OFFSET_F30(\ctx)
-#endif /* CONFIG_FPU */
+# endif /* CONFIG_MIPS_FPU */
 #endif /* KERNEL */
     sw $ra,OFFSET_PC(\ctx)
 ,7 → 172,7
 #ifndef KERNEL
     lw $k1,OFFSET_TLS(\ctx)
-#ifdef CONFIG_FPU
+# ifdef CONFIG_MIPS_FPU
     lw $t0, OFFSET_F20(\ctx)
     mtc1 $t0,$20
 ,9 → 205,9
     lw $t0, OFFSET_F30(\ctx)
     mtc1 $t0,$30
-#endif /* CONFIG_FPU */
+# endif /* CONFIG_MIPS_FPU */
 #endif /* KERNEL */
     lw $ra,OFFSET_PC(\ctx)
     lw $sp,OFFSET_SP(\ctx)
 .endm

 /branches/dynload/kernel/arch/mips32/include/asm.h
 ,17 → 70,6
 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/ia32/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 BFD_NAME = elf32-i386
 BFD_ARCH = i386
 BFD = binary
 ,7 → 39,7
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
-DEFS += -D__32_BITS__
+DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
 CMN1 = -m32
 GCC_CFLAGS += $(CMN1)
 ,22 → 52,31
 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
 ,36 → 83,77
 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/$(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
+    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

 /branches/dynload/kernel/arch/ia32/src/ia32.c
 ,19 → 177,5
     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/ia32/include/types.h
 ,9 → 59,6
 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/fpu_context.h
37,6 → 37,7

#include <arch/types.h>

#define ARCH_HAS_FPU
#define FPU_CONTEXT_ALIGN 16

void fpu_fxsr(void);

 /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/Makefile
 ,25 → 32,21
 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 = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
+DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" \
+    -DKERNEL
-GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
+GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
     -fno-builtin -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
     -nostdlib -nostdinc -pipe
-ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
+ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
     -fno-builtin -Wall -Wmissing-prototypes -Werror \
     -nostdlib -nostdinc \
     -wd170
 ,7 → 58,15
 LFLAGS = -M
 AFLAGS =
--include arch/$(KARCH)/Makefile.inc
+ifdef REVISION
+    DEFS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
+-include arch/$(ARCH)/Makefile.inc
 -include genarch/Makefile.inc
 ## The at-sign
 ,6 → 84,92
 #
 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)
 ,7 → 194,6
     OBJDUMP = $(BINUTILS_PREFIX)objdump
     LIBDIR = /usr/lib
     CFLAGS = $(GCC_CFLAGS)
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,7 → 205,6
     OBJDUMP = objdump
     LIBDIR = /usr/lib
     CFLAGS = $(ICC_CFLAGS)
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),suncc_native)
 ,8 → 216,6
     OBJDUMP = $(BINUTILS_PREFIX)objdump
     LIBDIR = /usr/lib
     CFLAGS = $(SUNCC_CFLAGS)
-    DEFS += $(CONFIG_DEFS)
-    DEPEND_DEFS = $(DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,7 → 227,6
     OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
     LIBDIR = $(TOOLCHAIN_DIR)/lib
     CFLAGS = $(GCC_CFLAGS)
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ## Generic kernel sources
 ,6 → 325,7
 #
 ifeq ($(CONFIG_TEST),y)
+    DEFS += -DCONFIG_TEST
     CFLAGS += -Itest/
     GENERIC_SOURCES += \
         test/test.c \
 ,6 → 334,9
         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 \
 ,45 → 353,6
         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 → 361,7
 .PHONY: all build clean archlinks depend disasm
-all: ../Makefile.config ../config.h ../config.defs
+all: ../Makefile.config
     -rm Makefile.depend
     $(MAKE) -C . build
 ,7 → 370,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/$(KARCH)/_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/$(ARCH)/_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 → 377,24
     done ; exit 0
 archlinks:
-    ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch
+    ln -sfn ../../arch/$(ARCH)/include/ generic/include/arch
     ln -sfn ../../genarch/include/ generic/include/genarch
 depend: archlinks
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
-arch/$(KARCH)/_link.ld: arch/$(KARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
-generic/src/debug/real_map.bin: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
+generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
     echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o generic/src/debug/empty_map.o
-    $(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
+    $(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
     $(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/$(KARCH)/_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/$(ARCH)/_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 → 401,8
 generic/src/debug/real_map.o: generic/src/debug/real_map.bin
     echo $(SYMTAB_SECTION)" .incbin \"$<\"" | $(AS) $(AFLAGS) -o $@
-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.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.bin: kernel.raw
     $(OBJCOPY) -O $(BFD) kernel.raw kernel.bin

 /branches/dynload/tools/config.py
 ,14 → 37,12
 import xtui
 INPUT = sys.argv[1]
-MAKEFILE = 'Makefile.config'
-MACROS = 'config.h'
-DEFS = 'config.defs'
+OUTPUT = 'Makefile.config'
 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)
 ,29 → 216,15
     return True
-def create_output(mkname, mcname, dfname, defaults, ask_names):
+def create_output(fname, defaults, ask_names):
     "Create output configuration"
-    revision = commands.getoutput('svnversion . 2> /dev/null')
-    timestamp = commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')
+    outf = file(fname, 'w')
-    outmk = file(mkname, 'w')
-    outmc = file(mcname, 'w')
-    outdf = file(dfname, 'w')
+    outf.write('#########################################\n')
+    outf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
+    outf.write('#########################################\n\n')
-    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
 ,27 → 234,11
         else:
             default = defaults[varname]
-        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('# %s\n%s = %s\n\n' % (name, varname, default))
-    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()
+    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()
 def main():
     defaults = {}
 ,13 → 248,13
     parse_config(INPUT, ask_names)
     # Read defaults from previous run
-    if os.path.exists(MAKEFILE):
-        read_defaults(MAKEFILE, defaults)
+    if os.path.exists(OUTPUT):
+        read_defaults(OUTPUT, 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(MAKEFILE, MACROS, DEFS, defaults, ask_names)
+            create_output(OUTPUT, defaults, ask_names)
             return 0
     # Check mode: only check defaults
 ,13 → 293,10
                     # If there is just one option, use it
                     if (len(choices) == 1):
-                        defaults[varname] = choices[0][0]
-                        continue
+                        default = choices[0][0]
+                        defaults[varname] = default
                     options.append("     %s [%s] --> " % (name, default))
-                elif (vartype == 'y'):
-                    defaults[varname] = 'y'
-                    continue
                 elif (vartype == 'y/n'):
                     if (default == None):
                         default = 'y'
 ,7 → 346,7
     finally:
         xtui.screen_done(screen)
-    create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
+    create_output(OUTPUT, defaults, ask_names)
     return 0
 if __name__ == '__main__':

 /branches/dynload/uspace/app/dltest/Makefile
 ,6 → 27,7
 #
 include ../../../version
+-include ../../../Makefile.config
 ## Setup toolchain
 #
 ,7 → 35,6
 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/$(UARCH)/_link.ld
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(ARCH)/_link.ld
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /branches/dynload/uspace/app/bdsh/Makefile
 ,18 → 30,26
 # 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
 ,6 → 27,7
 #
 include ../../../version
+-include ../../../Makefile.config
 ## Setup toolchain
 #
 ,7 → 35,6
 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/$(UARCH)/_link.ld
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend arch/$(ARCH)/_link.ld
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(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
+    $(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
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /branches/dynload/uspace/app/dload/Makefile
 ,6 → 27,7
 #
 include ../../../version
+-include ../../../Makefile.config
 ## Setup toolchain
 #
 ,9 → 35,8
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(UARCH)/Makefile.inc
+include arch/$(ARCH)/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/$(UARCH)/include include/arch
+    ln -sfn ../arch/$(ARCH)/include include/arch
 -include Makefile.depend
 clean:
-    -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 \{\} \;
+    -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 \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend
-$(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
+$(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
 disasm:
     $(OBJDUMP) -d -S -s $(OUTPUT) >$(OUTPUT).disasm
 ,7 → 87,7
 sections:
     $(OBJDUMP) -h $(OUTPUT) >$(OUTPUT).sections
-arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/branches/dynload/uspace/app/dload/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/mips32.s
arch/$(ARCH)/mips32.s

/branches/dynload/uspace/app/dload/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/start.s
arch/$(ARCH)/start.s

/branches/dynload/uspace/app/dload/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/start.c
arch/$(ARCH)/start.c

 /branches/dynload/uspace/app/trace/Makefile
 ,10 → 29,11
 ## 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/init/Makefile
 ,6 → 27,7
 #
 include ../../../version
+-include ../../../Makefile.config
 ## Setup toolchain
 #
 ,14 → 34,21
 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 → 72,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

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

 /branches/dynload/uspace/app/tester/Makefile
 ,10 → 29,11
 ## 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
 ,7 → 1,8
+-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
 ,10 → 29,11
 ## 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/rtld/Makefile
 ,7 → 34,7
 LIBC_PREFIX = ../../lib/libc
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(UARCH)/Makefile.inc
+include arch/$(ARCH)/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/$(UARCH)/include include/arch
+    ln -sfn ../arch/$(ARCH)/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/$(UARCH)/_link.ld include/arch
-    find arch/$(UARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -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 \{\} \;
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES)> Makefile.depend

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

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

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

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

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

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

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

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

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

PHDRS {

/branches/dynload/uspace/lib/libc/shared/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/Makefile.toolchain
 ,23 → 26,15
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
+DEFS = -DARCH=$(ARCH)
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -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)/../../../Makefile.config
--include $(LIBC_PREFIX)/../../../config.defs
--include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
+-include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
 ## Simple detection of the host system
 #
 ,7 → 58,6
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,7 → 67,6
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 76,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
 ,6 → 30,8
 ## Common compiler flags
 #
+-include ../../../Makefile.config
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
 RTLD_PREFIX = ../../lib/rtld
 ,6 → 47,7
 ## Sources
 #
 GENERIC_SOURCES = \
     generic/libc.c \
     generic/ddi.c \
 ,8 → 93,8
     generic/vfs/canonify.c
 ARCH_SOURCES += \
-    arch/$(UARCH)/src/entry.s \
-    arch/$(UARCH)/src/thread_entry.s
+    arch/$(ARCH)/src/entry.s \
+    arch/$(ARCH)/src/thread_entry.s
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 ,21 → 103,21
 .PHONY: all clean depend kerninc
-all: kerninc libc.a libc.pic.a arch/$(UARCH)/_link.ld
+all: kerninc libc.a libc.pic.a arch/$(ARCH)/_link.ld
 kerninc:
     ln -sfn ../../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
-    ln -sfn ../arch/$(UARCH)/include include/libarch
+    ln -sfn ../arch/$(ARCH)/include include/libarch
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch include/libarch libc.a libc.pic.a arch/$(UARCH)/_link.ld Makefile.depend
+    -rm -f include/kernel include/arch include/libarch libc.a libc.pic.a arch/$(ARCH)/_link.ld Makefile.depend
     find . \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
 depend: kerninc
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(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 → 126,7
 libc.pic.a: depend $(PIC_OBJECTS)
     $(AR) rc $@ $(LIBS) $(PIC_OBJECTS)
-arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

 /branches/dynload/uspace/lib/libc/arch/mips32/Makefile.inc
 ,13 → 29,23
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+-include ../../../Makefile.config
+ifeq ($(CONFIG_MIPS_FPU),y)
+    CFLAGS += -DCONFIG_MIPS_FPU
+endif
+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/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/ia64/Makefile.inc
 ,6 → 29,10
 ## 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 → 39,10
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS +=
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/ddi.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c\
+        arch/$(ARCH)/src/ddi.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

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

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,12 → 29,16
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
-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
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32

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

PHDRS {

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

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

PHDRS {

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

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

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/arm32/Makefile.inc
 ,16 → 30,20
 ## 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/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c \
+        arch/$(ARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

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

PHDRS {

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

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

PHDRS {

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/syscall.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/**
+ * @file
+ */
+#ifndef LIBC_ppc64_SYSCALL_H_
+#define LIBC_ppc64_SYSCALL_H_
+#define LIBARCH_SYSCALL_GENERIC
+#include <syscall.h>
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/config.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 libppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_CONFIG_H_
+#define LIBC_ppc64_CONFIG_H_
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/byteorder.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_BYTEORDER_H_
+#define LIBC_ppc64_BYTEORDER_H_
+#define ARCH_IS_BIG_ENDIAN
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/tls.h
 ,0 → 1,73
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_TLS_H_
+#define LIBC_ppc64_TLS_H_
+#define CONFIG_TLS_VARIANT_1
+#define PPC_TP_OFFSET 0x7000
+typedef struct {
+    void *fibril_data;
+} tcb_t;
+static inline void __tcb_set(tcb_t *tcb)
+{
+    void *tp = tcb;
+    tp += PPC_TP_OFFSET + sizeof(tcb_t);
+    asm volatile (
+        "mr %%r2, %0\n"
+        :
+        : "r" (tp)
+    );
+}
+static inline tcb_t * __tcb_get(void)
+{
+    void * retval;
+    asm volatile (
+        "mr %0, %%r2\n"
+        : "=r" (retval)
+    );
+    return (tcb_t *)(retval - PPC_TP_OFFSET - sizeof(tcb_t));
+}
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/thread.h
 ,0 → 1,41
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_THREAD_H_
+#define LIBC_ppc64_THREAD_H_
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/types.h
 ,0 → 1,55
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_TYPES_H_
+#define LIBC_ppc64_TYPES_H_
+typedef unsigned long sysarg_t;
+typedef char int8_t;
+typedef short int int16_t;
+typedef int int32_t;
+typedef long int int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short int uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long int uint64_t;
+typedef uint64_t uintptr_t;
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/fibril.h
 ,0 → 1,83
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_FIBRIL_H_
+#define LIBC_ppc64_FIBRIL_H_
+#include <sys/types.h>
+/* We define our own context_set, because we need to set
+ * the TLS pointer to the tcb+0x7000
+ *
+ * See tls_set in thread.h
+ */
+#define context_set(c, _pc, stack, size, ptls)          \
+    (c)->pc = (sysarg_t) (_pc);             \
+    (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA;     \
+    (c)->tls = ((sysarg_t) (ptls)) + 0x7000 + sizeof(tcb_t);
+#define SP_DELTA    16
+typedef struct {
+    uint64_t sp;
+    uint64_t pc;
+    uint64_t tls;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t r16;
+    uint64_t r17;
+    uint64_t r18;
+    uint64_t r19;
+    uint64_t r20;
+    uint64_t r21;
+    uint64_t r22;
+    uint64_t r23;
+    uint64_t r24;
+    uint64_t r25;
+    uint64_t r26;
+    uint64_t r27;
+    uint64_t r28;
+    uint64_t r29;
+    uint64_t r30;
+    uint64_t r31;
+    uint64_t cr;
+} __attribute__ ((packed)) context_t;
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/atomic.h
 ,0 → 1,95
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_ATOMIC_H_
+#define LIBC_ppc64_ATOMIC_H_
+static inline void atomic_inc(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, 1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc");
+}
+static inline void atomic_dec(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, -1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc");
+}
+static inline long atomic_postinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count - 1;
+}
+static inline long atomic_postdec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count + 1;
+}
+static inline long atomic_preinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count;
+}
+static inline long atomic_predec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count;
+}
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/regname.h
 ,0 → 1,188
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_REGNAME_H_
+#define LIBC_ppc64_REGNAME_H_
+/* Condition Register Bit Fields */
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
+/* General Purpose Registers (GPRs) */
+#define r0  0
+#define r1  1
+#define r2  2
+#define r3  3
+#define r4  4
+#define r5  5
+#define r6  6
+#define r7  7
+#define r8  8
+#define r9  9
+#define r10 10
+#define r11 11
+#define r12 12
+#define r13 13
+#define r14 14
+#define r15 15
+#define r16 16
+#define r17 17
+#define r18 18
+#define r19 19
+#define r20 20
+#define r21 21
+#define r22 22
+#define r23 23
+#define r24 24
+#define r25 25
+#define r26 26
+#define r27 27
+#define r28 28
+#define r29 29
+#define r30 30
+#define r31 31
+/* GPR Aliases */
+#define sp  1
+/* Floating Point Registers (FPRs) */
+#define fr0     0
+#define fr1     1
+#define fr2     2
+#define fr3     3
+#define fr4     4
+#define fr5     5
+#define fr6     6
+#define fr7     7
+#define fr8     8
+#define fr9     9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+#define vr0     0
+#define vr1     1
+#define vr2     2
+#define vr3     3
+#define vr4     4
+#define vr5     5
+#define vr6     6
+#define vr7     7
+#define vr8     8
+#define vr9     9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/stackarg.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_STACKARG_H_
+#define LIBC_STACKARG_H_
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/faddr.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2005 Ondrej Palkovsky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_FADDR_H_
+#define LIBC_ppc64_FADDR_H_
+#include <libarch/types.h>
+#define FADDR(fptr)     ((uintptr_t) (fptr))
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/include/limits.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_LIMITS_H_
+#define LIBC_ppc64_LIMITS_H_
+#define LONG_MIN MIN_INT64
+#define LONG_MAX MAX_INT64
+#define ULONG_MIN MIN_UINT64
+#define ULONG_MAX MAX_UINT64
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/Makefile.inc
 ,0 → 1,48
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Toolchain configuration
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+TARGET = ppc64-linux-gnu
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc64/bin
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
+CFLAGS += -mcpu=powerpc64 -msoft-float -m64
+AFLAGS += -a64
+LFLAGS += -N
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64

 /branches/dynload/uspace/lib/libc/arch/ppc64/src/entry.s
 ,0 → 1,40
+#
+# 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.
+#
+.section .init, "ax"
+.org 0
+.globl __entry
+## User-space task entry point
+#
+#
+__entry:
+    bl __main
+    bl __exit

 /branches/dynload/uspace/lib/libc/arch/ppc64/src/fibril.S
 ,0 → 1,62
+#
+# 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.
+#
+.text
+.global context_save
+.global context_restore
+#include <libarch/regname.h>
+#include <kernel/arch/context_offset.h>
+context_save:
+    CONTEXT_SAVE_ARCH_CORE r3
+    mflr r4
+    stw r4, OFFSET_PC(r3)
+    mfcr r4
+    stw r4, OFFSET_CR(r3)
+    # context_save returns 1
+    li r3, 1
+    blr
+context_restore:
+    CONTEXT_RESTORE_ARCH_CORE r3
+    lwz r4, OFFSET_CR(r3)
+    mtcr r4
+    lwz r4, OFFSET_PC(r3)
+    mtlr r4
+    # context_restore returns 0
+    li r3, 0
+    blr

 /branches/dynload/uspace/lib/libc/arch/ppc64/src/syscall.c
 ,0 → 1,66
+/*
+ * 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.
+ */
+/** @addtogroup libcppc64 ppc64
+ * @brief ppc64 architecture dependent parts of libc
+ * @ingroup lc
+ * @{
+ */
+/** @file
+ */
+#include <libc.h>
+sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3,
+    const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id)
+{
+    register sysarg_t __ppc32_reg_r3 asm("3") = p1;
+    register sysarg_t __ppc32_reg_r4 asm("4") = p2;
+    register sysarg_t __ppc32_reg_r5 asm("5") = p3;
+    register sysarg_t __ppc32_reg_r6 asm("6") = p4;
+    register sysarg_t __ppc32_reg_r7 asm("7") = p5;
+    register sysarg_t __ppc32_reg_r8 asm("8") = p6;
+    register sysarg_t __ppc32_reg_r9 asm("9") = id;
+    asm volatile (
+        "sc\n"
+        : "=r" (__ppc32_reg_r3)
+        : "r" (__ppc32_reg_r3),
+          "r" (__ppc32_reg_r4),
+          "r" (__ppc32_reg_r5),
+          "r" (__ppc32_reg_r6),
+          "r" (__ppc32_reg_r7),
+          "r" (__ppc32_reg_r8),
+          "r" (__ppc32_reg_r9)
+    );
+    return __ppc32_reg_r3;
+}
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/src/tls.c
 ,0 → 1,60
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#include <tls.h>
+#include <malloc.h>
+/** Allocate TLS & TCB for initial module threads
+ *
+ * @param data Start of data section
+ * @return pointer to tcb_t structure
+ *
+ */
+tcb_t * __alloc_tls(void **data, size_t size)
+{
+    tcb_t *tcb;
+    *data = malloc(sizeof(tcb_t) + size);
+    tcb = (tcb_t *) (*data + size);
+    return tcb;
+}
+void __free_tls_arch(tcb_t *tcb, size_t size)
+{
+    void *start = ((void *) tcb) - size;
+    free(start);
+}
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/arch/ppc64/src/thread_entry.s
 ,0 → 1,39
+#
+# 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.
+#
+.text
+.globl __thread_entry
+## User-space thread entry point for all but the first threads.
+#
+#
+__thread_entry:
+    b __thread_main
+.end __thread_entry

 /branches/dynload/uspace/lib/libc/arch/ppc64/_link.ld.in
 ,0 → 1,52
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+ENTRY(__entry)
+PHDRS {
+    text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    . = 0x1000 + SIZEOF_HEADERS;
+    .init : {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.toc);
+        *(.rodata*);
+    } :text
+    . = . + 0x1000;
+    .data : {
+        *(.opd);
+        *(.data*);
+        *(.sdata);
+    } :data
+    .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    .bss : {
+        *(.sbss);
+        *(COMMON);
+        *(.bss);
+    } :data
+    . = ALIGN(0x1000);
+    _heap = .;
+    /DISCARD/ : {
+        *(*);
+    }
+}

 /branches/dynload/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,13 → 29,17
 ## 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/$(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
 LFLAGS += -N

 /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/$(UARCH)/_link.ld
+    LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link.ld
 else
     LIBS = $(LIBC_PREFIX)/libc.a
-    LD_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+    LD_SCRIPT = $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld
 endif

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

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

 /branches/dynload/uspace/lib/softfloat/Makefile
 ,27 → 29,28
 ## Common compiler flags
 #
+-include ../../../Makefile.config
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(ARCH)/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 → 68,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(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/softfloat/arch/ppc64/include/functions.h
 ,0 → 1,76
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 softfloatppc64 ppc64
+ * @ingroup sfl
+ * @brief softfloat architecture dependent definitions
+ * @{
+ */
+/** @file
+ */
+#ifndef __SOFTFLOAT_FUNCTIONS_H__
+#define __SOFTFLOAT_FUNCTIONS_H__
+#define float32_to_int(X) float32_to_int32(X);
+#define float32_to_long(X) float32_to_int64(X);
+#define float32_to_longlong(X) float32_to_int64(X);
+#define float64_to_int(X) float64_to_int32(X);
+#define float64_to_long(X) float64_to_int64(X);
+#define float64_to_longlong(X) float64_to_int64(X);
+#define float32_to_uint(X) float32_to_uint32(X);
+#define float32_to_ulong(X) float32_to_uint64(X);
+#define float32_to_ulonglong(X) float32_to_uint64(X);
+#define float64_to_uint(X) float64_to_uint32(X);
+#define float64_to_ulong(X) float64_to_uint64(X);
+#define float64_to_ulonglong(X) float64_to_uint64(X);
+#define int_to_float32(X) int32_to_float32(X);
+#define long_to_float32(X) int64_to_float32(X);
+#define longlong_to_float32(X) int64_to_float32(X);
+#define int_to_float64(X) int32_to_float64(X);
+#define long_to_float64(X) int64_to_float64(X);
+#define longlong_to_float64(X) int64_to_float64(X);
+#define uint_to_float32(X) uint32_to_float32(X);
+#define ulong_to_float32(X) uint64_to_float32(X);
+#define ulonglong_to_float32(X) uint64_to_float32(X);
+#define uint_to_float64(X) uint32_to_float64(X);
+#define ulong_to_float64(X) uint64_to_float64(X);
+#define ulonglong_to_float64(X) uint64_to_float64(X);
+#endif
+ /** @}
+ */

 /branches/dynload/uspace/lib/softint/Makefile
 ,8 → 30,9
 ## Common compiler flags
 #
+-include ../../../Makefile.config
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 65,7
     find generic/ \( -name '*.o' -o -name '*.pio' \) -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(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/srv/kbd/arch/ppc32/src/kbd.c
 ,7 → 40,16
 #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 → 186,7
     if (!sysinfo_value("kbd"))
         return 0;
-    return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, 0);
+    return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &cuda_kbd);
 }

 /branches/dynload/uspace/srv/kbd/arch/ia64/src/kbd.c
 ,6 → 114,18
+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 → 144,15
 {
     if (sysinfo_value("kbd")) {
         kbd_type=sysinfo_value("kbd.type");
-        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_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);
             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 → 170,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) {
 ,12 → 181,10
     } 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:
 ,6 → 308,12
     return 1;
 }
 int kbd_ski_process(keybuffer_t *keybuffer, ipc_call_t *call)
 {
     static unsigned long long buf = 0;
 ,12 → 393,11
 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 → 404,4
 /**
  * @}
- */
+ */

 /branches/dynload/uspace/srv/kbd/arch/ppc64/include/kbd.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 kbdppc64 ppc64
+ * @brief   HelenOS ppc64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_ppc64_KBD_H_
+#define KBD_ppc64_KBD_H_
+#endif
+/** @}
+ */

 /branches/dynload/uspace/srv/kbd/arch/ppc64/src/kbd.c
 ,0 → 1,56
+/*
+ * 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.
+ */
+/** @addtogroup kbdppc64 ppc64
+ * @brief   HelenOS ppc64 arch dependent parts of uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <arch/kbd.h>
+#include <ipc/ipc.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <keys.h>
+int kbd_arch_init(void)
+{
+    return 0;
+}
+int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
+    return 1;
+}
+/** @}
+ */

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

 /branches/dynload/uspace/srv/console/Makefile
 ,11 → 29,12
 ## 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 → 74,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/fs/tmpfs/Makefile
 ,11 → 29,12
 ## 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 → 68,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_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
 ,11 → 29,12
 ## 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 → 70,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/pci/libpci/Makefile
 ,6 → 3,8
 # 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
 ,10 → 29,11
 ## 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/vfs/Makefile
 ,9 → 30,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 → 65,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/ns/Makefile
 ,9 → 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/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_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/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/srv/loader/Makefile
 ,19 → 27,29
 # 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/$(UARCH)/Makefile.inc
+include arch/$(ARCH)/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 → 69,18
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
-    $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
+    $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/branches/dynload/uspace/srv/loader/arch/ia64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/ia64.s
ARCH_SOURCES := arch/$(ARCH)/ia64.s
AFLAGS += -xexplicit

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

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(UARCH)/ppc32.s
ARCH_SOURCES := arch/$(ARCH)/ppc32.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/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/dynload/uspace/srv/loader/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/sparc64.s
ARCH_SOURCES := arch/$(ARCH)/sparc64.s

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

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

 /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/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/amd64.s
ARCH_SOURCES := arch/$(ARCH)/amd64.s

/branches/dynload/uspace/srv/loader/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/mips32.s
ARCH_SOURCES := arch/$(ARCH)/mips32.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/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/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/$(UARCH)/ia32.s
ARCH_SOURCES := arch/$(ARCH)/ia32.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/UARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

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

 /branches/dynload/uspace/srv/fb/fb.c
 ,28 → 236,23
 }
-/** RGB 8:8:8 conversion
+/** BGR 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
  *
  */
 ,10 → 597,6
         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
 ,6 → 72,8
 #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;
 ,8 → 83,6
 static unsigned int style;
-static unsigned attr_to_ega_style(const attrs_t *a);
 static void clrscr(void)
 {
     int i;
 ,7 → 156,10
     for (i = 0; i < scr_width * scr_height; i++) {
         scr_addr[i * 2] = data[i].character;
-        scr_addr[i * 2 + 1] = attr_to_ega_style(&data[i].attrs);
+        /* FIXME
+        scr_addr[i * 2 + 1] = EGA_STYLE(data[i].style.fg_color,
+            data[i].style.bg_color);
+        */
     }
 }
 ,51 → 188,7
     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;
 ,8 → 196,7
     ipc_call_t call;
     char c;
     unsigned int row, col;
-    int bg_color, fg_color, attr;
-    uint32_t bg_rgb, fg_rgb;
+    int bgcolor,fgcolor;
     keyfield_t *interbuf = NULL;
     size_t intersize = 0;
     int i;
 ,20 → 279,25
             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:
-            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);
+            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;
             retval = 0;
             break;
         case FB_SET_RGB_COLOR:
-            fg_rgb = IPC_GET_ARG1(call);
-            bg_rgb = IPC_GET_ARG2(call);
-            style = rgb_to_ega_style(fg_rgb, bg_rgb);
+            fgcolor = IPC_GET_ARG1(call);
+            bgcolor = IPC_GET_ARG2(call);
+            style = EGA_STYLE(fgcolor, bgcolor);
             retval = 0;
             break;
         case FB_VP_DRAW_PIXMAP:
 ,12 → 335,11
     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/devmap/Makefile
 ,9 → 29,10
 ## Setup toolchain
 #
+-include ../../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../libipc/include
 ,7 → 46,7
 SOURCES = \
     devmap.c
-CFLAGS += -D$(UARCH)
+CFLAGS += -D$(ARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,7 → 63,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/dynload/uspace/Makefile
 ,20 → 60,28
     app/init \
     app/bdsh
-ifeq ($(UARCH),amd64)
+ifeq ($(ARCH), amd64)
     DIRS += srv/pci
 endif
-ifeq ($(UARCH),ia32)
+ifeq ($(ARCH), 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 ../config.h ../config.defs kerninc $(BUILDS)
+all: ../Makefile.config kerninc $(BUILDS)
 clean: $(CLEANS)

 /branches/dynload/HelenOS.config
 ,6 → 1,5
 #
 # Copyright (c) 2006 Ondrej Palkovsky
-# Copyright (c) 2009 Martin Decky
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 ,9 → 33,11
 @ "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 → 59,7
 @ "core" Core Solo/Duo
 @ "athlon-xp" Athlon XP
 @ "athlon-mp" Athlon MP
-! [PLATFORM=ia32] MACHINE (choice)
+! [PLATFORM=ia32|PLATFORM=ia32xen] MACHINE (choice)
 % CPU type
 @ "opteron" Opteron
 ,134 → 76,6
 ! 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 → 83,7
 @ "gcc_native" GCC Native
 @ "icc_native" ICC Native
 @ "suncc_native" Sun Studio C Compiler
-! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
+! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen] COMPILER (choice)
 % Compiler
 @ "gcc_cross" GCC Cross-compiler
 ,7 → 100,7
 % Compiler
 @ "gcc_cross" GCC Cross-compiler
 @ "gcc_native" GCC Native
-! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
+! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=ppc64] COMPILER (choice)
 ## Debug build options
 ,61 → 109,19
 ! 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&MACHINE!=athlon-xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia32xen|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
 % Improved support for hyperthreading
-! [((PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3)|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia32xen)&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
-! [CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
+! [(PLATFORM=mips32&MACHINE!=msim&MACHINE!=simics)|PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64|PLATFORM=sparc64|PLATFORM=ia32xen] CONFIG_FPU_LAZY (y/n)
 % Use VHPT
 ! [PLATFORM=ia64] CONFIG_VHPT (n/y)
 ,6 → 135,9
 % 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)
 ,9 → 147,6
 % 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 → 163,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)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
+! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
 % Save all interrupt registers
-! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32)] CONFIG_DEBUG_ALLREGS (y/n)
+! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32|PLATFORM=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n)
 % Compile kernel tests
 ! CONFIG_TEST (y/n)
 ,11 → 175,8
 ## Hardware support
 % Framebuffer support
-! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
+! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)] 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
 ,36 → 1,8
-/*
- * 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 ofw_setup_palette(void);
+extern int 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>
 ,30 → 372,23
     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 ofw_setup_palette(void)
+int 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);
 ,12 → 403,15
     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++)
-        ofw_call("call-method", 6, 1, NULL, "color!", screen,
-- i, CLIP(BLUE(i) * 37), GREEN(i) * 85, CLIP(RED(i) * 37));
+        if (ofw_call("call-method", 6, 1, NULL, "color!", screen,
+- i,
+            i << 5,
+            (i >> 3) << 6,
+            (i >> 5) << 5) != 0);
     return true;
 }

 /branches/dynload/boot/Makefile
 ,7 → 30,6
 #
 -include ../Makefile.config
--include ../config.defs
 ## Paths
 #
 ,11 → 38,23
 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 ../config.h ../config.defs build
+all: ../Makefile.config build
--include arch/$(BARCH)/Makefile.inc
+-include arch/$(ARCH)/Makefile.inc
 generic_clean:
     -rm generic/*.o genarch/*.o

 /branches/dynload/boot/arch/sparc64/loader/main.c
 ,23 → 36,21
 #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 = STRING(RELEASE);
+char *release = RELEASE;
 #ifdef REVISION
-    char *revision = ", revision " STRING(REVISION);
+    char *revision = ", revision " REVISION;
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+    char *timestamp = "\nBuilt on " TIMESTAMP;
 #else
     char *timestamp = "";
 #endif
 ,7 → 273,7
     printf("done.\n");
 #endif
-    ofw_setup_palette();
+    setup_palette();
     printf("\nBooting the kernel...\n");
     jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,

 /branches/dynload/boot/arch/sparc64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
--include ../../../../Makefile.config
+include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,8 → 57,16
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-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
+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
+ifdef REVISION
+    CFLAGS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 SOURCES = \
     main.c \
     _components.c \

 /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/Makefile.inc
 ,38 → 28,42
 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
-else
-    SILO_PACKAGE = silo.patched.tar.gz
+    SILO_PACKAGE=silo.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)
-    cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
+SILO_CONF_FILTER = cat
 else
-    cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
+SILO_CONF_FILTER = grep -v initrd
 endif
-    cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
+$(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
     gzip -f $(TMP)/HelenOS/image.boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-    cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+    cp arch/$(ARCH)/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/$(BARCH)/loader/image.boot
+    -rm arch/$(ARCH)/loader/image.boot
-arch/$(BARCH)/loader/image.boot:
-    $(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+arch/$(ARCH)/loader/image.boot:
+    $(MAKE) -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
 clean: generic_clean
-    $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+    $(MAKE) -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -fr $(TMP)
     -rm -f $(BASE)/image.iso

 /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
 ,7 → 32,6
 #include "_components.h"
 #include <ofw.h>
 #include <align.h>
-#include <macros.h>
 #define HEAP_GAP 1024000
 ,16 → 72,16
     }
 }
-char *release = STRING(RELEASE);
+char *release = RELEASE;
 #ifdef REVISION
-    char *revision = ", revision " STRING(REVISION);
+    char *revision = ", revision " REVISION;
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+    char *timestamp = "\nBuilt on " TIMESTAMP;
 #else
     char *timestamp = "";
 #endif
 ,8 → 176,6
     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
 #
 ,8 → 57,16
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-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
+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
+ifdef REVISION
+    CFLAGS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 SOURCES = \
     main.c \
     ofwarch.c \

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

 /branches/dynload/boot/arch/ppc64/loader/asm.S
 ,0 → 1,279
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#include "asm.h"
+#include "regname.h"
+.text
+.global halt
+.global memcpy
+.global jump_to_kernel
+halt:
+    b halt
+memcpy:
+    srwi. r7, r5, 3
+    addi r6, r3, -4
+    addi r4, r4, -4
+    beq 2f
+    andi. r0, r6, 3
+    mtctr r7
+    bne 5f
+:
+    lwz r7, 4(r4)
+    lwzu r8, 8(r4)
+    stw r7, 4(r6)
+    stwu r8, 8(r6)
+    bdnz 1b
+    andi. r5, r5, 7
+:
+    cmplwi 0, r5, 4
+    blt 3f
+    lwzu r0, 4(r4)
+    addi r5, r5, -4
+    stwu r0, 4(r6)
+:
+    cmpwi 0, r5, 0
+    beqlr
+    mtctr r5
+    addi r4, r4, 3
+    addi r6, r6, 3
+:
+    lbzu r0, 1(r4)
+    stbu r0, 1(r6)
+    bdnz 4b
+    blr
+:
+    subfic r0, r0, 4
+    mtctr r0
+:
+    lbz r7, 4(r4)
+    addi r4, r4, 1
+    stb r7, 4(r6)
+    addi r6, r6, 1
+    bdnz 6b
+    subf r5, r0, r5
+    rlwinm. r7, r5, 32-3, 3, 31
+    beq 2b
+    mtctr r7
+    b 1b
+jump_to_kernel:
+    # r3 = bootinfo (pa)
+    # r4 = bootinfo_size
+    # r5 = trans (pa)
+    # r6 = bytes to copy
+    # r7 = real_mode (pa)
+    # r8 = framebuffer (pa)
+    # r9 = scanline
+    # disable interrupts
+    mfmsr r31
+    rlwinm r31, r31, 0, 17, 15
+    mtmsr r31
+    # set real_mode meeting point address
+    mtspr srr0, r7
+    # jumps to real_mode
+    mfmsr r31
+    lis r30, ~0@h
+    ori r30, r30, ~(msr_ir | msr_dr)@l
+    and r31, r31, r30
+    mtspr srr1, r31
+    sync
+    isync
+    rfid
+.section REALMODE, "ax"
+.align PAGE_WIDTH
+.global real_mode
+real_mode:
+    # copy kernel to proper location
+    #
+    # r5 = trans (pa)
+    # r6 = bytes to copy
+    # r8 = framebuffer (pa)
+    # r9 = scanline
+    li r31, PAGE_SIZE >> 2
+    li r30, 0
+    page_copy:
+        cmpwi r6, 0
+        beq copy_end
+        # copy page
+        mtctr r31
+        lwz r29, 0(r5)
+        copy_loop:
+            lwz r28, 0(r29)
+            stw r28, 0(r30)
+            addi r29, r29, 4
+            addi r30, r30, 4
+            subi r6, r6, 4
+            cmpwi r6, 0
+            beq copy_end
+            bdnz copy_loop
+        addi r5, r5, 4
+        b page_copy
+    copy_end:
+    # initially fill segment registers
+    li r31, 0
+    li r29, 8
+    mtctr r29
+    li r30, 0                     # ASID 0 (VSIDs 0 .. 7)
+    seg_fill_uspace:
+        mtsrin r30, r31
+        addi r30, r30, 1
+        addis r31, r31, 0x1000    # move to next SR
+        bdnz seg_fill_uspace
+    li r29, 8
+    mtctr r29
+    lis r30, 0x4000               # priviledged access only
+    ori r30, r30, 8               # ASID 0 (VSIDs 8 .. 15)
+    seg_fill_kernel:
+        mtsrin r30, r31
+        addi r30, r30, 1
+        addis r31, r31, 0x1000    # move to next SR
+        bdnz seg_fill_kernel
+    # create empty Page Hash Table
+    # on top of memory, size 64 KB
+    lwz r31, 0(r3)                # r31 = memory size
+    lis r30, 65536@h
+    ori r30, r30, 65536@l         # r30 = 65536
+    subi r29, r30, 1              # r29 = 65535
+    sub r31, r31, r30
+    andc r31, r31, r29            # pht = ALIGN_DOWN(memory_size - 65536, 65536)
+    mtsdr1 r31
+    li r29, 2
+    srw r30, r30, r29             # r30 = 16384
+    li r29, 0
+    pht_clear:
+        # write zeroes
+        stw r29, 0(r31)
+        addi r31, r31, 4
+        subi r30, r30, 4
+        cmpwi r30, 0
+        beq clear_end
+        bdnz pht_clear
+    clear_end:
+    tlbsync
+    # start the kernel
+    #
+    # pc = KERNEL_START_ADDR
+    # r3 = bootinfo (pa)
+    # sprg0 = KA2PA(KERNEL_START_ADDR)
+    # sprg3 = physical memory size
+    # sp = 0 (pa)
+    lis r31, KERNEL_START_ADDR@ha
+    addi r31, r31, KERNEL_START_ADDR@l
+    mtspr srr0, r31
+    subis r31, r31, 0x8000
+    mtsprg0 r31
+    lwz r31, 0(r3)
+    mtsprg3 r31
+    li sp, 0
+    mfmsr r31
+    ori r31, r31, (msr_ir | msr_dr)@l
+    mtspr srr1, r31
+    sync
+    isync
+    rfid
+.align PAGE_WIDTH
+.global trans
+trans:
+    .space (TRANS_SIZE * TRANS_ITEM_SIZE)

 /branches/dynload/boot/arch/ppc64/loader/Makefile
 ,0 → 1,120
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+include ../../../../version
+include ../../../../Makefile.config
+## Toolchain configuration
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64
+TARGET = ppc64-linux-gnu
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc64/bin
+ifeq ($(COMPILER),gcc_native)
+    CC = gcc
+    AS = as
+    LD = ld
+    OBJCOPY = objcopy
+    OBJDUMP = objdump
+endif
+ifeq ($(COMPILER),gcc_cross)
+    CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
+    AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
+    LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
+    OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
+    OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+endif
+CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=powerpc64 -msoft-float -m64 -pipe
+ifdef REVISION
+    CFLAGS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
+SOURCES = \
+    main.c \
+    ofwarch.c \
+    _components.c \
+    ../../../genarch/ofw.c \
+    ../../../generic/printf.c \
+    asm.S \
+    boot.S
+COMPONENTS = \
+    $(KERNELDIR)/kernel.bin \
+    $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/fb/fb \
+    $(USPACEDIR)/srv/kbd/kbd \
+    $(USPACEDIR)/srv/console/console \
+    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+    $(USPACEDIR)/srv/fs/fat/fat \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/app/tetris/tetris \
+    $(USPACEDIR)/app/tester/tester \
+    $(USPACEDIR)/app/trace/trace \
+    $(USPACEDIR)/app/klog/klog
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
+.PHONY: all clean depend
+all: image.boot
+-include Makefile.depend
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
+    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+depend:
+    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+clean:
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned long" $(COMPONENTS)
+%.o: %.S
+    $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+%.o: %.c
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/dynload/boot/arch/ppc64/loader/_link.ld.in
 ,0 → 1,27
+OUTPUT_FORMAT("elf64-powerpc")
+OUTPUT_ARCH(powerpc:common64)
+ENTRY(start)
+SECTIONS {
+    .boot 0x0000000010000000: AT (0) {
+        *(BOOTSTRAP);
+        *(REALMODE);
+        *(.text);
+        *(.toc);
+        *(.opd);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+[[COMPONENTS]]
+    }
+    /DISCARD/ : {
+        *(*);
+    }
+}

 /branches/dynload/boot/arch/ppc64/loader/main.c
 ,0 → 1,182
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "main.h"
+#include <printf.h>
+#include "asm.h"
+#include "_components.h"
+#include <ofw.h>
+#include <align.h>
+#define HEAP_GAP 1024000
+bootinfo_t bootinfo;
+static void check_align(const void *addr, const char *desc)
+{
+    if ((unsigned long) addr % PAGE_SIZE != 0) {
+        printf("Error: %s not on page boundary, halting.\n", desc);
+        halt();
+    }
+}
+static void fix_overlap(void *va, void **pa, const char *desc, unsigned long *top)
+{
+    if ((unsigned long) *pa + PAGE_SIZE < *top) {
+        printf("Warning: %s overlaps kernel physical area\n", desc);
+        void *new_va = (void *) (ALIGN_UP((unsigned long) KERNEL_END + HEAP_GAP, PAGE_SIZE) + *top);
+        void *new_pa = (void *) (HEAP_GAP + *top);
+        *top += PAGE_SIZE;
+        if (ofw_map(new_pa, new_va, PAGE_SIZE, 0) != 0) {
+            printf("Error: Unable to map page aligned memory at %L (physical %L), halting.\n", new_va, new_pa);
+            halt();
+        }
+        if ((unsigned long) new_pa + PAGE_SIZE < KERNEL_SIZE) {
+            printf("Error: %s cannot be relocated, halting.\n", desc);
+            halt();
+        }
+        printf("Relocating %L -> %L (physical %L -> %L)\n", va, new_va, *pa, new_pa);
+        *pa = new_pa;
+        memcpy(new_va, va, PAGE_SIZE);
+    }
+}
+char *release = RELEASE;
+#ifdef REVISION
+    char *revision = ", revision " REVISION;
+#else
+    char *revision = "";
+#endif
+#ifdef TIMESTAMP
+    char *timestamp = "\nBuilt on " TIMESTAMP;
+#else
+    char *timestamp = "";
+#endif
+/** Print version information. */
+static void version_print(void)
+{
+    printf("HelenOS PPC64 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+}
+void bootstrap(void)
+{
+    version_print();
+    component_t components[COMPONENTS];
+    init_components(components);
+    unsigned int i;
+    for (i = 0; i < COMPONENTS; i++)
+        check_align(components[i].start, components[i].name);
+    check_align(&real_mode, "bootstrap trampoline");
+    check_align(&trans, "translation table");
+    if (!ofw_memmap(&bootinfo.memmap)) {
+        printf("Error: unable to get memory map, halting.\n");
+        halt();
+    }
+    if (bootinfo.memmap.total == 0) {
+        printf("Error: no memory detected, halting.\n");
+        halt();
+    }
+    if (!ofw_screen(&bootinfo.screen)) {
+        printf("Error: unable to get screen properties, halting.\n");
+        halt();
+    }
+    if (!ofw_keyboard(&bootinfo.keyboard)) {
+        printf("Error: unable to get keyboard properties, halting.\n");
+        halt();
+    }
+    printf("\nDevice statistics\n");
+    printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
+    printf(" keyboard at %L (size %d bytes)\n", bootinfo.keyboard.addr, bootinfo.keyboard.size);
+    void *real_mode_pa = ofw_translate(&real_mode);
+    void *trans_pa = ofw_translate(&trans);
+    void *bootinfo_pa = ofw_translate(&bootinfo);
+    printf("\nMemory statistics (total %d MB)\n", bootinfo.memmap.total >> 20);
+    printf(" %L: boot info structure (physical %L)\n", &bootinfo, bootinfo_pa);
+    printf(" %L: bootstrap trampoline (physical %L)\n", &real_mode, real_mode_pa);
+    printf(" %L: translation table (physical %L)\n", &trans, trans_pa);
+    for (i = 0; i < COMPONENTS; i++)
+        printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
+    unsigned long top = 0;
+    for (i = 0; i < COMPONENTS; i++)
+        top += ALIGN_UP(components[i].size, PAGE_SIZE);
+    unsigned long pages = ALIGN_UP(KERNEL_SIZE, PAGE_SIZE) >> PAGE_WIDTH;
+    for (i = 0; i < pages; i++) {
+        void *pa = ofw_translate(KERNEL_START + (i << PAGE_WIDTH));
+        fix_overlap(KERNEL_START + (i << PAGE_WIDTH), &pa, "kernel", &top);
+        trans[i] = pa;
+    }
+    bootinfo.taskmap.count = 0;
+    for (i = 1; i < COMPONENTS; i++) {
+        unsigned long component_pages = ALIGN_UP(components[i].size, PAGE_SIZE) >> PAGE_WIDTH;
+        unsigned long j;
+        for (j = 0; j < component_pages; j++) {
+            void *pa = ofw_translate(components[i].start + (j << PAGE_WIDTH));
+            fix_overlap(components[i].start + (j << PAGE_WIDTH), &pa, components[i].name, &top);
+            trans[pages + j] = pa;
+            if (j == 0) {
+                bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = (void *) (pages << PAGE_WIDTH);
+                bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = components[i].size;
+                bootinfo.taskmap.count++;
+            }
+        }
+        pages += component_pages;
+    }
+    fix_overlap(&real_mode, &real_mode_pa, "bootstrap trampoline", &top);
+    fix_overlap(&trans, &trans_pa, "translation table", &top);
+    fix_overlap(&bootinfo, &bootinfo_pa, "boot info", &top);
+    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/ppc64/loader/ofwarch.h
 ,0 → 1,35
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef BOOT_ppc64_OFWARCH_H_
+#define BOOT_ppc64_OFWARCH_H_
+#define OFW_ADDRESS_CELLS   2
+#define OFW_SIZE_CELLS      2
+#endif

 /branches/dynload/boot/arch/ppc64/loader/boot.S
 ,0 → 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.
+#
+#include "regname.h"
+.section BOOTSTRAP, "ax"
+.global start
+start:
+    lis r4, ofw_cif@ha
+    addi r4, r4, ofw_cif@l
+    stw r5, 0(r4)
+    bl ofw_init
+    b bootstrap

 /branches/dynload/boot/arch/ppc64/loader/regname.h
 ,0 → 1,204
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __ppc32_REGNAME_H__
+#define __ppc32_REGNAME_H__
+/* Condition Register Bit Fields */
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
+/* General Purpose Registers (GPRs) */
+#define r0  0
+#define r1  1
+#define r2  2
+#define r3  3
+#define r4  4
+#define r5  5
+#define r6  6
+#define r7  7
+#define r8  8
+#define r9  9
+#define r10 10
+#define r11 11
+#define r12 12
+#define r13 13
+#define r14 14
+#define r15 15
+#define r16 16
+#define r17 17
+#define r18 18
+#define r19 19
+#define r20 20
+#define r21 21
+#define r22 22
+#define r23 23
+#define r24 24
+#define r25 25
+#define r26 26
+#define r27 27
+#define r28 28
+#define r29 29
+#define r30 30
+#define r31 31
+/* GPR Aliases */
+#define sp  1
+/* Floating Point Registers (FPRs) */
+#define fr0     0
+#define fr1     1
+#define fr2     2
+#define fr3     3
+#define fr4     4
+#define fr5     5
+#define fr6     6
+#define fr7     7
+#define fr8     8
+#define fr9     9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+#define vr0     0
+#define vr1     1
+#define vr2     2
+#define vr3     3
+#define vr4     4
+#define vr5     5
+#define vr6     6
+#define vr7     7
+#define vr8     8
+#define vr9     9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
+/* Special Purpose Registers (SPRs) */
+#define xer     1
+#define lr      8
+#define ctr     9
+#define dec     22
+#define sdr1    25
+#define srr0    26
+#define srr1    27
+#define sprg0   272
+#define sprg1   273
+#define sprg2   274
+#define sprg3   275
+#define prv     287
+#define hid0    1008
+/* MSR bits */
+#define msr_ir  (1 << 4)
+#define msr_dr  (1 << 5)
+/* HID0 bits */
+#define hid0_ice    (1 << 15)
+#define hid0_dce    (1 << 14)
+#define hid0_icfi   (1 << 11)
+#define hid0_dci    (1 << 10)
+#endif

 /branches/dynload/boot/arch/ppc64/loader/asm.h
 ,0 → 1,52
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef BOOT_ppc64_ASM_H_
+#define BOOT_ppc64_ASM_H_
+#define PAGE_SIZE 4096
+#define PAGE_WIDTH 12
+#define TRANS_SIZE 1024
+#define TRANS_ITEM_SIZE 8
+#define KERNEL_START_ADDR 0x80008000
+#ifndef __ASM__
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+extern void *trans[TRANS_SIZE];
+extern void halt();
+extern void jump_to_kernel(void *bootinfo, unsigned long bootinfo_size, void *trans, unsigned long kernel_size, void *real_mode, void *fb, unsigned long scanline) __attribute__((noreturn));
+extern void real_mode();
+#endif
+#endif

 /branches/dynload/boot/arch/ppc64/loader/main.h
 ,0 → 1,58
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef BOOT_ppc64_MAIN_H_
+#define BOOT_ppc64_MAIN_H_
+#include "ofw.h"
+#define TASKMAP_MAX_RECORDS 32
+typedef struct {
+    void *addr;
+    unsigned long size;
+} task_t;
+typedef struct {
+    unsigned long count;
+    task_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
+typedef struct {
+    memmap_t memmap;
+    taskmap_t taskmap;
+    screen_t screen;
+    keyboard_t keyboard;
+} bootinfo_t;
+extern void start(void);
+extern void bootstrap(void);
+extern memmap_t memmap;
+#endif

 /branches/dynload/boot/arch/ppc64/loader/ofwarch.c
 ,0 → 1,68
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <ofwarch.h>
+#include <ofw.h>
+#include <printf.h>
+typedef int (* ofw_entry_t)(ofw_args_t *args);
+int ofw(ofw_args_t *args)
+{
+    return ((ofw_entry_t) ofw_cif)(args);
+}
+void write(const char *str, const int len)
+{
+    ofw_write(str, len);
+}
+int ofw_keyboard(keyboard_t *keyboard)
+{
+    char device_name[BUF_SIZE];
+    if (ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0)
+        return false;
+    phandle device = ofw_find_device(device_name);
+    if (device == -1)
+        return false;
+    pci_reg_t macio;
+    if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
+        return false;
+    keyboard->addr = (void *) (((unsigned long) macio.addr.addr_lo) | (((unsigned long) macio.addr.addr_hi) << 32));
+    keyboard->size = macio.size_lo;
+    return true;
+}
+int ofw_translate_failed(ofw_arg_t flag)
+{
+    return 0;
+}

 /branches/dynload/boot/arch/ppc64/loader/types.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef BOOT_ppc64_TYPES_H_
+#define BOOT_ppc64_TYPES_H_
+#include <gentypes.h>
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long  uint64_t;
+typedef uint64_t uintptr_t;
+typedef uint64_t unative_t;
+#endif

 /branches/dynload/boot/arch/ppc64/Makefile.inc
 ,0 → 1,44
+#
+# 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.
+#
+DEFS += -DOPEN_BOOT
+build: $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
+    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+depend:
+    -rm arch/$(ARCH)/loader/image.boot
+arch/$(ARCH)/loader/image.boot:
+    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+clean: generic_clean
+    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+    -rm -f $(BASE)/image.boot

 /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_PREFIX =
+    GEFI_PREXIX =
 endif
 ifeq ($(COMPILER),icc_native)
 ,8 → 68,16
 endif
 #-mno-pic means do not use gp + imm22 to address data
-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
+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
+ifdef REVISION
+    CFLAGS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 SOURCES = \
     main.c \
     ../../../generic/printf.c \
 ,6 → 130,7
 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/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
 ,12 → 33,11
 #include "_components.h"
 #include <align.h>
 #include <balloc.h>
-#include <macros.h>
 extern bootinfo_t binfo;
 component_t components[COMPONENTS];
-char *release = STRING(RELEASE);
+char *release = RELEASE;
 void write(const char *str, const int len)
 {
 ,13 → 53,13
 #define DEFAULT_SYS_FREQ        100000000 /* 100MHz */
 #ifdef REVISION
-    char *revision = ", revision " STRING(REVISION);
+    char *revision = ", revision " REVISION;
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+    char *timestamp = "\nBuilt on " TIMESTAMP;
 #else
     char *timestamp = "";
 #endif

 /branches/dynload/boot/arch/ia64/loader/gefi/Makefile
 ,7 → 25,7
 SUBDIRS = lib gnuefi inc
-all: $(SUBDIRS)
+all:    check_gcc $(SUBDIRS)
 $(SUBDIRS):
     $(MAKE) -C $@
 ,4 → 39,13
 .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/gefi/Make.defaults
 ,19 → 27,30
 #
 INSTALLROOT=/usr/local
-TOPDIR    := $(shell pwd)
+TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
-ARCH       = ia64
-INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
+ARCH       = $(shell uname -m | sed s,i[3456789]86,ia32,)
+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 -frename-registers -mfixed-range=f32-f127
-LDFLAGS    = -nostdlib
-INSTALL    = install
+CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
+LDFLAGS    = -nostdlib
+INSTALL    = install
-CC         = $(prefix)gcc
-AS         = $(prefix)as
-LD         = $(prefix)ld
-AR         = $(prefix)ar
-RANLIB     = $(prefix)ranlib
-OBJCOPY    = $(prefix)objcopy
-OBJDUMP    = $(prefix)objdump
+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

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

 /branches/dynload/boot/arch/arm32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
--include ../../../../Makefile.config
+include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,8 → 57,20
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
+CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -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/arm32/loader/main.c
 ,11 → 35,10
  */
-#include "main.h"
+#include "main.h"
 #include "asm.h"
 #include "_components.h"
 #include <printf.h>
-#include <macros.h>
 #include "mm.h"
 ,16 → 46,16
 #define KERNEL_VIRTUAL_ADDRESS 0x80200000
-char *release = STRING(RELEASE);
+char *release = RELEASE;
 #ifdef REVISION
-    char *revision = ", revision " STRING(REVISION);
+    char *revision = ", revision " REVISION;
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+    char *timestamp = "\nBuilt on " TIMESTAMP;
 #else
     char *timestamp = "";
 #endif

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

 /branches/dynload/boot/arch/mips32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
--include ../../../../Makefile.config
+include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,11 → 39,9
 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
 ,8 → 63,16
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-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
+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
+ifdef REVISION
+    CFLAGS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 SOURCES = \
     main.c \
     msim.c \

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

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

 /branches/dynload/boot/arch/ia32/Makefile.inc
 ,18 → 63,18
 build: $(BASE)/image.iso
-$(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/
+$(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/
 ifneq ($(RDFMT),tmpfs)
-    cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
 endif
 ifneq ($(RDFMT),fat)
-    cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
 endif
-    cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
+    cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
     for task in $(INIT_TASKS) ; do \
-        cp $$task arch/$(BARCH)/iso/boot/ ; \
+        cp $$task arch/$(ARCH)/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/$(BARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
 endif
-    $(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/
+    $(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/
 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/$(BARCH)/iso
+    -rm -fr arch/$(ARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/dynload/boot/arch/amd64/Makefile.inc
 ,18 → 57,18
 build: $(BASE)/image.iso
-$(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/
+$(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/
 ifneq ($(RDFMT),tmpfs)
-    cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
 endif
 ifneq ($(RDFMT),fat)
-    cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
 endif
-    cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
+    cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
     for task in $(INIT_TASKS) ; do \
-        cp $$task arch/$(BARCH)/iso/boot/ ; \
+        cp $$task arch/$(ARCH)/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/$(BARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
+    $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
 endif
-    $(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/
+    $(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/
 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/$(BARCH)/iso
+    -rm -fr arch/$(ARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/dynload/boot/arch/ia32xen/grub/menu.lst
 ,0 → 1,20
+default 0
+timeout 10
+title=HelenOS/ia32xen
+root (cd)
+kernel /boot/xen.gz
+module /boot/kernel.bin
+module /boot/ns
+module /boot/init
+module /boot/pci
+module /boot/fb
+module /boot/kbd
+module /boot/console
+module /boot/vfs
+module /boot/tmpfs
+module /boot/fat
+module /boot/devmap
+module /boot/tetris
+module /boot/tester
+module /boot/klog

 /branches/dynload/boot/arch/ia32xen/grub/menu.debug.lst
 ,0 → 1,16
+default 0
+timeout 10
+title=HelenOS/ia32xen
+root (cd)
+kernel /boot/xen.debug.gz noreboot console=com1,vga com1=auto,8n1,0x3f8
+module /boot/kernel.bin
+module /boot/ns
+module /boot/init
+module /boot/pci
+module /boot/fb
+module /boot/kbd
+module /boot/console
+module /boot/tetris
+module /boot/tester
+module /boot/klog

/branches/dynload/boot/arch/ia32xen/grub/xen.gz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: 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:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

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

 /branches/dynload/boot/arch/ia32xen/grub/COPYING
 ,0 → 1,340
+            GNU GENERAL PUBLIC LICENSE
+               Version 2, June 1991
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+                Preamble
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+            GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+and 2 above on a medium customarily used for software interchange; or,
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+                NO WARRANTY
+. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+             END OF TERMS AND CONDITIONS
+        How to Apply These Terms to Your New Programs
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Also add information on how to contact you by electronic and paper mail.
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

/branches/dynload/boot/arch/ia32xen/grub/README
0,0 → 1,5
For licensing terms of GRUB boot loader see the file COPYING contained
in this directory. Full version of GRUB, including its source code,
can be downloaded from GRUB's project page:

http://www.gnu.org/software/grub/

 /branches/dynload/boot/arch/ia32xen/Makefile.inc
 ,0 → 1,64
+#
+# 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.
+#
+TASKS = \
+    $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/pci/pci \
+    $(USPACEDIR)/srv/fb/fb \
+    $(USPACEDIR)/srv/kbd/kbd \
+    $(USPACEDIR)/srv/console/console \
+    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+    $(USPACEDIR)/srv/fs/fat/fat \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/app/tetris/tetris \
+    $(USPACEDIR)/app/tester/tester \
+    $(USPACEDIR)/app/klog/klog
+build: $(BASE)/image.iso
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/grub/menu.debug.lst arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/grub/xen.debug.gz $(KERNELDIR)/kernel.bin $(TASKS)
+    mkdir -p arch/$(ARCH)/iso/boot/grub
+    cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
+ifeq ($(CONFIG_DEBUG),y)
+    cp arch/$(ARCH)/grub/menu.debug.lst arch/$(ARCH)/iso/boot/grub/menu.lst
+    cp arch/$(ARCH)/grub/xen.debug.gz arch/$(ARCH)/iso/boot/
+else
+    cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
+    cp arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/iso/boot/
+endif
+    cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
+    for task in $(TASKS) ; do \
+        cp $$task arch/$(ARCH)/iso/boot/ ; \
+    done
+    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/
+clean:
+    -rm -fr arch/$(ARCH)/iso
+    -rm -f $(BASE)/image.iso

 /branches/dynload/Makefile
 ,6 → 31,82
 -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 → 113,21
     tools/config.py HelenOS.config default
     $(MAKE) -C . build
-build: Makefile.config config.h config.defs
-    $(MAKE) -C kernel
-    $(MAKE) -C uspace
-    $(MAKE) -C boot
+build: Makefile.config
+    $(MAKE) -C kernel ARCH=$(KARCH)
+    $(MAKE) -C uspace ARCH=$(UARCH)
+    $(MAKE) -C boot ARCH=$(BARCH) IMAGE=$(IMAGE)
 config: HelenOS.config
     tools/config.py HelenOS.config
 distclean: clean
-    rm -f Makefile.config config.h config.defs tools/*.pyc
+    rm -f Makefile.config tools/*.pyc
 clean:
-    -$(MAKE) -C kernel clean
-    -$(MAKE) -C uspace clean
-    -$(MAKE) -C boot clean
+    -$(MAKE) -C kernel clean ARCH=$(KARCH)
+    -$(MAKE) -C uspace clean ARCH=$(UARCH)
+    -$(MAKE) -C boot clean ARCH=$(BARCH) IMAGE=$(IMAGE)
 cscope:
     find kernel boot uspace -regex '^.*\.[chsS]$$' -print > srclist

 /branches/dynload/version
 ,42 → 1,8
-#
-# 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 = 4
+PATCHLEVEL = 3
 SUBLEVEL = 0
+#EXTRAVERSION = 0
+NAME = Tartare
 ifdef EXTRAVERSION
     RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)
 ,5 → 9,3
 else
     RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 endif
-NAME = Sinister Valentine

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4342 → Rev 4341