Changeset b5e68c8 in mainline for kernel/arch/amd64/include/istate.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/amd64/include/istate.h (modified) (3 diffs)

kernel/arch/amd64/include/istate.h

@@ -37 +37 @@
 
 #ifdef KERNEL
+
 #include <typedefs.h>
 #include <trace.h>
-#else
+
+#else /* KERNEL */
+
 #include <sys/types.h>
+
 #define NO_TRACE
-#endif
+
+#endif /* KERNEL */
 
 /** This is passed to interrupt handlers */
@@ -61 +66 @@
         uint64_t r14;
         uint64_t r15;
-        uint64_t alignment;     /* align rbp_frame on multiple of 16 */
-        uint64_t rbp_frame;     /* imitation of frame pointer linkage */
-        uint64_t rip_frame;     /* imitation of return address linkage */
-        uint64_t error_word;    /* real or fake error word */
+        uint64_t alignment;   /* align rbp_frame on multiple of 16 */
+        uint64_t rbp_frame;   /* imitation of frame pointer linkage */
+        uint64_t rip_frame;   /* imitation of return address linkage */
+        uint64_t error_word;  /* real or fake error word */
         uint64_t rip;
         uint64_t cs;
         uint64_t rflags;
-        uint64_t rsp;           /* only if istate_t is from uspace */
-        uint64_t ss;            /* only if istate_t is from uspace */
+        uint64_t rsp;         /* only if istate_t is from uspace */
+        uint64_t ss;          /* only if istate_t is from uspace */
 } istate_t;
 
@@ -75 +80 @@
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return !(istate->rip & 0x8000000000000000);
+        return !(istate->rip & UINT64_C(0x8000000000000000));
 }