summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <[email protected]>2011-09-02 14:52:13 -0400
committerAustin Clements <[email protected]>2011-09-02 14:52:13 -0400
commit30c1901a5a6beaac2ede35bb2a7505690bda9590 (patch)
tree335798632050a9f3532962a598d57c4630a8b5c0
parentdd4438b4fe934eef3f631238d45b3681a3abdd4d (diff)
downloadxv6-labs-30c1901a5a6beaac2ede35bb2a7505690bda9590.tar.gz
xv6-labs-30c1901a5a6beaac2ede35bb2a7505690bda9590.tar.bz2
xv6-labs-30c1901a5a6beaac2ede35bb2a7505690bda9590.zip
Remove unused x86.h definitions
-rw-r--r--x86.h62
1 files changed, 0 insertions, 62 deletions
diff --git a/x86.h b/x86.h
index 503afdb..3949900 100644
--- a/x86.h
+++ b/x86.h
@@ -106,46 +106,6 @@ loadgs(ushort v)
}
static inline void
-loadfs(ushort v)
-{
- __asm volatile("movw %0, %%fs" : : "r" (v));
-}
-
-static inline void
-loades(ushort v)
-{
- __asm volatile("movw %0, %%es" : : "r" (v));
-}
-
-static inline void
-loadds(ushort v)
-{
- __asm volatile("movw %0, %%ds" : : "r" (v));
-}
-
-static inline void
-loadss(ushort v)
-{
- __asm volatile("movw %0, %%ss" : : "r" (v));
-}
-
-static inline uint
-rebp(void)
-{
- uint val;
- asm volatile("movl %%ebp,%0" : "=r" (val));
- return val;
-}
-
-static inline uint
-resp(void)
-{
- uint val;
- asm volatile("movl %%esp,%0" : "=r" (val));
- return val;
-}
-
-static inline void
cli(void)
{
asm volatile("cli");
@@ -170,20 +130,6 @@ xchg(volatile uint *addr, uint newval)
return result;
}
-static inline void
-lcr0(uint val)
-{
- asm volatile("movl %0,%%cr0" : : "r" (val));
-}
-
-static inline uint
-rcr0(void)
-{
- uint val;
- asm volatile("movl %%cr0,%0" : "=r" (val));
- return val;
-}
-
static inline uint
rcr2(void)
{
@@ -198,14 +144,6 @@ lcr3(uint val)
asm volatile("movl %0,%%cr3" : : "r" (val));
}
-static inline uint
-rcr3(void)
-{
- uint val;
- asm volatile("movl %%cr3,%0" : "=r" (val));
- return val;
-}
-
//PAGEBREAK: 36
// Layout of the trap frame built on the stack by the
// hardware and by trapasm.S, and passed to trap().