Changeset 87b4baa in mainline for kernel/generic/src/udebug/udebug_ops.c

Timestamp:

2010-12-17T20:16:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/udebug/udebug_ops.c (modified) (7 diffs)

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