Changeset f2ef7fd in mainline for kernel/arch/ia32/include

Timestamp:

2008-10-05T21:20:13Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6198611

Parents:

1d132ae

Message:

Support for SYSENTER on ia32.

Location:

kernel/arch/ia32/include

Files:

• asm.h (modified) (1 diff)
• cpu.h (modified) (2 diffs)
• syscall.h (added)

kernel/arch/ia32/include/asm.h

@@ -248 +248 @@
 }
 
+/** Write to MSR */
+static inline void write_msr(uint32_t msr, uint64_t value)
+{
+        asm volatile ("wrmsr" : : "c" (msr), "a" ((uint32_t)(value)),
+            "d" ((uint32_t)(value >> 32)));
+}
+
+static inline uint64_t read_msr(uint32_t msr)
+{
+        uint32_t ax, dx;
+
+        asm volatile ("rdmsr" : "=a"(ax), "=d"(dx) : "c" (msr));
+        return ((uint64_t)dx << 32) | ax;
+}
+
+
 /** Return base address of current stack
  *

kernel/arch/ia32/include/cpu.h

@@ -36 +36 @@
 #define KERN_ia32_CPU_H_
 
+#define EFLAGS_IF       (1 << 9)
+#define EFLAGS_RF       (1 << 16)
+
+#define CR4_OSFXSR_MASK (1<<9)
+
+/* Support for SYSENTER and SYSEXIT */
+#define IA32_MSR_SYSENTER_CS    0x174
+#define IA32_MSR_SYSENTER_ESP   0x175
+#define IA32_MSR_SYSENTER_EIP   0x176
+
+#ifndef __ASM__
+
 #include <arch/pm.h>
 #include <arch/asm.h>
-
-#define EFLAGS_IF       (1 << 9)
-#define EFLAGS_RF       (1 << 16)
 
 typedef struct {
@@ -52 +61 @@
 } cpu_arch_t;
 
-
-#define CR4_OSFXSR_MASK (1<<9)
+#endif
 
 #endif