Changeset 96b02eb9 in mainline for kernel/generic/src/udebug

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/generic/src/udebug

Files:

• udebug.c (modified) (2 diffs)
• udebug_ipc.c (modified) (6 diffs)
• udebug_ops.c (modified) (7 diffs)

kernel/generic/src/udebug/udebug.c

@@ -219 +219 @@
  *
  */
-void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
+void udebug_syscall_event(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id, sysarg_t rc,
     bool end_variant)
 {
@@ -314 +314 @@
         IPC_SET_RETVAL(call->data, 0);
         IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_B);
-        IPC_SET_ARG2(call->data, (unative_t) thread);
+        IPC_SET_ARG2(call->data, (sysarg_t) thread);
         
         /*

kernel/generic/src/udebug/udebug_ipc.c

@@ -210 +210 @@
 static void udebug_receive_name_read(call_t *call)
 {
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         size_t data_size;
         size_t buf_size;
@@ -257 +257 @@
 static void udebug_receive_areas_read(call_t *call)
 {
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         size_t data_size;
         size_t buf_size;
@@ -304 +304 @@
 {
         thread_t *t;
-        unative_t uspace_addr;
+        sysarg_t uspace_addr;
         int rc;
         void *buffer;
@@ -328 +328 @@
            (no way to distinguish method in answer) */
         IPC_SET_ARG1(call->data, uspace_addr);
-        IPC_SET_ARG2(call->data, 6 * sizeof(unative_t));
+        IPC_SET_ARG2(call->data, 6 * sizeof(sysarg_t));
         call->buffer = buffer;
 
@@ -341 +341 @@
 {
         thread_t *t;
-        unative_t uspace_addr;
-        unative_t to_copy;
+        sysarg_t uspace_addr;
+        sysarg_t to_copy;
         void *buffer;
         int rc;
@@ -382 +382 @@
 static void udebug_receive_mem_read(call_t *call)
 {
-        unative_t uspace_dst;
-        unative_t uspace_src;
+        sysarg_t uspace_dst;
+        sysarg_t uspace_src;
         unsigned size;
         void *buffer;

kernel/generic/src/udebug/udebug_ops.c

@@ -371 +371 @@
         
         /* Allocate a buffer to hold thread IDs */
-        unative_t *id_buffer = malloc(buf_size + 1, 0);
+        sysarg_t *id_buffer = malloc(buf_size + 1, 0);
         
         mutex_lock(&TASK->udebug.lock);
@@ -385 +385 @@
         /* Copy down the thread IDs */
         
-        size_t max_ids = buf_size / sizeof(unative_t);
+        size_t max_ids = buf_size / sizeof(sysarg_t);
         size_t copied_ids = 0;
         size_t extra_ids = 0;
@@ -404 +404 @@
                 if (copied_ids < max_ids) {
                         /* Using thread struct pointer as identification hash */
-                        id_buffer[copied_ids++] = (unative_t) thread;
+                        id_buffer[copied_ids++] = (sysarg_t) thread;
                 } else
                         extra_ids++;
@@ -414 +414 @@
         
         *buffer = id_buffer;
-        *stored = copied_ids * sizeof(unative_t);
-        *needed = (copied_ids + extra_ids) * sizeof(unative_t);
+        *stored = copied_ids * sizeof(sysarg_t);
+        *needed = (copied_ids + extra_ids) * sizeof(sysarg_t);
         
         return 0;
@@ -463 +463 @@
 {
         /* Prepare a buffer to hold the arguments. */
-        unative_t *arg_buffer = malloc(6 * sizeof(unative_t), 0);
+        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
         
         /* On success, this will lock t->udebug.lock. */
@@ -478 +478 @@
         
         /* Copy to a local buffer before releasing the lock. */
-        memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(unative_t));
+        memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(sysarg_t));
         
         _thread_op_end(thread);
@@ -539 +539 @@
  *
  */
-int udebug_mem_read(unative_t uspace_addr, size_t n, void **buffer)
+int udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
 {
         /* Verify task state */