Index: HelenOS.config =================================================================== --- HelenOS.config (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ HelenOS.config (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 Index: Makefile =================================================================== --- Makefile (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ Makefile (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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: defaults/abs32le/Makefile.config =================================================================== --- defaults/abs32le/Makefile.config (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ defaults/abs32le/Makefile.config (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -0,0 +1,29 @@ +# Platform +PLATFORM = abs32le + +# 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: kernel/arch/abs32le/Makefile.inc =================================================================== --- kernel/arch/abs32le/Makefile.inc (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/Makefile.inc (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/_link.ld.in (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/arch.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/asm.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/atomic.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/barrier.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/context.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/context_offset.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/cpu.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/cycle.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/debug.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/elf.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/faddr.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/fpu_context.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/interrupt.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/memstr.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/mm/as.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/mm/asid.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/mm/frame.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/mm/page.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/mm/tlb.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/proc/task.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/proc/thread.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/include/types.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/abs32le.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -0,0 +1,105 @@ +/* + * 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) +{ +} + +/** @} + */ Index: kernel/arch/abs32le/src/cpu/cpu.c =================================================================== --- kernel/arch/abs32le/src/cpu/cpu.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/cpu/cpu.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/debug/stacktrace.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/mm/as.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/mm/frame.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/mm/page.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/mm/tlb.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/proc/scheduler.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/proc/task.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/proc/thread.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ kernel/arch/abs32le/src/userspace.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -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: uspace/app/bdsh/Makefile =================================================================== --- uspace/app/bdsh/Makefile (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/app/bdsh/Makefile (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -48,4 +48,5 @@ cmds/modules/mv/mv.c \ cmds/modules/mount/mount.c \ + cmds/modules/unmount/unmount.c \ cmds/modules/kcon/kcon.c \ cmds/builtins/exit/exit.c \ Index: uspace/app/bdsh/cmds/modules/module_aliases.h =================================================================== --- uspace/app/bdsh/cmds/modules/module_aliases.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/app/bdsh/cmds/modules/module_aliases.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -14,4 +14,5 @@ char *mod_aliases[] = { "ren", "mv", + "umount", "unmount", NULL, NULL }; Index: uspace/app/bdsh/cmds/modules/modules.h =================================================================== --- uspace/app/bdsh/cmds/modules/modules.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/app/bdsh/cmds/modules/modules.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -31,4 +31,5 @@ #include "mv/entry.h" #include "mount/entry.h" +#include "unmount/entry.h" #include "kcon/entry.h" @@ -51,4 +52,5 @@ #include "mv/mv_def.h" #include "mount/mount_def.h" +#include "unmount/unmount_def.h" #include "kcon/kcon_def.h" Index: uspace/app/bdsh/cmds/modules/unmount/entry.h =================================================================== --- uspace/app/bdsh/cmds/modules/unmount/entry.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ uspace/app/bdsh/cmds/modules/unmount/entry.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -0,0 +1,9 @@ +#ifndef UNMOUNT_ENTRY_H +#define UNMOUNT_ENTRY_H + +/* Entry points for the unmount command */ +extern int cmd_unmount(char **); +extern void help_cmd_unmount(unsigned int); + +#endif /* UNMOUNT_ENTRY_H */ + Index: uspace/app/bdsh/cmds/modules/unmount/unmount.c =================================================================== --- uspace/app/bdsh/cmds/modules/unmount/unmount.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ uspace/app/bdsh/cmds/modules/unmount/unmount.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -0,0 +1,76 @@ +/* + * 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. + */ + +#include +#include +#include +#include +#include "config.h" +#include "util.h" +#include "errors.h" +#include "entry.h" +#include "unmount.h" +#include "cmds.h" + +static const char *cmdname = "unmount"; + +/* Dispays help for unmount in various levels */ +void help_cmd_unmount(unsigned int level) +{ + if (level == HELP_SHORT) { + printf("'%s' unmount a file system.\n", cmdname); + } else { + help_cmd_unmount(HELP_SHORT); + printf("Usage: %s \n", cmdname); + } + return; +} + +/* Main entry point for unmount, accepts an array of arguments */ +int cmd_unmount(char **argv) +{ + unsigned int argc; + int rc; + + argc = cli_count_args(argv); + + if (argc != 2) { + printf("%s: invalid number of arguments.\n", + cmdname); + return CMD_FAILURE; + } + + rc = unmount(argv[1]); + if (rc != EOK) { + printf("Unable to unmount %s (rc=%d)\n", argv[1]); + return CMD_FAILURE; + } + + return CMD_SUCCESS; +} + Index: uspace/app/bdsh/cmds/modules/unmount/unmount.h =================================================================== --- uspace/app/bdsh/cmds/modules/unmount/unmount.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ uspace/app/bdsh/cmds/modules/unmount/unmount.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -0,0 +1,8 @@ +#ifndef UNMOUNT_H +#define UNMOUNT_H + +/* Prototypes for the unmount command, excluding entry points */ + + +#endif /* UNMOUNT_H */ + Index: uspace/app/bdsh/cmds/modules/unmount/unmount_def.h =================================================================== --- uspace/app/bdsh/cmds/modules/unmount/unmount_def.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) +++ uspace/app/bdsh/cmds/modules/unmount/unmount_def.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -0,0 +1,14 @@ +{ + "unmount", + "The unmount command", + &cmd_unmount, + &help_cmd_unmount, +}, + +{ + "umount", + NULL, + &cmd_unmount, + &help_cmd_unmount, +}, + Index: uspace/lib/libc/generic/adt/hash_table.c =================================================================== --- uspace/lib/libc/generic/adt/hash_table.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libc/generic/adt/hash_table.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -193,4 +193,24 @@ } +/** Apply fucntion to all items in hash table. + * + * @param h Hash table. + * @param f Function to be applied. + * @param arg Argument to be passed to the function. + */ +void +hash_table_apply(hash_table_t *h, void (*f)(link_t *, void *), void *arg) +{ + hash_index_t bucket; + link_t *cur; + + for (bucket = 0; bucket < h->entries; bucket++) { + for (cur = h->entry[bucket].next; cur != &h->entry[bucket]; + cur = cur->next) { + f(cur, arg); + } + } +} + /** @} */ Index: uspace/lib/libc/generic/vfs/vfs.c =================================================================== --- uspace/lib/libc/generic/vfs/vfs.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libc/generic/vfs/vfs.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -197,4 +197,42 @@ } +int unmount(const char *mp) +{ + ipcarg_t rc; + ipcarg_t rc_orig; + aid_t req; + size_t mpa_size; + char *mpa; + + mpa = absolutize(mp, &mpa_size); + if (!mpa) + return ENOMEM; + + futex_down(&vfs_phone_futex); + async_serialize_start(); + vfs_connect(); + + req = async_send_0(vfs_phone, VFS_IN_UNMOUNT, NULL); + rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size); + if (rc != EOK) { + async_wait_for(req, &rc_orig); + async_serialize_end(); + futex_up(&vfs_phone_futex); + free(mpa); + if (rc_orig == EOK) + return (int) rc; + else + return (int) rc_orig; + } + + + async_wait_for(req, &rc); + async_serialize_end(); + futex_up(&vfs_phone_futex); + free(mpa); + + return (int) rc; +} + static int open_internal(const char *abs, size_t abs_size, int lflag, int oflag) { Index: uspace/lib/libc/include/adt/hash_table.h =================================================================== --- uspace/lib/libc/include/adt/hash_table.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libc/include/adt/hash_table.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -88,4 +88,6 @@ extern void hash_table_remove(hash_table_t *, unsigned long [], hash_count_t); extern void hash_table_destroy(hash_table_t *); +extern void hash_table_apply(hash_table_t *, void (*)(link_t *, void *), + void *); #endif Index: uspace/lib/libc/include/ipc/vfs.h =================================================================== --- uspace/lib/libc/include/ipc/vfs.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libc/include/ipc/vfs.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -86,4 +86,5 @@ VFS_OUT_MOUNTED, VFS_OUT_UNMOUNT, + VFS_OUT_UNMOUNTED, VFS_OUT_SYNC, VFS_OUT_STAT, @@ -100,5 +101,5 @@ * No lookup flags used. */ -#define L_NONE 0 +#define L_NONE 0 /** @@ -107,12 +108,25 @@ * with L_DIRECTORY. */ -#define L_FILE 1 +#define L_FILE 1 /** - * Lookup wil succeed only if the object is a directory. If L_CREATE is + * Lookup will succeed only if the object is a directory. If L_CREATE is * specified, an empty directory will be created. This flag is mutually * exclusive with L_FILE. */ -#define L_DIRECTORY 2 +#define L_DIRECTORY 2 + +/** + * Lookup will succeed only if the object is a root directory. The flag is + * mutually exclusive with L_FILE and L_MP. + */ +#define L_ROOT 4 + +/** + * Lookup will succeed only if the object is a mount point. The flag is mutually + * exclusive with L_FILE and L_ROOT. + */ +#define L_MP 8 + /** @@ -120,15 +134,15 @@ * object already exists. L_EXCLUSIVE is implied when L_DIRECTORY is used. */ -#define L_EXCLUSIVE 4 +#define L_EXCLUSIVE 16 /** * L_CREATE is used for creating both regular files and directories. */ -#define L_CREATE 8 +#define L_CREATE 32 /** * L_LINK is used for linking to an already existing nodes. */ -#define L_LINK 16 +#define L_LINK 64 /** @@ -137,13 +151,13 @@ * VFS_UNLINK. */ -#define L_UNLINK 32 +#define L_UNLINK 128 /** - * L_OPEN is used to indicate that the lookup operation is a part of VFS_OPEN + * L_OPEN is used to indicate that the lookup operation is a part of VFS_IN_OPEN * call from the client. This means that the server might allocate some * resources for the opened file. This flag cannot be passed directly by the * client. */ -#define L_OPEN 64 +#define L_OPEN 256 #endif Index: uspace/lib/libc/include/vfs/vfs.h =================================================================== --- uspace/lib/libc/include/vfs/vfs.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libc/include/vfs/vfs.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -55,4 +55,5 @@ extern int mount(const char *, const char *, const char *, const char *, unsigned int); +extern int unmount(const char *); extern void __stdio_init(int filc, fdi_node_t *filv[]); Index: uspace/lib/libfs/libfs.c =================================================================== --- uspace/lib/libfs/libfs.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libfs/libfs.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -224,4 +224,49 @@ ipc_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer), IPC_GET_ARG3(answer)); +} + +void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *request) +{ + dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request); + fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request); + fs_node_t *fn; + int res; + + res = ops->node_get(&fn, mp_dev_handle, mp_fs_index); + if ((res != EOK) || (!fn)) { + ipc_answer_0(rid, combine_rc(res, ENOENT)); + return; + } + + /* + * We are clearly expecting to find the mount point active. + */ + if (!fn->mp_data.mp_active) { + (void) ops->node_put(fn); + ipc_answer_0(rid, EINVAL); + return; + } + + /* + * Tell the mounted file system to unmount. + */ + res = async_req_1_0(fn->mp_data.phone, VFS_OUT_UNMOUNTED, + fn->mp_data.dev_handle); + + /* + * If everything went well, perform the clean-up on our side. + */ + if (res == EOK) { + ipc_hangup(fn->mp_data.phone); + fn->mp_data.mp_active = false; + fn->mp_data.fs_handle = 0; + fn->mp_data.dev_handle = 0; + fn->mp_data.phone = 0; + /* Drop the reference created in libfs_mount(). */ + (void) ops->node_put(fn); + } + + (void) ops->node_put(fn); + ipc_answer_0(rid, res); } @@ -304,5 +349,16 @@ on_error(rc, goto out_with_answer); - if ((tmp) && (tmp->mp_data.mp_active)) { + /* + * If the matching component is a mount point, there are two + * legitimate semantics of the lookup operation. The first is + * the commonly used one in which the lookup crosses each mount + * point into the mounted file system. The second semantics is + * used mostly during unmount() and differs from the first one + * only in that the last mount point in the looked up path, + * which is also its last component, is not crossed. + */ + + if ((tmp) && (tmp->mp_data.mp_active) && + (!(lflag & L_MP) || (next <= last))) { if (next > last) next = last = first; @@ -475,4 +531,9 @@ goto out; } + + if ((lflag & L_ROOT) && par) { + ipc_answer_0(rid, EINVAL); + goto out; + } out_with_answer: Index: uspace/lib/libfs/libfs.h =================================================================== --- uspace/lib/libfs/libfs.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/lib/libfs/libfs.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -95,4 +95,5 @@ extern void libfs_mount(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *); +extern void libfs_unmount(libfs_ops_t *, ipc_callid_t, ipc_call_t *); extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *); extern void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *); Index: uspace/srv/fs/devfs/devfs.c =================================================================== --- uspace/srv/fs/devfs/devfs.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/devfs/devfs.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -75,4 +75,10 @@ devfs_mount(callid, &call); break; + case VFS_OUT_UNMOUNTED: + devfs_unmounted(callid, &call); + break; + case VFS_OUT_UNMOUNT: + devfs_unmount(callid, &call); + break; case VFS_OUT_LOOKUP: devfs_lookup(callid, &call); Index: uspace/srv/fs/devfs/devfs_ops.c =================================================================== --- uspace/srv/fs/devfs/devfs_ops.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/devfs/devfs_ops.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -434,4 +434,14 @@ } +void devfs_unmounted(ipc_callid_t rid, ipc_call_t *request) +{ + ipc_answer_0(rid, ENOTSUP); +} + +void devfs_unmount(ipc_callid_t rid, ipc_call_t *request) +{ + libfs_unmount(&devfs_libfs_ops, rid, request); +} + void devfs_lookup(ipc_callid_t rid, ipc_call_t *request) { Index: uspace/srv/fs/devfs/devfs_ops.h =================================================================== --- uspace/srv/fs/devfs/devfs_ops.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/devfs/devfs_ops.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -41,4 +41,6 @@ extern void devfs_mounted(ipc_callid_t, ipc_call_t *); extern void devfs_mount(ipc_callid_t, ipc_call_t *); +extern void devfs_unmounted(ipc_callid_t, ipc_call_t *); +extern void devfs_unmount(ipc_callid_t, ipc_call_t *); extern void devfs_lookup(ipc_callid_t, ipc_call_t *); extern void devfs_open_node(ipc_callid_t, ipc_call_t *); Index: uspace/srv/fs/fat/fat.c =================================================================== --- uspace/srv/fs/fat/fat.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/fat/fat.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -100,4 +100,10 @@ fat_mount(callid, &call); break; + case VFS_OUT_UNMOUNTED: + fat_unmounted(callid, &call); + break; + case VFS_OUT_UNMOUNT: + fat_unmount(callid, &call); + break; case VFS_OUT_LOOKUP: fat_lookup(callid, &call); Index: uspace/srv/fs/fat/fat.h =================================================================== --- uspace/srv/fs/fat/fat.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/fat/fat.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -204,4 +204,6 @@ extern void fat_mounted(ipc_callid_t, ipc_call_t *); extern void fat_mount(ipc_callid_t, ipc_call_t *); +extern void fat_unmounted(ipc_callid_t, ipc_call_t *); +extern void fat_unmount(ipc_callid_t, ipc_call_t *); extern void fat_lookup(ipc_callid_t, ipc_call_t *); extern void fat_read(ipc_callid_t, ipc_call_t *); Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/fat/fat_ops.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -1117,4 +1117,14 @@ } +void fat_unmounted(ipc_callid_t rid, ipc_call_t *request) +{ + ipc_answer_0(rid, ENOTSUP); +} + +void fat_unmount(ipc_callid_t rid, ipc_call_t *request) +{ + libfs_unmount(&fat_libfs_ops, rid, request); +} + void fat_lookup(ipc_callid_t rid, ipc_call_t *request) { Index: uspace/srv/fs/tmpfs/tmpfs.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/tmpfs/tmpfs.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -106,4 +106,10 @@ tmpfs_mount(callid, &call); break; + case VFS_OUT_UNMOUNTED: + tmpfs_unmounted(callid, &call); + break; + case VFS_OUT_UNMOUNT: + tmpfs_unmount(callid, &call); + break; case VFS_OUT_LOOKUP: tmpfs_lookup(callid, &call); Index: uspace/srv/fs/tmpfs/tmpfs.h =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/tmpfs/tmpfs.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -83,4 +83,6 @@ extern void tmpfs_mounted(ipc_callid_t, ipc_call_t *); extern void tmpfs_mount(ipc_callid_t, ipc_call_t *); +extern void tmpfs_unmounted(ipc_callid_t, ipc_call_t *); +extern void tmpfs_unmount(ipc_callid_t, ipc_call_t *); extern void tmpfs_lookup(ipc_callid_t, ipc_call_t *); extern void tmpfs_read(ipc_callid_t, ipc_call_t *); Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -147,6 +147,6 @@ hash_table_t nodes; -#define NODES_KEY_INDEX 0 -#define NODES_KEY_DEV 1 +#define NODES_KEY_DEV 0 +#define NODES_KEY_INDEX 1 /* Implementation of hash table interface for the nodes hash table. */ @@ -166,4 +166,22 @@ static void nodes_remove_callback(link_t *item) { + tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t, + nh_link); + + while (!list_empty(&nodep->cs_head)) { + tmpfs_dentry_t *dentryp = list_get_instance(nodep->cs_head.next, + tmpfs_dentry_t, link); + + assert(nodep->type == TMPFS_DIRECTORY); + list_remove(&dentryp->link); + free(dentryp); + } + + if (nodep->data) { + assert(nodep->type == TMPFS_FILE); + free(nodep->data); + } + free(nodep->bp); + free(nodep); } @@ -215,4 +233,19 @@ } +static void tmpfs_instance_done(dev_handle_t dev_handle) +{ + unsigned long key[] = { + [NODES_KEY_DEV] = dev_handle + }; + /* + * Here we are making use of one special feature of our hash table + * implementation, which allows to remove more items based on a partial + * key match. In the following, we are going to remove all nodes + * matching our device handle. The nodes_remove_callback() function will + * take care of resource deallocation. + */ + hash_table_remove(&nodes, key, 1); +} + int tmpfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) { @@ -237,6 +270,6 @@ { unsigned long key[] = { - [NODES_KEY_INDEX] = index, - [NODES_KEY_DEV] = dev_handle + [NODES_KEY_DEV] = dev_handle, + [NODES_KEY_INDEX] = index }; link_t *lnk = hash_table_find(&nodes, key); @@ -296,6 +329,6 @@ /* Insert the new node into the nodes hash table. */ unsigned long key[] = { - [NODES_KEY_INDEX] = nodep->index, - [NODES_KEY_DEV] = nodep->dev_handle + [NODES_KEY_DEV] = nodep->dev_handle, + [NODES_KEY_INDEX] = nodep->index }; hash_table_insert(&nodes, key, &nodep->nh_link); @@ -312,13 +345,13 @@ unsigned long key[] = { - [NODES_KEY_INDEX] = nodep->index, - [NODES_KEY_DEV] = nodep->dev_handle + [NODES_KEY_DEV] = nodep->dev_handle, + [NODES_KEY_INDEX] = nodep->index }; hash_table_remove(&nodes, key, 2); - if (nodep->type == TMPFS_FILE) - free(nodep->data); - free(nodep->bp); - free(nodep); + /* + * The nodes_remove_callback() function takes care of the actual + * resource deallocation. + */ return EOK; } @@ -424,4 +457,5 @@ /* Initialize TMPFS instance. */ if (!tmpfs_instance_init(dev_handle)) { + free(opts); ipc_answer_0(rid, ENOMEM); return; @@ -442,4 +476,5 @@ rootp->lnkcnt); } + free(opts); } @@ -447,4 +482,17 @@ { libfs_mount(&tmpfs_libfs_ops, tmpfs_reg.fs_handle, rid, request); +} + +void tmpfs_unmounted(ipc_callid_t rid, ipc_call_t *request) +{ + dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request); + + tmpfs_instance_done(dev_handle); + ipc_answer_0(rid, EOK); +} + +void tmpfs_unmount(ipc_callid_t rid, ipc_call_t *request) +{ + libfs_unmount(&tmpfs_libfs_ops, rid, request); } @@ -465,6 +513,6 @@ link_t *hlp; unsigned long key[] = { - [NODES_KEY_INDEX] = index, [NODES_KEY_DEV] = dev_handle, + [NODES_KEY_INDEX] = index }; hlp = hash_table_find(&nodes, key); @@ -539,6 +587,6 @@ link_t *hlp; unsigned long key[] = { - [NODES_KEY_INDEX] = index, - [NODES_KEY_DEV] = dev_handle + [NODES_KEY_DEV] = dev_handle, + [NODES_KEY_INDEX] = index }; hlp = hash_table_find(&nodes, key); @@ -603,6 +651,6 @@ link_t *hlp; unsigned long key[] = { - [NODES_KEY_INDEX] = index, - [NODES_KEY_DEV] = dev_handle + [NODES_KEY_DEV] = dev_handle, + [NODES_KEY_INDEX] = index }; hlp = hash_table_find(&nodes, key); @@ -646,6 +694,6 @@ link_t *hlp; unsigned long key[] = { - [NODES_KEY_INDEX] = index, - [NODES_KEY_DEV] = dev_handle + [NODES_KEY_DEV] = dev_handle, + [NODES_KEY_INDEX] = index }; hlp = hash_table_find(&nodes, key); Index: uspace/srv/vfs/vfs.c =================================================================== --- uspace/srv/vfs/vfs.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/vfs/vfs.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -86,4 +86,7 @@ case VFS_IN_MOUNT: vfs_mount(callid, &call); + break; + case VFS_IN_UNMOUNT: + vfs_unmount(callid, &call); break; case VFS_IN_OPEN: Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/vfs/vfs.h (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -181,4 +181,7 @@ extern vfs_node_t *vfs_node_get(vfs_lookup_res_t *); extern void vfs_node_put(vfs_node_t *); +extern void vfs_node_forget(vfs_node_t *); +extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, dev_handle_t); + #define MAX_OPEN_FILES 128 @@ -198,4 +201,5 @@ extern void vfs_register(ipc_callid_t, ipc_call_t *); extern void vfs_mount(ipc_callid_t, ipc_call_t *); +extern void vfs_unmount(ipc_callid_t, ipc_call_t *); extern void vfs_open(ipc_callid_t, ipc_call_t *); extern void vfs_open_node(ipc_callid_t, ipc_call_t *); Index: uspace/srv/vfs/vfs_node.c =================================================================== --- uspace/srv/vfs/vfs_node.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/vfs/vfs_node.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -137,4 +137,24 @@ if (free_vfs_node) free(node); +} + +/** Forget node. + * + * This function will remove the node from the node hash table and deallocate + * its memory, regardless of the node's reference count. + * + * @param node Node to be forgotten. + */ +void vfs_node_forget(vfs_node_t *node) +{ + fibril_mutex_lock(&nodes_mutex); + unsigned long key[] = { + [KEY_FS_HANDLE] = node->fs_handle, + [KEY_DEV_HANDLE] = node->dev_handle, + [KEY_INDEX] = node->index + }; + hash_table_remove(&nodes, key, 3); + fibril_mutex_unlock(&nodes_mutex); + free(node); } @@ -231,4 +251,37 @@ } +struct refcnt_data { + /** Sum of all reference counts for this file system instance. */ + unsigned refcnt; + fs_handle_t fs_handle; + dev_handle_t dev_handle; +}; + +static void refcnt_visitor(link_t *item, void *arg) +{ + vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link); + struct refcnt_data *rd = (void *) arg; + + if ((node->fs_handle == rd->fs_handle) && + (node->dev_handle == rd->dev_handle)) + rd->refcnt += node->refcnt; +} + +unsigned +vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, dev_handle_t dev_handle) +{ + struct refcnt_data rd = { + .refcnt = 0, + .fs_handle = fs_handle, + .dev_handle = dev_handle + }; + + fibril_mutex_lock(&nodes_mutex); + hash_table_apply(&nodes, refcnt_visitor, &rd); + fibril_mutex_unlock(&nodes_mutex); + + return rd.refcnt; +} + /** * @} Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 3698e4420e4bdd79a3251c212fbc1886ecf45436) +++ uspace/srv/vfs/vfs_ops.c (revision 231438126d2f4a823b7106c694ea8eecf2d00e54) @@ -92,5 +92,5 @@ } - rc = vfs_lookup_internal(mp, L_DIRECTORY, &mp_res, NULL); + rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL); if (rc != EOK) { /* The lookup failed for some reason. */ @@ -429,4 +429,141 @@ } +void vfs_unmount(ipc_callid_t rid, ipc_call_t *request) +{ + int rc; + char *mp; + vfs_lookup_res_t mp_res; + vfs_lookup_res_t mr_res; + vfs_node_t *mp_node; + vfs_node_t *mr_node; + int phone; + + /* + * Receive the mount point path. + */ + rc = async_data_string_receive(&mp, MAX_PATH_LEN); + if (rc != EOK) + ipc_answer_0(rid, rc); + + /* + * Taking the namespace lock will do two things for us. First, it will + * prevent races with other lookup operations. Second, it will stop new + * references to already existing VFS nodes and creation of new VFS + * nodes. This is because new references are added as a result of some + * lookup operation or at least of some operation which is protected by + * the namespace lock. + */ + fibril_rwlock_write_lock(&namespace_rwlock); + + /* + * Lookup the mounted root and instantiate it. + */ + rc = vfs_lookup_internal(mp, L_ROOT, &mr_res, NULL); + if (rc != EOK) { + fibril_rwlock_write_unlock(&namespace_rwlock); + free(mp); + ipc_answer_0(rid, rc); + return; + } + mr_node = vfs_node_get(&mr_res); + if (!mr_node) { + fibril_rwlock_write_unlock(&namespace_rwlock); + free(mp); + ipc_answer_0(rid, ENOMEM); + return; + } + + /* + * Count the total number of references for the mounted file system. We + * are expecting at least two. One which we got above and one which we + * got when the file system was mounted. If we find more, it means that + * the file system cannot be gracefully unmounted at the moment because + * someone is working with it. + */ + if (vfs_nodes_refcount_sum_get(mr_node->fs_handle, + mr_node->dev_handle) != 2) { + fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(mr_node); + free(mp); + ipc_answer_0(rid, EBUSY); + return; + } + + if (str_cmp(mp, "/") == 0) { + + /* + * Unmounting the root file system. + * + * In this case, there is no mount point node and we send + * VFS_OUT_UNMOUNTED directly to the mounted file system. + */ + + free(mp); + phone = vfs_grab_phone(mr_node->fs_handle); + rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED, + mr_node->dev_handle); + vfs_release_phone(phone); + if (rc != EOK) { + fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(mr_node); + ipc_answer_0(rid, rc); + return; + } + rootfs.fs_handle = 0; + rootfs.dev_handle = 0; + } else { + + /* + * Unmounting a non-root file system. + * + * We have a regular mount point node representing the parent + * file system, so we delegate the operation to it. + */ + + rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL); + free(mp); + if (rc != EOK) { + fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(mr_node); + ipc_answer_0(rid, rc); + return; + } + vfs_node_t *mp_node = vfs_node_get(&mp_res); + if (!mp_node) { + fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(mr_node); + ipc_answer_0(rid, ENOMEM); + return; + } + + phone = vfs_grab_phone(mp_node->fs_handle); + rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->dev_handle, + mp_node->index); + vfs_release_phone(phone); + if (rc != EOK) { + fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(mp_node); + vfs_node_put(mr_node); + ipc_answer_0(rid, rc); + return; + } + + /* Drop the reference we got above. */ + vfs_node_put(mp_node); + /* Drop the reference from when the file system was mounted. */ + vfs_node_put(mp_node); + } + + + /* + * All went well, the mounted file system was successfully unmounted. + * The only thing left is to forget the unmounted root VFS node. + */ + vfs_node_forget(mr_node); + + fibril_rwlock_write_unlock(&namespace_rwlock); + ipc_answer_0(rid, EOK); +} + void vfs_open(ipc_callid_t rid, ipc_call_t *request) { @@ -454,9 +591,10 @@ /* * Make sure that we are called with exactly one of L_FILE and - * L_DIRECTORY. Make sure that the user does not pass L_OPEN. + * L_DIRECTORY. Make sure that the user does not pass L_OPEN, + * L_ROOT or L_MP. */ if (((lflag & (L_FILE | L_DIRECTORY)) == 0) || ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) || - ((lflag & L_OPEN) != 0)) { + (lflag & (L_OPEN | L_ROOT | L_MP))) { ipc_answer_0(rid, EINVAL); return;