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

Ignore whitespace Rev 4341 → Rev 4342

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#include <arch/types.h>

#define ARCH_HAS_FPU
#define FPU_CONTEXT_ALIGN 8

typedef struct {

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

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

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

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

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

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

#define ARCH_HAS_FPU 1
#define FPU_CONTEXT_ALIGN 16

#include <arch/types.h>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#include <arch/types.h>

#define ARCH_HAS_FPU
#define FPU_CONTEXT_ALIGN 16

void fpu_fxsr(void);

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

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

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

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

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4341 → Rev 4342