Changeset 96b02eb9 in mainline for kernel/arch/amd64

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

Files:

• include/asm.h (modified) (4 diffs)
• include/proc/thread.h (modified) (1 diff)
• include/types.h (modified) (2 diffs)
• src/amd64.c (modified) (1 diff)
• src/debugger.c (modified) (6 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 ( \

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

@@ -41 +41 @@
 
 typedef struct {
-        unative_t tls;
+        sysarg_t tls;
         /** User and kernel RSP for syscalls. */
         uint64_t syscall_rsp[2];

kernel/arch/amd64/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;
@@ -54 +54 @@
 
 #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/amd64/src/amd64.c

@@ -256 +256 @@
  * we need not to go to CPL0 to read it.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         THREAD->arch.tls = addr;

kernel/arch/amd64/src/debugger.c

@@ -125 +125 @@
         
         /* Disable breakpoint in DR7 */
-        unative_t dr7 = read_dr7();
+        sysarg_t dr7 = read_dr7();
         dr7 &= ~(0x02U << (curidx * 2));
         
@@ -152 +152 @@
                 if (!(flags & BKPOINT_INSTR)) {
 #ifdef __32_BITS__
-                        dr7 |= ((unative_t) 0x03U) << (18 + 4 * curidx);
+                        dr7 |= ((sysarg_t) 0x03U) << (18 + 4 * curidx);
 #endif
                         
 #ifdef __64_BITS__
-                        dr7 |= ((unative_t) 0x02U) << (18 + 4 * curidx);
+                        dr7 |= ((sysarg_t) 0x02U) << (18 + 4 * curidx);
 #endif
                         
                         if ((flags & BKPOINT_WRITE))
-                                dr7 |= ((unative_t) 0x01U) << (16 + 4 * curidx);
+                                dr7 |= ((sysarg_t) 0x01U) << (16 + 4 * curidx);
                         else if ((flags & BKPOINT_READ_WRITE))
-                                dr7 |= ((unative_t) 0x03U) << (16 + 4 * curidx);
+                                dr7 |= ((sysarg_t) 0x03U) << (16 + 4 * curidx);
                 }
                 
@@ -227 +227 @@
         if (!(breakpoints[slot].flags & BKPOINT_INSTR)) {
                 if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) {
-                        if (*((unative_t *) breakpoints[slot].address) != 0)
+                        if (*((sysarg_t *) breakpoints[slot].address) != 0)
                                 return;
                         
@@ -234 +234 @@
                 } else {
                         printf("Data watchpoint - new data: %#" PRIxn "\n",
-                            *((unative_t *) breakpoints[slot].address));
+                            *((sysarg_t *) breakpoints[slot].address));
                 }
         }
@@ -279 +279 @@
 #endif
         
-        unative_t dr6 = read_dr6();
+        sysarg_t dr6 = read_dr6();
         
         unsigned int i;
@@ -384 +384 @@
 int cmd_del_breakpoint(cmd_arg_t *argv)
 {
-        unative_t bpno = argv->intval;
+        sysarg_t bpno = argv->intval;
         if (bpno > BKPOINTS_MAX) {
                 printf("Invalid breakpoint number.\n");