Changeset 96b02eb9 in mainline for kernel/arch/ia32

Timestamp:

2010-12-14T12:52:38Z (15 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)

Location:

kernel/arch/ia32

Files:

• include/asm.h (modified) (3 diffs)
• include/proc/thread.h (modified) (1 diff)
• include/types.h (modified) (2 diffs)
• src/ia32.c (modified) (1 diff)

kernel/arch/ia32/include/asm.h

@@ -64 +64 @@
 }
 
-#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 ( \
                         "movl %%" #reg ", %[res]" \
@@ -74 +74 @@
         }
 
-#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 ( \
@@ -366 +366 @@
         asm volatile (
                 "invlpg %[addr]\n"
-                :: [addr] "m" (*(unative_t *) addr)
+                :: [addr] "m" (*(sysarg_t *) addr)
         );
 }

kernel/arch/ia32/include/proc/thread.h

@@ -39 +39 @@
 
 typedef struct {
-        unative_t tls;
+        sysarg_t tls;
 } thread_arch_t;
 

kernel/arch/ia32/include/types.h

@@ -43 +43 @@
 typedef uint32_t ipl_t;
 
-typedef uint32_t unative_t;
+typedef uint32_t sysarg_t;
 typedef int32_t native_t;
 typedef uint32_t atomic_count_t;
@@ -54 +54 @@
 
 #define PRIdn  PRId32  /**< Format for native_t. */
-#define PRIun  PRIu32  /**< Format for unative_t. */
-#define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
+#define PRIun  PRIu32  /**< Format for sysarg_t. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu32  /**< Format for atomic_count_t. */
 

kernel/arch/ia32/src/ia32.c

@@ -211 +211 @@
  * selector, and the descriptor->base is the correct address.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         THREAD->arch.tls = addr;