Changeset 96b02eb9 in mainline for kernel/arch/amd64/include/asm.h

Timestamp:

2010-12-14T12:52:38Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

File:

• kernel/arch/amd64/include/asm.h (modified) (4 diffs)

kernel/arch/amd64/include/asm.h

@@ -304 +304 @@
 }
 
-NO_TRACE static inline unative_t read_msr(uint32_t msr)
+NO_TRACE static inline sysarg_t read_msr(uint32_t msr)
 {
         uint32_t ax, dx;
@@ -343 +343 @@
         asm volatile (
                 "invlpg %[addr]\n"
-                :: [addr] "m" (*((unative_t *) addr))
+                :: [addr] "m" (*((sysarg_t *) addr))
         );
 }
@@ -398 +398 @@
 }
 
-#define GEN_READ_REG(reg) NO_TRACE static inline unative_t read_ ##reg (void) \
+#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \
         { \
-                unative_t res; \
+                sysarg_t res; \
                 asm volatile ( \
                         "movq %%" #reg ", %[res]" \
@@ -408 +408 @@
         }
 
-#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (unative_t regn) \
+#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
         { \
                 asm volatile ( \