Changeset 96b02eb9 in mainline for kernel/arch/ia64

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/ia64

Files:

• include/bootinfo.h (modified) (1 diff)
• include/types.h (modified) (2 diffs)
• src/ia64.c (modified) (3 diffs)

kernel/arch/ia64/include/bootinfo.h

@@ -62 +62 @@
         unsigned int memmap_items;
         
-        unative_t *sapic;
+        sysarg_t *sapic;
         unsigned long sys_freq;
         unsigned long freq_scale;

kernel/arch/ia64/include/types.h

@@ -43 +43 @@
 typedef uint64_t ipl_t;
 
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef int64_t native_t;
 typedef uint64_t atomic_count_t;
 
 typedef struct {
-        unative_t fnc;
-        unative_t gp;
+        sysarg_t fnc;
+        sysarg_t gp;
 } __attribute__((may_alias)) fncptr_t;
 
@@ -56 +56 @@
 
 #define PRIdn  PRId64  /**< Format for native_t. */
-#define PRIun  PRIu64  /**< Format for unative_t. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
+#define PRIun  PRIu64  /**< Format for sysarg_t. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu64  /**< Format for atomic_count_t. */
 

kernel/arch/ia64/src/ia64.c

@@ -104 +104 @@
 static void iosapic_init(void)
 {
-        uint64_t IOSAPIC = PA2KA((unative_t)(iosapic_base)) | FW_OFFSET;
+        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
         int i;
         
@@ -251 +251 @@
  * We use r13 (a.k.a. tp) for this purpose.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         return 0;
@@ -274 +274 @@
 void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
 {
-        fptr->fnc = (unative_t) addr;
-        fptr->gp = ((unative_t *) caller)[1];
+        fptr->fnc = (sysarg_t) addr;
+        fptr->gp = ((sysarg_t *) caller)[1];
         
         return (void *) fptr;