From 29c054df817d55ae6e0fc3bd4c9e2343a2b4ca75 Mon Sep 17 00:00:00 2001
From: Austin Clements <amdragon@mit.edu>
Date: Tue, 31 Aug 2010 17:07:54 -0400
Subject: [PATCH] We don't use lesp/lebp and using them at all from C would be
fraught with peril. Keep resp/rebp, but fix their code style.
---
x86.h | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/x86.h b/x86.h
index 1f903b2..33e240d 100644
--- a/x86.h
+++ b/x86.h
@@ -96,24 +96,16 @@ loadgs(ushort v)
asm volatile("movw %0, %%gs" : : "r" (v));
}
-static inline void lebp(uint val)
-{
- asm volatile("movl %0,%%ebp" : : "r" (val));
-}
-
-static inline uint rebp(void)
+static inline uint
+rebp(void)
{
uint val;
asm volatile("movl %%ebp,%0" : "=r" (val));
return val;
}
-static inline void lesp(uint val)
-{
- asm volatile("movl %0,%%esp" : : "r" (val));
-}
-
-static inline uint resp(void)
+static inline uint
+resp(void)
{
uint val;
asm volatile("movl %%esp,%0" : "=r" (val));
@@ -132,13 +124,6 @@ sti(void)
asm volatile("sti");
}
-static inline void
-nop_pause(void)
-{
- asm volatile("pause" : :);
-}
-
-//PAGEBREAK!
static inline uint
xchg(volatile uint *addr, uint newval)
{
@@ -152,6 +137,13 @@ xchg(volatile uint *addr, uint newval)
return result;
}
+static inline void
+nop_pause(void)
+{
+ asm volatile("pause" : :);
+}
+
+//PAGEBREAK!
static inline void
lcr0(uint val)
{
--
GitLab