Changeset b5ed4f8 in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2008-02-05T14:48:26Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b5f9fa

Parents:

b07c332

Message:

convert ARC specific commands to generic ones

File:

• kernel/arch/mips32/src/mips32.c (modified) (2 diffs)

kernel/arch/mips32/src/mips32.c

@@ -142 +142 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        /* EXL=1, UM=1, IE=1 */
+        /* 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_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)
-                ;
+        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + PAGE_SIZE), 
+                (uintptr_t) kernel_uarg->uspace_uarg,
+                (uintptr_t) kernel_uarg->uspace_entry);
+        
+        while (1);
 }
 
@@ -181 +180 @@
 void arch_reboot(void)
 {
-        ___halt();
+        if (!arc_reboot())
+                ___halt();
+        
         while (1);
 }