summaryrefslogtreecommitdiff
path: root/x86.h
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 17:50:20 +0000
committerrsc <rsc>2006-09-06 17:50:20 +0000
commitf552738889f56586728d1b5d2a63cde0cf124929 (patch)
treee91c4b41699f12d686383556fbbe67baa41d9575 /x86.h
parent9e9bcaf143bf8507e947f9934371744c3d50a8ea (diff)
downloadxv6-labs-f552738889f56586728d1b5d2a63cde0cf124929.tar.gz
xv6-labs-f552738889f56586728d1b5d2a63cde0cf124929.tar.bz2
xv6-labs-f552738889f56586728d1b5d2a63cde0cf124929.zip
no /* */ comments
Diffstat (limited to 'x86.h')
-rw-r--r--x86.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/x86.h b/x86.h
index a0d61ab..bb79d3e 100644
--- a/x86.h
+++ b/x86.h
@@ -125,28 +125,31 @@ sti(void)
}
struct trapframe {
- /* registers as pushed by pusha */
+ // registers as pushed by pusha
uint edi;
uint esi;
uint ebp;
- uint oesp; /* Useless */
+ uint oesp; // useless & ignored
uint ebx;
uint edx;
uint ecx;
uint eax;
- /* rest of trap frame */
+
+ // rest of trap frame
ushort es;
ushort padding1;
ushort ds;
ushort padding2;
uint trapno;
- /* below here defined by x86 hardware */
+
+ // below here defined by x86 hardware
uint err;
uint eip;
ushort cs;
ushort padding3;
uint eflags;
- /* below here only when crossing rings, such as from user to kernel */
+
+ // below here only when crossing rings, such as from user to kernel
uint esp;
ushort ss;
ushort padding4;