Changeset 96b02eb9 in mainline for kernel/arch/mips32

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

Files:

• include/debugger.h (modified) (2 diffs)
• include/fpu_context.h (modified) (1 diff)
• include/types.h (modified) (2 diffs)
• src/debugger.c (modified) (5 diffs)
• src/mips32.c (modified) (1 diff)

kernel/arch/mips32/include/debugger.h

@@ -58 +58 @@
 
 typedef struct  {
-        uintptr_t address;          /**< Breakpoint address */
-        unative_t instruction;      /**< Original instruction */
-        unative_t nextinstruction;  /**< Original instruction following break */
-        unsigned int flags;         /**< Flags regarding breakpoint */
+        uintptr_t address;         /**< Breakpoint address */
+        sysarg_t instruction;      /**< Original instruction */
+        sysarg_t nextinstruction;  /**< Original instruction following break */
+        unsigned int flags;        /**< Flags regarding breakpoint */
         size_t counter;
         void (*bkfunc)(void *, istate_t *);
@@ -68 +68 @@
 extern bpinfo_t breakpoints[BKPOINTS_MAX];
 
-extern bool is_jump(unative_t);
+extern bool is_jump(sysarg_t);
 
 extern void debugger_init(void);

kernel/arch/mips32/include/fpu_context.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-#define FPU_CONTEXT_ALIGN    sizeof(unative_t)
+#define FPU_CONTEXT_ALIGN    sizeof(sysarg_t)
 
 typedef struct {
-        unative_t dregs[32];
-        unative_t cregs[32];
+        sysarg_t dregs[32];
+        sysarg_t cregs[32];
 } fpu_context_t;
 

kernel/arch/mips32/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/mips32/src/debugger.c

@@ -134 +134 @@
  *
  */
-bool is_jump(unative_t instr)
+bool is_jump(sysarg_t instr)
 {
         unsigned int i;
@@ -166 +166 @@
                         return 0;
                 } else if ((breakpoints[i].address == (uintptr_t) argv->intval +
-                    sizeof(unative_t)) || (breakpoints[i].address ==
-                    (uintptr_t) argv->intval - sizeof(unative_t))) {
+                    sizeof(sysarg_t)) || (breakpoints[i].address ==
+                    (uintptr_t) argv->intval - sizeof(sysarg_t))) {
                         printf("Adjacent breakpoints not supported, conflict "
                             "with %d.\n", i);
@@ -194 +194 @@
         
         cur->address = (uintptr_t) argv->intval;
-        cur->instruction = ((unative_t *) cur->address)[0];
-        cur->nextinstruction = ((unative_t *) cur->address)[1];
+        cur->instruction = ((sysarg_t *) cur->address)[0];
+        cur->nextinstruction = ((sysarg_t *) cur->address)[1];
         if (argv == &add_argv) {
                 cur->flags = 0;
@@ -209 +209 @@
         
         /* Set breakpoint */
-        *((unative_t *) cur->address) = 0x0d;
+        *((sysarg_t *) cur->address) = 0x0d;
         smc_coherence(cur->address);
         
@@ -341 +341 @@
                 /* Reinst only breakpoint */
                 if ((breakpoints[i].flags & BKPOINT_REINST) &&
-                    (fireaddr == breakpoints[i].address + sizeof(unative_t))) {
+                    (fireaddr == breakpoints[i].address + sizeof(sysarg_t))) {
                         cur = &breakpoints[i];
                         break;

kernel/arch/mips32/src/mips32.c

@@ -233 +233 @@
  * possible to have it separately in the future.
  */
-unative_t sys_tls_set(unative_t addr)
+sysarg_t sys_tls_set(sysarg_t addr)
 {
         return 0;