Index: HelenOS.config =================================================================== --- HelenOS.config (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ HelenOS.config (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -31,4 +31,5 @@ % Platform +@ "abs32le" abstract 32-bit little endian @ "amd64" AMD64/Intel EM64T (PC) @ "arm32" ARM 32-bit @@ -91,4 +92,8 @@ % Kernel architecture +@ "abs32le" +! [PLATFORM=abs32le] KARCH (choice) + +% Kernel architecture @ "amd64" ! [PLATFORM=amd64] KARCH (choice) @@ -130,4 +135,8 @@ % User space architecture +@ "abs32le" +! [PLATFORM=abs32le] UARCH (choice) + +% User space architecture @ "amd64" ! [PLATFORM=amd64] UARCH (choice) @@ -167,4 +176,8 @@ ## Mapping between platform and boot architecture + +% Boot architecture +@ "abs32le" +! [PLATFORM=abs32le] BARCH (choice) % Boot architecture @@ -243,4 +256,9 @@ ! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice) +% Compiler +@ "gcc_native" GNU C Compiler (native) +@ "clang" Clang +! [PLATFORM=abs32le] COMPILER (choice) + ## Kernel configuration @@ -259,5 +277,5 @@ % Hierarchical page tables support -! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y) +! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y) % Page hash table support @@ -486,2 +504,5 @@ % Mount /data on startup ! [CONFIG_START_BD=y] CONFIG_MOUNT_DATA (n/y) + +% Verbose task dumps +! CONFIG_VERBOSE_DUMPS (n/y) Index: Makefile =================================================================== --- Makefile (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ Makefile (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -59,5 +59,5 @@ distclean: clean - rm -f $(CSCOPE).out Makefile.config config.h config.defs tools/*.pyc + rm -f $(CSCOPE).out Makefile.config config.h config.defs tools/*.pyc tools/checkers/*.pyc clean: Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ boot/Makefile.common (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -56,5 +56,6 @@ $(USPACEDIR)/srv/fs/devfs/devfs \ $(USPACEDIR)/srv/fs/tmpfs/tmpfs \ - $(USPACEDIR)/srv/fs/fat/fat + $(USPACEDIR)/srv/fs/fat/fat \ + $(USPACEDIR)/srv/taskmon/taskmon RD_APPS = \ @@ -65,4 +66,5 @@ $(USPACEDIR)/app/mkfat/mkfat \ $(USPACEDIR)/app/redir/redir \ + $(USPACEDIR)/app/taskdump/taskdump \ $(USPACEDIR)/app/tester/tester \ $(USPACEDIR)/app/tetris/tetris \ Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ boot/arch/amd64/Makefile.inc (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -33,5 +33,5 @@ $(USPACEDIR)/srv/hw/char/i8042/i8042 \ $(USPACEDIR)/srv/hw/bus/pci/pci \ - $(USPACEDIR)/srv/hid/c_mouse/c_mouse + $(USPACEDIR)/srv/hid/char_mouse/char_ms MODULES := $(notdir $(COMPONENTS)) Index: boot/arch/ia64/loader/Makefile.common =================================================================== --- boot/arch/ia64/loader/Makefile.common (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ boot/arch/ia64/loader/Makefile.common (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -49,4 +49,4 @@ RD_SRVS += \ $(USPACEDIR)/srv/hw/char/i8042/i8042 \ - $(USPACEDIR)/srv/hid/c_mouse/c_mouse + $(USPACEDIR)/srv/hid/char_mouse/char_ms endif Index: boot/arch/ppc32/loader/Makefile.common =================================================================== --- boot/arch/ppc32/loader/Makefile.common (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ boot/arch/ppc32/loader/Makefile.common (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -43,2 +43,6 @@ KERNELDIR = ../../../../kernel USPACEDIR = ../../../../uspace + +RD_SRVS += \ + $(USPACEDIR)/srv/hid/adb_mouse/adb_ms \ + $(USPACEDIR)/srv/hw/bus/cuda_adb/cuda_adb Index: defaults/special/Makefile.config =================================================================== --- defaults/special/Makefile.config (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ defaults/special/Makefile.config (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,26 @@ +# RAM disk format +RDFMT = fat + +# Compiler +COMPILER = gcc_native + +# Debug build +CONFIG_DEBUG = y + +# Support for userspace debuggers +CONFIG_UDEBUG = y + +# Kernel console support +CONFIG_KCONSOLE = y + +# Kernel symbol information +CONFIG_SYMTAB = y + +# Detailed kernel logging +CONFIG_LOG = n + +# Compile kernel tests +CONFIG_TEST = y + +# Load disk drivers on startup +CONFIG_START_BD = n Index: defaults/special/abs32le/Makefile.config =================================================================== --- defaults/special/abs32le/Makefile.config (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ defaults/special/abs32le/Makefile.config (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,2 @@ +# Platform +PLATFORM = abs32le Index: kernel/arch/abs32le/Makefile.inc =================================================================== --- kernel/arch/abs32le/Makefile.inc (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/Makefile.inc (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,46 @@ +# +# Copyright (c) 2010 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 +# + +BITS = 32 +ENDIANESS = LE + +ARCH_SOURCES = \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/proc/scheduler.c \ + arch/$(KARCH)/src/proc/task.c \ + arch/$(KARCH)/src/proc/thread.c \ + arch/$(KARCH)/src/abs32le.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 Index: kernel/arch/abs32le/_link.ld.in =================================================================== --- kernel/arch/abs32le/_link.ld.in (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/_link.ld.in (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,39 @@ +SECTIONS { + .text : { + ktext_start = .; + *(.text); + ktext_end = .; + } + .data : { + kdata_start = .; + *(.data); /* initialized data */ + hardcoded_ktext_size = .; + LONG(ktext_end - ktext_start); + hardcoded_kdata_size = .; + LONG(kdata_end - kdata_start); + hardcoded_load_address = .; + LONG(hardcoded_load_address); + *(.bss); /* uninitialized static variables */ + *(COMMON); /* global variables */ + + *(.rodata*); + *(.sdata); + *(.reginfo); + . = ALIGN(8); + symbol_table = .; + *(symtab.*); + } + .sbss : { + *(.sbss); + *(.scommon); + } + + kdata_end = .; + + /DISCARD/ : { + *(.mdebug*); + *(.pdr); + *(.comment); + *(.note); + } +} Index: kernel/arch/abs32le/include/arch.h =================================================================== --- kernel/arch/abs32le/include/arch.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/arch.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_ARCH_H_ +#define KERN_abs32le_ARCH_H_ + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/asm.h =================================================================== --- kernel/arch/abs32le/include/asm.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/asm.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,196 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_ASM_H_ +#define KERN_abs32le_ASM_H_ + +#include +#include +#include + +extern void interrupt_handlers(void); + +extern void enable_l_apic_in_msr(void); + + +extern void asm_delay_loop(uint32_t); +extern void asm_fake_loop(uint32_t); + + +static inline void cpu_halt(void) +{ + /* On real hardware this should stop processing further + instructions on the CPU (and possibly putting it into + low-power mode) without any possibility of exitting + this function. */ + + while (true); +} + +static inline void cpu_sleep(void) +{ + /* On real hardware this should put the CPU into low-power + mode. However, the CPU is free to continue processing + futher instructions any time. The CPU also wakes up + upon an interrupt. */ +} + +static inline void pio_write_8(ioport8_t *port, uint8_t val) +{ +} + +/** Word to port + * + * Output word to port + * + * @param port Port to write to + * @param val Value to write + * + */ +static inline void pio_write_16(ioport16_t *port, uint16_t val) +{ +} + +/** Double word to port + * + * Output double word to port + * + * @param port Port to write to + * @param val Value to write + * + */ +static inline void pio_write_32(ioport32_t *port, uint32_t val) +{ +} + +/** Byte from port + * + * Get byte from port + * + * @param port Port to read from + * @return Value read + * + */ +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return 0; +} + +/** Word from port + * + * Get word from port + * + * @param port Port to read from + * @return Value read + * + */ +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return 0; +} + +/** Double word from port + * + * Get double word from port + * + * @param port Port to read from + * @return Value read + * + */ +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return 0; +} + +static inline ipl_t interrupts_enable(void) +{ + /* On real hardware this unconditionally enables preemption + by internal and external interrupts. + + The return value stores the previous interrupt level. */ + + return 0; +} + +static inline ipl_t interrupts_disable(void) +{ + /* On real hardware this disables preemption by the usual + set of internal and external interrupts. This does not + apply to special non-maskable interrupts and sychronous + CPU exceptions. + + The return value stores the previous interrupt level. */ + + return 0; +} + +static inline void interrupts_restore(ipl_t ipl) +{ + /* On real hardware this either enables or disables preemption + according to the interrupt level value from the argument. */ +} + +static inline ipl_t interrupts_read(void) +{ + /* On real hardware the return value stores the current interrupt + level. */ + + return 0; +} + +static inline uintptr_t get_stack_base(void) +{ + /* On real hardware this returns the address of the bottom + of the current CPU stack. The the_t structure is stored + on the bottom of stack and this is used to identify the + current CPU, current task, current thread and current + address space. */ + + return 0; +} + +static inline uintptr_t *get_ip() +{ + /* On real hardware this returns the current instruction + pointer value. The value certainly changes with each + instruction, but it can be still used to identify + a specific function. */ + + return 0; +} + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/atomic.h =================================================================== --- kernel/arch/abs32le/include/atomic.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/atomic.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_ATOMIC_H_ +#define KERN_abs32le_ATOMIC_H_ + +#include +#include +#include + +static inline void atomic_inc(atomic_t *val) { + /* On real hardware the increment has to be done + as an atomic action. */ + + val->count++; +} + +static inline void atomic_dec(atomic_t *val) { + /* On real hardware the decrement has to be done + as an atomic action. */ + + val->count++; +} + +static inline long atomic_postinc(atomic_t *val) +{ + /* On real hardware both the storing of the previous + value and the increment have to be done as a single + atomic action. */ + + long prev = val->count; + + val->count++; + return prev; +} + +static inline long atomic_postdec(atomic_t *val) +{ + /* On real hardware both the storing of the previous + value and the decrement have to be done as a single + atomic action. */ + + long prev = val->count; + + val->count--; + return prev; +} + +#define atomic_preinc(val) (atomic_postinc(val) + 1) +#define atomic_predec(val) (atomic_postdec(val) - 1) + +static inline uint32_t test_and_set(atomic_t *val) { + uint32_t v; + + asm volatile ( + "movl $1, %[v]\n" + "xchgl %[v], %[count]\n" + : [v] "=r" (v), [count] "+m" (val->count) + ); + + return v; +} + +/** ia32 specific fast spinlock */ +static inline void atomic_lock_arch(atomic_t *val) +{ + uint32_t tmp; + + preemption_disable(); + asm volatile ( + "0:\n" + "pause\n" /* Pentium 4's HT love this instruction */ + "mov %[count], %[tmp]\n" + "testl %[tmp], %[tmp]\n" + "jnz 0b\n" /* lightweight looping on locked spinlock */ + + "incl %[tmp]\n" /* now use the atomic operation */ + "xchgl %[count], %[tmp]\n" + "testl %[tmp], %[tmp]\n" + "jnz 0b\n" + : [count] "+m" (val->count), [tmp] "=&r" (tmp) + ); + /* + * Prevent critical section code from bleeding out this way up. + */ + CS_ENTER_BARRIER(); +} + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/barrier.h =================================================================== --- kernel/arch/abs32le/include/barrier.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/barrier.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,99 @@ +/* + * 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 ia32 + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32_BARRIER_H_ +#define KERN_ia32_BARRIER_H_ + +/* + * NOTE: + * No barriers for critical section (i.e. spinlock) on IA-32 are needed: + * - spinlock_lock() and spinlock_trylock() use serializing XCHG instruction + * - writes cannot pass reads on IA-32 => spinlock_unlock() needs no barriers + */ + +/* + * Provisions are made to prevent compiler from reordering instructions itself. + */ + +#define CS_ENTER_BARRIER() asm volatile ("" ::: "memory") +#define CS_LEAVE_BARRIER() asm volatile ("" ::: "memory") + +static inline void cpuid_serialization(void) +{ + asm volatile ( + "xorl %%eax, %%eax\n" + "cpuid\n" + ::: "eax", "ebx", "ecx", "edx", "memory" + ); +} + +#if defined(CONFIG_FENCES_P4) + #define memory_barrier() asm volatile ("mfence\n" ::: "memory") + #define read_barrier() asm volatile ("lfence\n" ::: "memory") + #ifdef CONFIG_WEAK_MEMORY + #define write_barrier() asm volatile ("sfence\n" ::: "memory") + #else + #define write_barrier() asm volatile ("" ::: "memory"); + #endif +#elif defined(CONFIG_FENCES_P3) + #define memory_barrier() cpuid_serialization() + #define read_barrier() cpuid_serialization() + #ifdef CONFIG_WEAK_MEMORY + #define write_barrier() asm volatile ("sfence\n" ::: "memory") + #else + #define write_barrier() asm volatile ("" ::: "memory"); + #endif +#else + #define memory_barrier() cpuid_serialization() + #define read_barrier() cpuid_serialization() + #ifdef CONFIG_WEAK_MEMORY + #define write_barrier() cpuid_serialization() + #else + #define write_barrier() asm volatile ("" ::: "memory"); + #endif +#endif + +/* + * On ia32, the hardware takes care about instruction and data cache coherence, + * even on SMP systems. We issue a write barrier to be sure that writes + * queueing in the store buffer drain to the memory (even though it would be + * sufficient for them to drain to the D-cache). + */ +#define smc_coherence(a) write_barrier() +#define smc_coherence_block(a, l) write_barrier() + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/context.h =================================================================== --- kernel/arch/abs32le/include/context.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/context.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_CONTEXT_H_ +#define KERN_abs32le_CONTEXT_H_ + +#ifdef KERNEL +#include + +#define STACK_ITEM_SIZE 4 +#define SP_DELTA 0 + +#define context_set(c, _pc, stack, size) \ + do { \ + (c)->pc = (uintptr_t) (_pc); \ + } while (0) + +#endif /* KERNEL */ + +/* + * On real hardware this stores the registers which + * need to be preserved across function calls. + */ +typedef struct { + uintptr_t sp; + uintptr_t pc; + ipl_t ipl; +} context_t; + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/context_offset.h =================================================================== --- kernel/arch/abs32le/include/context_offset.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/context_offset.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_CONTEXT_OFFSET_H_ +#define KERN_abs32le_CONTEXT_OFFSET_H_ + +#define OFFSET_PC 0x00 + +#ifdef KERNEL + #define OFFSET_IPL 0x04 +#else + #define OFFSET_TLS 0x04 +#endif + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/cpu.h =================================================================== --- kernel/arch/abs32le/include/cpu.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/cpu.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_CPU_H_ +#define KERN_abs32le_CPU_H_ + +/* + * On real hardware this structure stores + * information specific to the current + * CPU model. + */ +typedef struct { +} cpu_arch_t; + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/cycle.h =================================================================== --- kernel/arch/abs32le/include/cycle.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/cycle.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_CYCLE_H_ +#define KERN_abs32le_CYCLE_H_ + +static inline uint64_t get_cycle(void) +{ + return 0; +} + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/debug.h =================================================================== --- kernel/arch/abs32le/include/debug.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/debug.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2010 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 abs32ledebug + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_DEBUG_H_ +#define KERN_abs32le_DEBUG_H_ + +#include + +#define HERE get_ip() + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/elf.h =================================================================== --- kernel/arch/abs32le/include/elf.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/elf.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_ELF_H_ +#define KERN_abs32le_ELF_H_ + +#define ELF_MACHINE EM_NO +#define ELF_DATA_ENCODING ELFDATA2LSB +#define ELF_CLASS ELFCLASS32 + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/faddr.h =================================================================== --- kernel/arch/abs32le/include/faddr.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/faddr.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_FADDR_H_ +#define KERN_abs32le_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/fpu_context.h =================================================================== --- kernel/arch/abs32le/include/fpu_context.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/fpu_context.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_FPU_CONTEXT_H_ +#define KERN_abs32le_FPU_CONTEXT_H_ + +#include + +#define FPU_CONTEXT_ALIGN 16 + +/* + * On real hardware this stores the FPU registers + * which are part of the CPU context. + */ +typedef struct { +} fpu_context_t; + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/interrupt.h =================================================================== --- kernel/arch/abs32le/include/interrupt.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/interrupt.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2010 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 abs32leinterrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_INTERRUPT_H_ +#define KERN_abs32le_INTERRUPT_H_ + +#include + +#define IVT_ITEMS 0 +#define IVT_FIRST 0 + +/* + * On real hardware this stores the registers which + * need to be preserved during interupts. + */ +typedef struct istate { + uintptr_t ip; + uintptr_t fp; + uint32_t stack[]; +} istate_t; + +static inline int istate_from_uspace(istate_t *istate) +{ + /* On real hardware this checks whether the interrupted + context originated from user space. */ + + return !(istate->ip & 0x80000000); +} + +static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr) +{ + /* On real hardware this sets the instruction pointer. */ + + istate->ip = retaddr; +} + +static inline unative_t istate_get_pc(istate_t *istate) +{ + /* On real hardware this returns the instruction pointer. */ + + return istate->ip; +} + +static inline unative_t istate_get_fp(istate_t *istate) +{ + /* On real hardware this returns the frame pointer. */ + + return istate->fp; +} + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/memstr.h =================================================================== --- kernel/arch/abs32le/include/memstr.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/memstr.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_MEMSTR_H_ +#define KERN_abs32le_MEMSTR_H_ + +#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) + +extern void memsetw(void *, size_t, uint16_t); +extern void memsetb(void *, size_t, uint8_t); + +extern int memcmp(const void *, const void *, size_t); + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/mm/as.h =================================================================== --- kernel/arch/abs32le/include/mm/as.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/mm/as.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_AS_H_ +#define KERN_abs32le_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 + +#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 + +/** @} + */ Index: kernel/arch/abs32le/include/mm/asid.h =================================================================== --- kernel/arch/abs32le/include/mm/asid.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/mm/asid.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2010 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 abc32lemm + * @{ + */ + +#ifndef KERN_abs32le_ASID_H_ +#define KERN_abs32le_ASID_H_ + +#include + +typedef uint32_t asid_t; + +#define ASID_MAX_ARCH 3 + +#define asid_get() (ASID_START + 1) +#define asid_put(asid) + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/mm/frame.h =================================================================== --- kernel/arch/abs32le/include/mm/frame.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/mm/frame.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_FRAME_H_ +#define KERN_abs32le_FRAME_H_ + +#define FRAME_WIDTH 12 /* 4K */ +#define FRAME_SIZE (1 << FRAME_WIDTH) + +#ifdef KERNEL +#ifndef __ASM__ + +#include + +extern void frame_arch_init(void); +extern void physmem_print(void); + +#endif /* __ASM__ */ +#endif /* KERNEL */ + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/mm/page.h =================================================================== --- kernel/arch/abs32le/include/mm/page.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/mm/page.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_PAGE_H_ +#define KERN_abs32le_PAGE_H_ + +#include + +#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 + +/* + * This is an example of 2-level page tables (PTL1 and PTL2 are left out) + * on top of the generic 4-level page table interface. + */ + +/* 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 sizes 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 for 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 *) ((((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) ((((pte_t *) (ptl3))[(i)].frame_address) << 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)].frame_address = (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)].frame_address = (a) >> 12) + +/* Get PTE flags accessors for each level. */ +#define GET_PTL1_FLAGS_ARCH(ptl0, i) \ + get_pt_flags((pte_t *) (ptl0), (size_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), (size_t) (i)) + +/* Set PTE flags accessors for each level. */ +#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \ + set_pt_flags((pte_t *) (ptl0), (size_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), (size_t) (i), (x)) + +/* Macros for querying the last level entries. */ +#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) 1 + +#ifndef __ASM__ + +#include +#include +#include +#include + +/* 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) + +/** 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; + +static inline unsigned int get_pt_flags(pte_t *pt, size_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 | + 1 << PAGE_READ_SHIFT | + p->writeable << PAGE_WRITE_SHIFT | + 1 << PAGE_EXEC_SHIFT | + p->global << PAGE_GLOBAL_SHIFT); +} + +static inline void set_pt_flags(pte_t *pt, size_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; +} + +extern void page_arch_init(void); +extern void page_fault(int n, istate_t *istate); + +#endif /* __ASM__ */ + +#endif /* KERNEL */ + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/mm/tlb.h =================================================================== --- kernel/arch/abs32le/include/mm/tlb.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/mm/tlb.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_TLB_H_ +#define KERN_abs32le_TLB_H_ + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/proc/task.h =================================================================== --- kernel/arch/abs32le/include/proc/task.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/proc/task.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010 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 abs32leproc + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_TASK_H_ +#define KERN_abs32le_TASK_H_ + +#include +#include + +/* + * On real hardware this structure stores task information + * specific to the architecture. + */ +typedef struct { +} task_arch_t; + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/proc/thread.h =================================================================== --- kernel/arch/abs32le/include/proc/thread.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/proc/thread.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2010 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 abs32leproc + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_THREAD_H_ +#define KERN_abs32le_THREAD_H_ + +#include + +typedef struct { +} thread_arch_t; + +#define thr_constructor_arch(thr) +#define thr_destructor_arch(thr) + +#endif + +/** @} + */ Index: kernel/arch/abs32le/include/types.h =================================================================== --- kernel/arch/abs32le/include/types.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/include/types.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_TYPES_H_ +#define KERN_abs32le_TYPES_H_ + +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 uintptr_t; +typedef uint32_t pfn_t; + +typedef uint32_t ipl_t; + +typedef uint32_t unative_t; +typedef int32_t native_t; + +typedef struct { +} fncptr_t; + +#define PRIp "x" /**< Format for uintptr_t. */ +#define PRIs "u" /**< Format for size_t. */ + +#define PRId8 "d" /**< Format for int8_t. */ +#define PRId16 "d" /**< Format for int16_t. */ +#define PRId32 "d" /**< Format for int32_t. */ +#define PRId64 "lld" /**< Format for int64_t. */ +#define PRIdn "d" /**< Format for native_t. */ + +#define PRIu8 "u" /**< Format for uint8_t. */ +#define PRIu16 "u" /**< Format for uint16_t. */ +#define PRIu32 "u" /**< Format for uint32_t. */ +#define PRIu64 "llu" /**< Format for uint64_t. */ +#define PRIun "u" /**< Format for unative_t. */ + +#define PRIx8 "x" /**< Format for hexadecimal (u)int8_t. */ +#define PRIx16 "x" /**< Format for hexadecimal (u)int16_t. */ +#define PRIx32 "x" /**< Format for hexadecimal (u)uint32_t. */ +#define PRIx64 "llx" /**< Format for hexadecimal (u)int64_t. */ +#define PRIxn "x" /**< Format for hexadecimal (u)native_t. */ + +#endif + +/** @} + */ Index: kernel/arch/abs32le/src/abs32le.c =================================================================== --- kernel/arch/abs32le/src/abs32le.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/abs32le.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +void arch_pre_mm_init(void) +{ +} + +void arch_post_mm_init(void) +{ + if (config.cpu_active == 1) { + /* Initialize IRQ routing */ + irq_init(0, 0); + + /* Merge all memory zones to 1 big zone */ + zone_merge_all(); + } +} + +void arch_post_cpu_init() +{ +} + +void arch_pre_smp_init(void) +{ +} + +void arch_post_smp_init(void) +{ +} + +void calibrate_delay_loop(void) +{ +} + +unative_t sys_tls_set(unative_t addr) +{ + return 0; +} + +/** 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; +} + +void arch_reboot(void) +{ +} + +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + +/** @} + */ Index: kernel/arch/abs32le/src/cpu/cpu.c =================================================================== --- kernel/arch/abs32le/src/cpu/cpu.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/cpu/cpu.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include + + +void fpu_disable(void) +{ +} + +void fpu_enable(void) +{ +} + +void cpu_arch_init(void) +{ +} + +void cpu_identify(void) +{ +} + +void cpu_print_report(cpu_t* cpu) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/debug/stacktrace.c =================================================================== --- kernel/arch/abs32le/src/debug/stacktrace.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/debug/stacktrace.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010 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 ia32 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 1 + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return fp != 0; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + uint32_t *stack = (void *) fp; + *prev = stack[FRAME_OFFSET_FP_PREV]; + return true; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + uint32_t *stack = (void *) fp; + *ra = stack[FRAME_OFFSET_RA]; + return true; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return fp != 0; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return !copy_from_uspace((void *) prev, + (uint32_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev)); +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA, + sizeof(*ra)); +} + +/** @} + */ Index: kernel/arch/abs32le/src/mm/as.c =================================================================== --- kernel/arch/abs32le/src/mm/as.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/mm/as.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ + +#include +#include +#include + +void as_arch_init(void) +{ + as_operations = &as_pt_operations; +} + +/** @} + */ Index: kernel/arch/abs32le/src/mm/frame.c =================================================================== --- kernel/arch/abs32le/src/mm/frame.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/mm/frame.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +size_t hardcoded_unmapped_ktext_size = 0; +size_t hardcoded_unmapped_kdata_size = 0; + +void physmem_print(void) +{ +} + + +void frame_arch_init(void) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/mm/page.c =================================================================== --- kernel/arch/abs32le/src/mm/page.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/mm/page.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void page_arch_init(void) +{ + if (config.cpu_active == 1) + page_mapping_operations = &pt_mapping_operations; +} + + +uintptr_t hw_map(uintptr_t physaddr, size_t size) +{ + return physaddr; +} + +void page_fault(int n __attribute__((unused)), istate_t *istate) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/mm/tlb.c =================================================================== --- kernel/arch/abs32le/src/mm/tlb.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/mm/tlb.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2010 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 abs32lemm + * @{ + */ + +#include +#include +#include +#include + +void tlb_invalidate_all(void) +{ +} + +void tlb_invalidate_asid(asid_t asid __attribute__((unused))) +{ + tlb_invalidate_all(); +} + +void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, size_t cnt) +{ + tlb_invalidate_all(); +} + +void tlb_arch_init(void) +{ +} + +void tlb_print(void) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/proc/scheduler.c =================================================================== --- kernel/arch/abs32le/src/proc/scheduler.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/proc/scheduler.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2010 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 abs32leproc + * @{ + */ +/** @file + */ + +#include + +void before_task_runs_arch(void) +{ +} + +void before_thread_runs_arch(void) +{ +} + +void after_thread_ran_arch(void) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/proc/task.c =================================================================== --- kernel/arch/abs32le/src/proc/task.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/proc/task.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010 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 abs32leproc + * @{ + */ +/** @file + */ + +#include + +void task_create_arch(task_t *t) +{ +} + +void task_destroy_arch(task_t *t) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/proc/thread.c =================================================================== --- kernel/arch/abs32le/src/proc/thread.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/proc/thread.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2010 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 abs32leproc + * @{ + */ +/** @file + */ + +#include + +void thread_create_arch(thread_t *t) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/userspace.c =================================================================== --- kernel/arch/abs32le/src/userspace.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) +++ kernel/arch/abs32le/src/userspace.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010 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 abs32le + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include + + +void userspace(uspace_arg_t *kernel_uarg) +{ + /* On real hardware this switches the CPU to user + space mode and jumps to kernel_uarg->uspace_entry. */ + + while (true); +} + +/** @} + */ Index: kernel/arch/amd64/src/amd64.c =================================================================== --- kernel/arch/amd64/src/amd64.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/amd64/src/amd64.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -278,4 +278,9 @@ } +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + /** @} */ Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/arm32/src/arm32.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -179,4 +179,9 @@ } +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + /** @} */ Index: kernel/arch/ia32/src/ia32.c =================================================================== --- kernel/arch/ia32/src/ia32.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/ia32/src/ia32.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -234,4 +234,9 @@ } +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + /** @} */ Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/ia64/src/ia64.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -44,4 +44,5 @@ #include #include +#include #include #include @@ -280,4 +281,9 @@ } +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + /** @} */ Index: kernel/arch/mips32/src/mips32.c =================================================================== --- kernel/arch/mips32/src/mips32.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/mips32/src/mips32.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -46,4 +46,5 @@ #include #include +#include #include #include @@ -257,4 +258,9 @@ } +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + /** @} */ Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/ppc32/src/ppc32.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -39,4 +39,5 @@ #include #include +#include #include #include @@ -47,4 +48,5 @@ #include #include +#include #include #include @@ -58,4 +60,7 @@ bootinfo_t bootinfo; + +static cir_t pic_cir; +static void *pic_cir_arg; /** Performs ppc32-specific initialization before main_bsp() is called. */ @@ -186,8 +191,7 @@ if (assigned_address) { /* Initialize PIC */ - cir_t cir; - void *cir_arg; - pic_init(assigned_address[0].addr, PAGE_SIZE, &cir, &cir_arg); - + pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir, + &pic_cir_arg); + #ifdef CONFIG_MAC_KBD uintptr_t pa = assigned_address[0].addr + 0x16000; @@ -201,5 +205,5 @@ /* Initialize I/O controller */ cuda_instance_t *cuda_instance = - cuda_init(cuda, IRQ_CUDA, cir, cir_arg); + cuda_init(cuda, IRQ_CUDA, pic_cir, pic_cir_arg); if (cuda_instance) { kbrd_instance_t *kbrd_instance = kbrd_init(); @@ -211,4 +215,14 @@ } } + + /* + * This is the necessary evil until the userspace driver is entirely + * self-sufficient. + */ + sysinfo_set_item_val("cuda", NULL, true); + sysinfo_set_item_val("cuda.inr", NULL, IRQ_CUDA); + sysinfo_set_item_val("cuda.address.physical", NULL, pa); + sysinfo_set_item_val("cuda.address.kernel", NULL, + (uintptr_t) cuda); #endif } @@ -216,4 +230,11 @@ /* Consider only a single device for now */ return false; +} + +void irq_initialize_arch(irq_t *irq) +{ + irq->cir = pic_cir; + irq->cir_arg = pic_cir_arg; + irq->preack = true; } Index: kernel/arch/sparc64/src/sparc64.c =================================================================== --- kernel/arch/sparc64/src/sparc64.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/arch/sparc64/src/sparc64.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -44,4 +44,5 @@ #include #include +#include #include #include @@ -166,4 +167,9 @@ } +void irq_initialize_arch(irq_t *irq) +{ + (void) irq; +} + /** @} */ Index: kernel/generic/include/interrupt.h =================================================================== --- kernel/generic/include/interrupt.h (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/include/interrupt.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -46,20 +46,10 @@ typedef void (* iroutine)(int n, istate_t *istate); -#define fault_if_from_uspace(istate, fmt, ...) \ -{ \ - if (istate_from_uspace(istate)) { \ - task_t *task = TASK; \ - printf("Task %s (%" PRIu64 ") killed due to an exception at " \ - "program counter %p.\n", task->name, task->taskid, istate_get_pc(istate)); \ - stack_trace_istate(istate); \ - printf("Kill message: " fmt "\n", ##__VA_ARGS__); \ - task_kill(task->taskid); \ - thread_exit(); \ - } \ -} - +extern void fault_if_from_uspace(istate_t *istate, char *fmt, ...); extern iroutine exc_register(int n, const char *name, iroutine f); extern void exc_dispatch(int n, istate_t *t); void exc_init(void); + +extern void irq_initialize_arch(irq_t *irq); #endif Index: kernel/generic/include/ipc/event_types.h =================================================================== --- kernel/generic/include/ipc/event_types.h (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/include/ipc/event_types.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -37,6 +37,10 @@ typedef enum event_type { + /** New data available in kernel log */ EVENT_KLOG = 0, + /** Returning from kernel console to userspace */ EVENT_KCONSOLE, + /** A thread has faulted and will be terminated */ + EVENT_FAULT, EVENT_END } event_type_t; Index: kernel/generic/include/mm/as.h =================================================================== --- kernel/generic/include/mm/as.h (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/include/mm/as.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -36,4 +36,10 @@ #define KERN_AS_H_ +#ifdef KERNEL +#include +#else +#include +#endif + /** Address space area flags. */ #define AS_AREA_READ 1 @@ -41,4 +47,16 @@ #define AS_AREA_EXEC 4 #define AS_AREA_CACHEABLE 8 + +/** Address space area info exported to userspace. */ +typedef struct { + /** Starting address */ + uintptr_t start_addr; + + /** Area size */ + size_t size; + + /** Area flags */ + int flags; +} as_area_info_t; #ifdef KERNEL @@ -268,4 +286,5 @@ /* Introspection functions. */ +extern void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize); extern void as_print(as_t *as); Index: kernel/generic/include/udebug/udebug.h =================================================================== --- kernel/generic/include/udebug/udebug.h (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/include/udebug/udebug.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -27,5 +27,5 @@ */ -/** @addtogroup generic +/** @addtogroup generic * @{ */ @@ -83,4 +83,15 @@ UDEBUG_M_ARGS_READ, +/** Read thread's userspace register state (istate_t). + * + * - ARG2 - thread identification + * - ARG3 - destination address in the caller's address space + * + * or, on error, retval will be + * - ENOENT - thread does not exist + * - EBUSY - register state not available + */ +UDEBUG_M_REGS_READ, + /** Read the list of the debugged tasks's threads. * @@ -97,4 +108,31 @@ UDEBUG_M_THREAD_READ, +/** Read the name of the debugged task. + * + * - ARG2 - destination address in the caller's address space + * - ARG3 - size of receiving buffer in bytes + * + * The kernel fills the buffer with a non-terminated string. + * + * - ARG2 - number of bytes that were actually copied + * - ARG3 - number of bytes of the complete data + * + */ +UDEBUG_M_NAME_READ, + +/** Read the list of the debugged task's address space areas. + * + * - ARG2 - destination address in the caller's address space + * - ARG3 - size of receiving buffer in bytes + * + * The kernel fills the buffer with a series of as_area_info_t structures. + * Upon answer, the kernel will set: + * + * - ARG2 - number of bytes that were actually copied + * - ARG3 - number of bytes of the complete data + * + */ +UDEBUG_M_AREAS_READ, + /** Read the debugged tasks's memory. * @@ -108,5 +146,5 @@ } udebug_method_t; - + typedef enum { UDEBUG_EVENT_FINISHED = 1, /**< Debuging session has finished */ @@ -139,4 +177,5 @@ #include +#include #include #include @@ -181,4 +220,5 @@ bool stoppable; /**< thread is stoppable */ bool active; /**< thread is in a debugging session */ + condvar_t active_cv; } udebug_thread_t; @@ -202,4 +242,5 @@ int udebug_task_cleanup(struct task *ta); +void udebug_thread_fault(void); #endif Index: kernel/generic/include/udebug/udebug_ops.h =================================================================== --- kernel/generic/include/udebug/udebug_ops.h (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/include/udebug/udebug_ops.h (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -45,6 +45,10 @@ int udebug_stop(thread_t *t, call_t *call); -int udebug_thread_read(void **buffer, size_t buf_size, size_t *n); +int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored, + size_t *needed); +int udebug_name_read(char **data, size_t *data_size); int udebug_args_read(thread_t *t, void **buffer); + +int udebug_regs_read(thread_t *t, void **buffer); int udebug_mem_read(unative_t uspace_addr, size_t n, void **buffer); Index: kernel/generic/src/ddi/irq.c =================================================================== --- kernel/generic/src/ddi/irq.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/src/ddi/irq.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -74,4 +74,5 @@ #include #include +#include #include #include @@ -169,4 +170,6 @@ irq->inr = -1; irq->devno = -1; + + irq_initialize_arch(irq); } Index: kernel/generic/src/interrupt/interrupt.c =================================================================== --- kernel/generic/src/interrupt/interrupt.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ kernel/generic/src/interrupt/interrupt.c (revision 2e07f62c6429ec9b1e2c4452756f0e12e17283a8) @@ -44,4 +44,8 @@ #include #include +#include +#include +#include