Changeset 0f17bff in mainline for kernel/arch/ia32/include/arch/asm.h

Timestamp:

2016-05-05T08:34:45Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

811770c

Parents:

4b0206c

Message:

Replace magic numbers with macros

File:

• kernel/arch/ia32/include/arch/asm.h (modified) (4 diffs)

kernel/arch/ia32/include/arch/asm.h

@@ -87 +87 @@
 GEN_WRITE_REG(cr3)
 
+GEN_WRITE_REG(cr0)
+
 GEN_READ_REG(dr0)
 GEN_READ_REG(dr1)
@@ -232 +234 @@
 }
 
-/** Enable interrupts.
- *
- * Enable interrupts and return previous
- * value of EFLAGS.
- *
- * @return Old interrupt priority level.
- *
- */
-NO_TRACE static inline ipl_t interrupts_enable(void)
-{
-        ipl_t v;
-        
+NO_TRACE static inline uint32_t read_eflags(void)
+{
+        uint32_t eflags;
+
         asm volatile (
                 "pushf\n"
                 "popl %[v]\n"
-                "sti\n"
-                : [v] "=r" (v)
-        );
-        
-        return v;
+                : [v] "=r" (eflags)
+        );
+        
+        return eflags;
+}
+
+NO_TRACE static inline void write_eflags(uint32_t eflags)
+{
+        asm volatile (
+                "pushl %[v]\n"
+                "popf\n"
+                :: [v] "r" (eflags)
+        );
+}
+
+/** Return interrupt priority level.
+ *
+ * @return Current interrupt priority level.
+ */
+NO_TRACE static inline ipl_t interrupts_read(void)
+{
+        return (ipl_t) read_eflags();
+}
+
+/** Enable interrupts.
+ *
+ * Enable interrupts and return the previous interrupt priority level.
+ *
+ * @return Old interrupt priority level.
+ */
+NO_TRACE static inline ipl_t interrupts_enable(void)
+{
+        ipl_t ipl = interrupts_read();
+        
+        asm volatile ("sti\n");
+        
+        return ipl;
 }
 
 /** Disable interrupts.
  *
- * Disable interrupts and return previous
- * value of EFLAGS.
+ * Disable interrupts and return the previous interrupt priority level.
  *
  * @return Old interrupt priority level.
- *
  */
 NO_TRACE static inline ipl_t interrupts_disable(void)
 {
-        ipl_t v;
-        
-        asm volatile (
-                "pushf\n"
-                "popl %[v]\n"
-                "cli\n"
-                : [v] "=r" (v)
-        );
-        
-        return v;
+        ipl_t ipl = interrupts_read();
+        
+        asm volatile ("cli\n");
+        
+        return ipl;
 }
 
 /** Restore interrupt priority level.
  *
- * Restore EFLAGS.
+ * Restore a saved interrupt priority level.
  *
  * @param ipl Saved interrupt priority level.
@@ -285 +304 @@
 NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
-        asm volatile (
-                "pushl %[ipl]\n"
-                "popf\n"
-                :: [ipl] "r" (ipl)
-        );
-}
-
-/** Return interrupt priority level.
- *
- * @return EFLAFS.
- *
- */
-NO_TRACE static inline ipl_t interrupts_read(void)
-{
-        ipl_t v;
-        
-        asm volatile (
-                "pushf\n"
-                "popl %[v]\n"
-                : [v] "=r" (v)
-        );
-        
-        return v;
+        write_eflags((uint32_t) ipl);
 }
 
@@ -317 +314 @@
 NO_TRACE static inline bool interrupts_disabled(void)
 {
-        ipl_t v;
-        
-        asm volatile (
-                "pushf\n"
-                "popl %[v]\n"
-                : [v] "=r" (v)
-        );
-        
-        return ((v & EFLAGS_IF) == 0);
+        return ((read_eflags() & EFLAGS_IF) == 0);
 }