Changeset 857

Timestamp:

Oct 22, 2014, 12:43:10 PM (9 years ago)

Author:

cfuguet

Message:

reconf: modification in softs/lib/io.h header file

• When performing an IO write with the physical address extension, restore the previous extension at the end of the function.

File:

• branches/reconfiguration/softs/libs/io.h (modified) (2 diffs)

branches/reconfiguration/softs/libs/io.h

@@ -22 +22 @@
     uint32_t lsb = paddr & ((1ULL << CLUSTER_OFFSET_BITS)-1);
 
-    asm volatile("mtc2   %2,     $24   \n"  /* DATA_PADDR_EXT <= msb */
+    asm volatile("mfc2   $8,     $24   \n"  /* t0 <= DATA_PADDR_EXT  */
+                 "mtc2   %2,     $24   \n"  /* DATA_PADDR_EXT <= msb */
                  "lw     %0,     0(%1) \n"  /* value <= *paddr       */
-                 "mtc2   $0,     $24   \n"  /* DATA_PADDR_EXT <= 0   */
+                 "mtc2   $8,     $24   \n"  /* DATA_PADDR_EXT <= 0   */
                  : "=r"(value)
                  : "r"(lsb), "r"(msb)
-                 : "memory");
+                 : "$8", "memory");
 
     return value;
@@ -42 +43 @@
     uint32_t lsb = paddr & ((1ULL << CLUSTER_OFFSET_BITS)-1);
 
-    asm volatile("mtc2   %2,     $24   \n"  /* DATA_PADDR_EXT <= msb */
+    asm volatile("mfc2   $8,     $24   \n"  /* t0 <= DATA_PADDR_EXT  */
+                 "mtc2   %2,     $24   \n"  /* DATA_PADDR_EXT <= msb */
                  "sw     %0,     0(%1) \n"  /* value <= *paddr       */
-                 "mtc2   $0,     $24   \n"  /* DATA_PADDR_EXT <= 0   */
+                 "mtc2   $8,     $24   \n"  /* DATA_PADDR_EXT <= 0   */
                  "sync                 \n"
                  : /* no outputs */
                  : "r"(value), "r"(lsb), "r"(msb)
-                 : "memory");
+                 : "$8", "memory");
 }