update

[l4.git] / kernel / fiasco / src / drivers / arm / processor-arm.cpp

diff --git a/kernel/fiasco/src/drivers/arm/processor-arm.cpp b/kernel/fiasco/src/drivers/arm/processor-arm.cpp
index 2dcfdd16950c609f5d82422b51dcfc8054b86c13..7d592fff84007ee4f152bfcb23e9cfd02b524db9 100644 (file)
--- a/kernel/fiasco/src/drivers/arm/processor-arm.cpp
+++ b/kernel/fiasco/src/drivers/arm/processor-arm.cpp
@@ -75,7 +75,8 @@ void Proc::stack_pointer(Mword sp)
 IMPLEMENT static inline
 Mword Proc::program_counter()
 {
-  register Mword pc asm ("pc");
+  Mword pc;
+  asm ("mov %0, pc" : "=r" (pc));
   return pc;
 }
 
@@ -91,7 +92,7 @@ void Proc::cli()
                : "memory");
 }
 
-IMPLEMENT static inline
+IMPLEMENT static inline ALWAYS_INLINE
 void Proc::sti()
 {
   Mword v;
@@ -103,7 +104,7 @@ void Proc::sti()
                : "memory");
 }
 
-IMPLEMENT static inline
+IMPLEMENT static inline ALWAYS_INLINE
 Proc::Status Proc::cli_save()
 {
   Status ret;
@@ -125,7 +126,7 @@ Proc::Status Proc::interrupts()
   return !(ret & Sti_mask);
 }
 
-IMPLEMENT static inline
+IMPLEMENT static inline ALWAYS_INLINE
 void Proc::sti_restore(Status st)
 {
   if (!(st & Sti_mask))