WebSVN – HelenOS – Diff – /branches/arm/kernel/arch/arm32/src/arm32.c

 /*
  * Copyright (c) 2007 Michal Kebrt
  * 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 arm32
  * @{
  */
 /** @file
  */
 #include <arch.h>
 #include <arch/boot.h>
 #include <config.h>
 #include <arch/console.h>
 #include <ddi/device.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
 #include <ddi/irq.h>
 #include <arch/debug/print.h>
 #include <print.h>
 #include <config.h>
 #include <interrupt.h>
 #include <arch/regutils.h>
 #include <arch/machine.h>
 #include <userspace.h>
 bootinfo_t bootinfo;
 extern uintptr_t supervisor_sp;
 void arch_pre_main(void)
+{
     int i;
     init.cnt = bootinfo.cnt;
     for (i = 0; i < bootinfo.cnt; ++i) {
         init.tasks[i].addr = bootinfo.tasks[i].addr;
         init.tasks[i].size = bootinfo.tasks[i].size;
+    }
+}
 void arch_pre_mm_init(void)
+{
     /* It is not assumed by default */
     interrupts_disable();
+}
 void arch_post_mm_init(void)
+{
     machine_hw_map_init();
     /* Initialize dispatch table */
     exception_init();
     interrupt_init();
     console_init(device_assign_devno());
 #ifdef CONFIG_FB
     fb_init(machine_get_fb_address(), 640, 480, 1920, VISUAL_RGB_8_8_8);
 #endif
+}
 void arch_post_cpu_init(void)
+{
+}
 void arch_pre_smp_init(void)
+{
     /* TODO */
+}
 void arch_post_smp_init(void)
+{
     /* TODO */
+}
 /** Perform arm32 specific tasks needed before the new task is run. */
 void before_task_runs_arch(void)
+{
     tlb_invalidate_all();
+}
 /** Perform arm32 specific tasks needed before the new thread is scheduled. */
 void before_thread_runs_arch(void)
+{
     supervisor_sp = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+}
 void after_thread_ran_arch(void)
+{
+}
-/** Struct to hold general purpose register values */
-typedef struct {
-    uint32_t r0;
-    uint32_t r1;
-    uint32_t r2;
-    uint32_t r3;
-    uint32_t r4;
-    uint32_t r5;
-    uint32_t r6;
-    uint32_t r7;
-    uint32_t r8;
-    uint32_t r9;
-    uint32_t r10;
-    uint32_t r11;
-    uint32_t r12;
-    uint32_t sp;
-    uint32_t lr;
-    uint32_t pc;
-} ustate_t;
-/** Changes processor mode and jumps to the address specified in the first parameter.
- *
- *  @param kernel_uarg   Userspace settings (entry point, stack, ...).
- */
-void userspace(uspace_arg_t *kernel_uarg)
-{
-    // dprintf("Userspace:  .uspace_uarg(%X), .uspace_entry(%X), .uspace_stack(%X)\n",
-    //  (unsigned int)(kernel_uarg->uspace_uarg), kernel_uarg->uspace_entry,
-    //  kernel_uarg->uspace_stack);
-    volatile ustate_t ustate;
-    // set first parameter
-    ustate.r0 = (uintptr_t) kernel_uarg->uspace_uarg;
-    // clear other registers
-    ustate.r1 = ustate.r2  = ustate.r3  = ustate.r4  =
-        ustate.r5 = ustate.r6  = ustate.r7  = ustate.r8  =
-        ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 = 1;
-    ustate.lr = 3;
-    //set user stack
-    ustate.sp = ((uint32_t)kernel_uarg->uspace_stack) +
-            PAGE_SIZE - sizeof(void*);
-    //on the bottom of stack there is pointer to TLS
-    //set where uspace execution starts
-    ustate.pc = (uintptr_t) kernel_uarg->uspace_entry;
-    //status register in user mode
-    ipl_t cpsr = current_status_reg_read();
-    cpsr &= ~STATUS_REG_MODE_MASK | USER_MODE;
-    ipl_t tmpsr = (cpsr & ~STATUS_REG_MODE_MASK) | SUPERVISOR_MODE;
-    asm __volatile__ (
-        // save pointer into ustate struct
-        "mov r0, %0         \n"
-        // save cspr
-        "mov r1, %1         \n"
-        // change mode into any exception mode
-        "msr cpsr_c, %2         \n"
-        // set saved cpsr
-        "msr spsr_c, r1 \n"
-        "mov sp, r0 \n"
-        // replace almost all registers
-        "ldmfd sp!, {r0-r12, sp, lr}^\n"
-        //jump to the usermode
-        "ldmfd sp!, {pc}^"
-    : // no output
-    : "r"(&ustate), "r"(cpsr), "r"(tmpsr) //
-    : "r0","r1"
-    );
-    while(1) ;
-}
 void cpu_halt(void)
+{
     machine_cpu_halt();
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/arm/kernel/arch/arm32/src/arm32.c – Rev 2360 → 2362