Changeset 096d4a6b in mainline

Timestamp:

2012-03-11T19:29:38Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

914e063

Parents:

7c13c55

Message:

arm32: Register for enabling high exc. vector moved in armv7

File:

• kernel/arch/arm32/src/exception.c (modified) (1 diff)

kernel/arch/arm32/src/exception.c

@@ -120 +120 @@
 static void high_vectors(void)
 {
-        uint32_t control_reg;
-        
+        register uint32_t control_reg = 0;
+        
+#if defined(PROCESSOR_armv7)
+        asm volatile (
+                "mrc p15, 0, %[control_reg], c1, c0"
+                : [control_reg] "=r" (control_reg)
+        );
+#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
                 "mrc p15, 0, %[control_reg], c1, c1"
                 : [control_reg] "=r" (control_reg)
         );
+#endif
         
         /* switch on the high vectors bit */
         control_reg |= CP15_R1_HIGH_VECTORS_BIT;
         
-        asm volatile (
-                "mcr p15, 0, %[control_reg], c1, c1"
+#if defined(PROCESSOR_armv7)
+        asm volatile (
+                "mcr p15, 0, %[control_reg], c1, c0"
                 :: [control_reg] "r" (control_reg)
         );
+#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
+        asm volatile (
+                "mcr p15, 0, %[control_reg], c1, c0"
+                :: [control_reg] "r" (control_reg)
+        );
+#endif
 }
 #endif