WebSVN – HelenOS – Diff – /branches/dd/kernel/arch/mips32/src/mips32.c

  */
 /** @file
  */
 #include <arch.h>
-#include <arch/boot.h>
 #include <arch/cp0.h>
 #include <arch/exception.h>
 #include <mm/as.h>
 #include <userspace.h>
 #include <print.h>
 #include <syscall/syscall.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/interrupt.h>
-#include <arch/drivers/arc.h>
 #include <console/chardev.h>
+#include <arch/barrier.h>
 #include <arch/debugger.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
 #include <macros.h>
 #include <ddi/device.h>
+#include <config.h>
+#include <string.h>
+#include <arch/drivers/msim.h>
 #include <arch/asm/regname.h>
 /* Size of the code jumping to the exception handler code
  * - J+NOP
  */
-#define EXCEPTION_JUMP_SIZE    8
+#define EXCEPTION_JUMP_SIZE  8
-#define TLB_EXC ((char *) 0x80000000)
+#define TLB_EXC    ((char *) 0x80000000)
-#define NORM_EXC ((char *) 0x80000180)
+#define NORM_EXC   ((char *) 0x80000180)
-#define CACHE_EXC ((char *) 0x80000100)
+#define CACHE_EXC  ((char *) 0x80000100)
 /* Why the linker moves the variable 64K away in assembler
- * when not in .text section ????????
+ * when not in .text section?
  */
-uintptr_t supervisor_sp __attribute__ ((section (".text")));
 /* Stack pointer saved when entering user mode */
-/* TODO: How do we do it on SMP system???? */
-bootinfo_t bootinfo __attribute__ ((section (".text")));
+uintptr_t supervisor_sp __attribute__ ((section (".text")));
+count_t cpu_count = 0;
+/** Performs mips32-specific initialization before main_bsp() is called. */
-void arch_pre_main(void)
+void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
+{
     /* Setup usermode */
-    init.cnt = bootinfo.cnt;
+    init.cnt = bootinfo->cnt;
-    uint32_t i;
+    count_t i;
+    for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
+        init.tasks[i].addr = bootinfo->tasks[i].addr;
+        init.tasks[i].size = bootinfo->tasks[i].size;
+        strncpy(init.tasks[i].name, bootinfo->tasks[i].name,
+            CONFIG_TASK_NAME_BUFLEN);
+    }
-    for (i = 0; i < bootinfo.cnt; i++) {
+    for (i = 0; i < CPUMAP_MAX_RECORDS; i++) {
-        init.tasks[i].addr = bootinfo.tasks[i].addr;
+        if ((bootinfo->cpumap & (1 << i)) != 0)
-        init.tasks[i].size = bootinfo.tasks[i].size;
+            cpu_count++;
+    }
+}
 void arch_pre_mm_init(void)
+{
     /* It is not assumed by default */
     interrupts_disable();
     /* Initialize dispatch table */
     exception_init();
-    arc_init();
     /* Copy the exception vectors to the right places */
     memcpy(TLB_EXC, (char *) tlb_refill_entry, EXCEPTION_JUMP_SIZE);
+    smc_coherence_block(TLB_EXC, EXCEPTION_JUMP_SIZE);
     memcpy(NORM_EXC, (char *) exception_entry, EXCEPTION_JUMP_SIZE);
+    smc_coherence_block(NORM_EXC, EXCEPTION_JUMP_SIZE);
     memcpy(CACHE_EXC, (char *) cache_error_entry, EXCEPTION_JUMP_SIZE);
+    smc_coherence_block(CACHE_EXC, EXCEPTION_JUMP_SIZE);
     /*
-     * Switch to BEV normal level so that exception vectors point to the kernel.
+     * Switch to BEV normal level so that exception vectors point to the
-     * Clear the error level.
+     * kernel. Clear the error level.
      */
+    cp0_status_write(cp0_status_read() &
-    cp0_status_write(cp0_status_read() & ~(cp0_status_bev_bootstrap_bit|cp0_status_erl_error_bit));
+        ~(cp0_status_bev_bootstrap_bit | cp0_status_erl_error_bit));
     /*
      * Mask all interrupts
      */
     cp0_mask_all_int();
     debugger_init();
+}
 void arch_post_mm_init(void)
+{
     interrupt_init();
-    console_init(device_assign_devno());
+    msim_console(device_assign_devno());
 #ifdef CONFIG_FB
+    /* GXemul framebuffer */
+    fb_properties_t gxemul_prop = {
+        .addr = 0x12000000,
+        .offset = 0,
+        .x = 640,
+        .y = 480,
+        .scan = 1920,
+        .visual = VISUAL_BGR_8_8_8,
+    };
+    fb_init(&gxemul_prop);
+#endif
+#ifdef MACHINE_msim
+    sysinfo_set_item_val("machine.msim", NULL, 1);
+#endif
+#ifdef MACHINE_simics
+    sysinfo_set_item_val("machine.simics", NULL, 1);
+#endif
+#ifdef MACHINE_bgxemul
-    fb_init(0x12000000, 640, 480, 1920, VISUAL_RGB_8_8_8); // gxemul framebuffer
+    sysinfo_set_item_val("machine.bgxemul", NULL, 1);
+#endif
+#ifdef MACHINE_lgxemul
+    sysinfo_set_item_val("machine.lgxemul", NULL, 1);
 #endif
-    sysinfo_set_item_val("machine." STRING(MACHINE), NULL, 1);
+}
 void arch_post_cpu_init(void)
+{
+}
 void arch_post_smp_init(void)
+{
+}
+void calibrate_delay_loop(void)
+{
+}
 void userspace(uspace_arg_t *kernel_uarg)
+{
     /* EXL = 1, UM = 1, IE = 1 */
     cp0_status_write(cp0_status_read() | (cp0_status_exl_exception_bit |
         cp0_status_um_bit | cp0_status_ie_enabled_bit));
     cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
     userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + PAGE_SIZE),
         (uintptr_t) kernel_uarg->uspace_uarg,
         (uintptr_t) kernel_uarg->uspace_entry);
     while (1);
+}
 /** Perform mips32 specific tasks needed before the new task is run. */
+}
 /** Perform mips32 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];
+    supervisor_sp = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
+        SP_DELTA];
+}
 void after_thread_ran_arch(void)
+{
+}
     return 0;
+}
 void arch_reboot(void)
+{
-    if (!arc_reboot())
-        ___halt();
+    ___halt();
     while (1);
+}
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/kernel/arch/mips32/src/mips32.c – Rev 3022 → 4055