Changeset 1735f3e in mainline for kernel/generic/src/udebug/udebug_ipc.c

Timestamp:

2010-01-31T18:22:37Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fc2e71e

Parents:

430de97 (diff), 2e07f62c (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 from mainline.

File:

• kernel/generic/src/udebug/udebug_ipc.c (modified) (6 diffs)

kernel/generic/src/udebug/udebug_ipc.c

@@ -41 +41 @@
 #include <proc/task.h>
 #include <proc/thread.h>
+#include <mm/as.h>
 #include <arch.h>
 #include <errno.h>
@@ -165 +166 @@
 static void udebug_receive_thread_read(call_t *call)
 {
+        uintptr_t uspace_addr;
+        size_t buf_size;
+        void *buffer;
+        size_t copied, needed;
+        int rc;
+
+        uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
+        buf_size = IPC_GET_ARG3(call->data);    /* Dest. buffer size */
+
+        /*
+         * Read thread list. Variable n will be filled with actual number
+         * of threads times thread-id size.
+         */
+        rc = udebug_thread_read(&buffer, buf_size, &copied, &needed);
+        if (rc < 0) {
+                IPC_SET_RETVAL(call->data, rc);
+                ipc_answer(&TASK->kb.box, call);
+                return;
+        }
+
+        /*
+         * Make use of call->buffer to transfer data to caller's userspace
+         */
+
+        IPC_SET_RETVAL(call->data, 0);
+        /* ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
+           same code in process_answer() can be used 
+           (no way to distinguish method in answer) */
+        IPC_SET_ARG1(call->data, uspace_addr);
+        IPC_SET_ARG2(call->data, copied);
+        IPC_SET_ARG3(call->data, needed);
+        call->buffer = buffer;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
+/** Process a NAME_READ call.
+ *
+ * Returns a string containing the name of the task.
+ *
+ * @param call  The call structure.
+ */
+static void udebug_receive_name_read(call_t *call)
+{
         unative_t uspace_addr;
         unative_t to_copy;
-        unsigned total_bytes;
-        unsigned buf_size;
-        void *buffer;
-        size_t n;
-        int rc;
+        size_t data_size;
+        size_t buf_size;
+        void *data;
 
         uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
@@ -177 +220 @@
 
         /*
-         * Read thread list. Variable n will be filled with actual number
-         * of threads times thread-id size.
-         */
-        rc = udebug_thread_read(&buffer, buf_size, &n);
-        if (rc < 0) {
-                IPC_SET_RETVAL(call->data, rc);
-                ipc_answer(&TASK->kb.box, call);
-                return;
-        }
-
-        total_bytes = n;
-
-        /* Copy MAX(buf_size, total_bytes) bytes */
-
-        if (buf_size > total_bytes)
-                to_copy = total_bytes;
+         * Read task name.
+         */
+        udebug_name_read((char **) &data, &data_size);
+
+        /* Copy MAX(buf_size, data_size) bytes */
+
+        if (buf_size > data_size)
+                to_copy = data_size;
         else
                 to_copy = buf_size;
@@ -207 +242 @@
         IPC_SET_ARG2(call->data, to_copy);
 
-        IPC_SET_ARG3(call->data, total_bytes);
-        call->buffer = buffer;
-
-        ipc_answer(&TASK->kb.box, call);
-}
+        IPC_SET_ARG3(call->data, data_size);
+        call->buffer = data;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
+/** Process an AREAS_READ call.
+ *
+ * Returns a list of address space areas in the current task, as an array
+ * of as_area_info_t structures.
+ *
+ * @param call  The call structure.
+ */
+static void udebug_receive_areas_read(call_t *call)
+{
+        unative_t uspace_addr;
+        unative_t to_copy;
+        size_t data_size;
+        size_t buf_size;
+        void *data;
+
+        uspace_addr = IPC_GET_ARG2(call->data); /* Destination address */
+        buf_size = IPC_GET_ARG3(call->data);    /* Dest. buffer size */
+
+        /*
+         * Read area list.
+         */
+        as_get_area_info(AS, (as_area_info_t **) &data, &data_size);
+
+        /* Copy MAX(buf_size, data_size) bytes */
+
+        if (buf_size > data_size)
+                to_copy = data_size;
+        else
+                to_copy = buf_size;
+
+        /*
+         * Make use of call->buffer to transfer data to caller's userspace
+         */
+
+        IPC_SET_RETVAL(call->data, 0);
+        /* ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
+           same code in process_answer() can be used 
+           (no way to distinguish method in answer) */
+        IPC_SET_ARG1(call->data, uspace_addr);
+        IPC_SET_ARG2(call->data, to_copy);
+
+        IPC_SET_ARG3(call->data, data_size);
+        call->buffer = data;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
 
 /** Process an ARGS_READ call.
@@ -250 +333 @@
         ipc_answer(&TASK->kb.box, call);
 }
+
+/** Receive a REGS_READ call.
+ *
+ * Reads the thread's register state (istate structure).
+ */
+static void udebug_receive_regs_read(call_t *call)
+{
+        thread_t *t;
+        unative_t uspace_addr;
+        unative_t to_copy;
+        void *buffer;
+        int rc;
+
+        t = (thread_t *) IPC_GET_ARG2(call->data);
+
+        rc = udebug_regs_read(t, &buffer);
+        if (rc < 0) {
+                IPC_SET_RETVAL(call->data, rc);
+                ipc_answer(&TASK->kb.box, call);
+                return;
+        }
+
+        /*
+         * Make use of call->buffer to transfer data to caller's userspace
+         */
+
+        uspace_addr = IPC_GET_ARG3(call->data);
+        to_copy = sizeof(istate_t);
+
+        IPC_SET_RETVAL(call->data, 0);
+        /* ARG1=dest, ARG2=size as in IPC_M_DATA_READ so that
+           same code in process_answer() can be used 
+           (no way to distinguish method in answer) */
+        IPC_SET_ARG1(call->data, uspace_addr);
+        IPC_SET_ARG2(call->data, to_copy);
+
+        call->buffer = buffer;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
 
 /** Process an MEM_READ call.
@@ -331 +455 @@
                 udebug_receive_thread_read(call);
                 break;
+        case UDEBUG_M_NAME_READ:
+                udebug_receive_name_read(call);
+                break;
+        case UDEBUG_M_AREAS_READ:
+                udebug_receive_areas_read(call);
+                break;
         case UDEBUG_M_ARGS_READ:
                 udebug_receive_args_read(call);
                 break;
+        case UDEBUG_M_REGS_READ:
+                udebug_receive_regs_read(call);
+                break;
         case UDEBUG_M_MEM_READ:
                 udebug_receive_mem_read(call);