Changeset 268 for soft/giet_vm

Timestamp:

Jan 13, 2014, 3:21:42 PM (11 years ago)

Author:

cfuguet

Message:

Using the CP0 $4,2 register for the scheduler virtual address
instead of the CP0 $22 register

Location:

soft/giet_vm/giet_common

Files:

• mips32_registers.h (modified) (1 diff)
• utils.c (modified) (14 diffs)
• utils.h (modified) (1 diff)

soft/giet_vm/giet_common/mips32_registers.h

@@ -53 +53 @@
 #define CP0_EPC        $14
 #define CP0_PROCID     $15,1
-#define CP0_SCHED      $22,0
-#define CP0_SCHED_EXT  $22,1
+#define CP0_SCHED      $4,2
 
 /* CP2 registers */

soft/giet_vm/giet_common/utils.c

@@ -103 +103 @@
 {
     unsigned int ret;
-    asm volatile( "mfc0    %0,   $22    \n" : "=r"(ret) );
+    asm volatile("mfc0      %0,     $4, 2\n" : "=r"(ret) );
     return ret;
 }
@@ -112 +112 @@
 {
     unsigned int ret;
-    asm volatile( "mfc2    %0,        $0" : "=r"(ret));
+    asm volatile("mfc2      %0,     $0" : "=r"(ret));
     return ret;
 }
@@ -121 +121 @@
 {
     unsigned int ret;
-    asm volatile("mfc0    %0,        $14" : "=r"(ret));
+    asm volatile("mfc0      %0,     $14" : "=r"(ret));
     return ret;
 }
@@ -130 +130 @@
 {
     unsigned int ret;
-    asm volatile( "mfc0    %0,        $8" : "=r"(ret));
+    asm volatile("mfc0      %0,     $8" : "=r"(ret));
     return ret;
 }
@@ -139 +139 @@
 {
     unsigned int ret;
-    asm volatile("mfc0    %0,        $13" : "=r"(ret));
+    asm volatile("mfc0      %0,     $13" : "=r"(ret));
     return ret;
 }
@@ -148 +148 @@
 {
     unsigned int ret;
-    asm volatile( "mfc0    %0,        $12" : "=r"(ret));
+    asm volatile("mfc0      %0,     $12" : "=r"(ret));
     return ret;
 }
@@ -156 +156 @@
 inline void _set_sr(unsigned int val) 
 {
-    asm volatile( "mtc0    %0,        $12" ::"r" (val));
+    asm volatile("mtc0      %0,     $12" ::"r" (val));
 }
 //////////////////////////////////////////////////////////////////////////////////
@@ -164 +164 @@
 {
     unsigned int ret;
-    asm volatile ("mfc0    %0,       $15, 1":"=r" (ret));
+    asm volatile ("mfc0     %0,     $15, 1":"=r" (ret));
     return (ret & 0x3FF);
 }
@@ -174 +174 @@
 {
     unsigned int ret;
-    asm volatile ("mfc0   %0,        $9":"=r" (ret));
+    asm volatile ("mfc0     %0,     $9":"=r" (ret));
     return ret;
 }
@@ -216 +216 @@
 inline void _set_mmu_ptpr(unsigned int val) 
 {
-    asm volatile ("mtc2  %0, $0"::"r" (val));
+    asm volatile ("mtc2     %0,     $0"::"r" (val));
 }
 //////////////////////////////////////////////////////////////////////////////
@@ -223 +223 @@
 inline void _set_mmu_mode(unsigned int val) 
 {
-    asm volatile ("mtc2  %0, $1"::"r" (val));
+    asm volatile ("mtc2     %0,     $1"::"r" (val));
 }
 //////////////////////////////////////////////////////////////////////////////
@@ -231 +231 @@
 inline void _set_sched(unsigned int val) 
 {
-    asm volatile ("mtc0  %0, $22"::"r" (val));
+    asm volatile ("mtc0     %0,     $4, 2"::"r" (val));
 }
 
@@ -300 +300 @@
 {
     register unsigned int delay = ( _get_proctime() ^ _get_procid() << 4) & 0xFF;
+
+    if (delay == 0) delay++;
 
     asm volatile (
@@ -312 +314 @@
             "_lock_loop:             \n"
             "addi $4,    $4,    -1   \n" /* $4 <= $4 - 1 */
-            "beqz $4,    _lock_loop  \n" /* test end delay */
+            "bnez $4,    _lock_loop  \n" /* test end delay */
+            "nop                     \n"
             "j           _lock_llsc  \n" /* retry */
+            "nop                     \n"
             "_lock_ok:               \n"
             :

soft/giet_vm/giet_common/utils.h

@@ -116 +116 @@
 extern void         _set_mmu_mode(unsigned int value);
 extern void         _set_sched(unsigned int value);
+extern void         _set_sr(unsigned int value);
 
 ///////////////////////////////////////////////////////////////////////////////////