Changeset 021d471 in mainline

Timestamp:

2006-02-06T15:56:40Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b9f195

Parents:

f5935ed

Message:

Added MIPS userspace. Currently can't make it work in gxemul.

Files:

• arch/mips32/include/asm/regname.h (modified) (2 diffs)
• arch/mips32/src/exception.c (modified) (3 diffs)
• arch/mips32/src/mips32.c (modified) (3 diffs)
• contrib/conf/msim.conf (modified) (1 diff)
• contrib/conf/spmips.conf (modified) (2 diffs)
• generic/src/main/kinit.c (modified) (2 diffs)

arch/mips32/include/asm/regname.h

@@ -63 +63 @@
 #define ra      31
 
-#define index           0
-#define random          1
+#define rindex          0
+#define rrandom         1
 #define entrylo0        2
 #define entrylo1        3
@@ -77 +77 @@
 #define cause           13
 #define epc             14
-#define config          16
+#define rconfig         16
 #define lladdr          17
 #define watchlo         18
 #define watchhi         19
 #define xcontext        20
-#define debug           23
+#define rdebug          23
 #define depc            24
 #define eepc            30

arch/mips32/src/exception.c

@@ -41 +41 @@
 #include <console/kconsole.h>
 #include <arch/debugger.h>
+#include <syscall/syscall.h>
 
 static char * exctable[] = {
@@ -135 +136 @@
 }
 
+#include <debug.h>
+/** Handle syscall userspace call */
+static void syscall_exception(int n, void *data)
+{
+        struct exception_regdump *pstate = (struct exception_regdump *)data;
+        
+        if (pstate->a3 < SYSCALL_END)
+                pstate->v0 = syscall_table[pstate->a3](pstate->a0,
+                                                       pstate->a1,
+                                                       pstate->a2);
+        else
+                panic("Undefined syscall %d", pstate->a3);
+        pstate->epc += 4;
+}
+
 
 void exception(struct exception_regdump *pstate)
@@ -191 +207 @@
         exc_register(EXC_CpU, "cpunus", cpuns_exception);
 #endif
-}
+        exc_register(EXC_Sys, "syscall", syscall_exception);
+}

arch/mips32/src/mips32.c

@@ -96 +96 @@
         arc_print_memory_map();
         arc_print_devices();
+
+        /* Setup usermode...*/
+        config.init_addr = 0x20000000;
+        config.init_size = FRAME_SIZE;
 }
 
@@ -110 +114 @@
 }
 
+/* Stack pointer saved when entering user mode */
+/* TODO: How do we do it on SMP system???? */
+
+/* Why the hell moves the linker the variable 64K away in assembler
+ * when not in .text section ????????
+ */
+__address supervisor_sp __attribute__ ((section (".text")));
+
 void userspace(void)
 {
@@ -123 +135 @@
 }
 
-/* Stack pointer saved when entering user mode */
-/* TODO: How do we do it on SMP system???? */
-__address supervisor_sp;
-
 void before_thread_runs_arch(void)
 {

contrib/conf/msim.conf

@@ -8 +8 @@
 add rwm mainmem         0x00100000      16M     load "kernel.bin"
 add rom startmem        0x1fc00000      1k      load "load.bin" 
-add rwm init            0x00110000      64k     load "init"
+add rwm init            0x20000000      1M      load "init
 
 add dprinter printer 0x10000000

contrib/conf/spmips.conf

@@ -22 +22 @@
               (0x180003fe,      tty0,         0,            6,          1),
               (0x180003ff,      tty0,         0,            7,          1),
-              (0x1c000000,      hfs0,         0,            0,         16))
+              (0x1c000000,      hfs0,         0,            0,         16),
+              (0x20000000,      initmem0,     0,            0,  0x20000))
 }
 
@@ -37 +38 @@
         size: 0x08000000
 }
+
+OBJECT initmem0 TYPE ram {
+        image: initmem0-image
+}
+OBJECT initmem0-image TYPE image {
+        queue: cpu0
+        size: 0x20000
+        files: (("../../../uspace/init/init", "ro", 0,0))
+}
+
 OBJECT rom0 TYPE rom {
         image: rom0-image

generic/src/main/kinit.c

@@ -145 +145 @@
                  */
                 
-                if (KA2PA(config.init_addr) % FRAME_SIZE)
+                if (config.init_addr % FRAME_SIZE)
                         panic("config.init_addr is not frame aligned");
                 
@@ -162 +162 @@
                  */
                 
-                frame = KA2PA(config.init_addr);
+                frame = config.init_addr;
+                if (IS_KA(frame))
+                        frame = KA2PA(frame);
+
                 frames = config.init_size / FRAME_SIZE;
                 if (config.init_size % FRAME_SIZE > 0)