Changeset 7f1c620 in mainline for arch/ia64/include/context.h

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• arch/ia64/include/context.h (modified) (2 diffs)

arch/ia64/include/context.h

@@ -57 +57 @@
 #define context_set(c, _pc, stack, size)                                                                \
         do {                                                                                            \
-                (c)->pc = (__address) _pc;                                                              \
-                (c)->bsp = ((__address) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);            \
+                (c)->pc = (uintptr_t) _pc;                                                              \
+                (c)->bsp = ((uintptr_t) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);            \
                 (c)->ar_pfs &= PFM_MASK;                                                                \
-                (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;           \
+                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;           \
         } while (0);
 
@@ -72 +72 @@
          * Application registers
          */
-        __u64 ar_pfs;
-        __u64 ar_unat_caller;
-        __u64 ar_unat_callee;
-        __u64 ar_rsc;
-        __address bsp;          /* ar_bsp */
-        __u64 ar_rnat;
-        __u64 ar_lc;
+        uint64_t ar_pfs;
+        uint64_t ar_unat_caller;
+        uint64_t ar_unat_callee;
+        uint64_t ar_rsc;
+        uintptr_t bsp;          /* ar_bsp */
+        uint64_t ar_rnat;
+        uint64_t ar_lc;
 
         /*
          * General registers
          */
-        __u64 r1;
-        __u64 r4;
-        __u64 r5;
-        __u64 r6;
-        __u64 r7;
-        __address sp;           /* r12 */
-        __u64 r13;
+        uint64_t r1;
+        uint64_t r4;
+        uint64_t r5;
+        uint64_t r6;
+        uint64_t r7;
+        uintptr_t sp;           /* r12 */
+        uint64_t r13;
         
         /*
          * Branch registers
          */
-        __address pc;           /* b0 */
-        __u64 b1;
-        __u64 b2;
-        __u64 b3;
-        __u64 b4;
-        __u64 b5;
+        uintptr_t pc;           /* b0 */
+        uint64_t b1;
+        uint64_t b2;
+        uint64_t b3;
+        uint64_t b4;
+        uint64_t b5;
 
         /*
          * Predicate registers
          */
-        __u64 pr;
+        uint64_t pr;
 
         __r128 f2 __attribute__ ((aligned(16)));