Changes in kernel/generic/src/udebug/udebug_ipc.c [96b02eb9:31696b4f] in mainline

File:

• kernel/generic/src/udebug/udebug_ipc.c (modified) (9 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>
@@ -166 +165 @@
 static void udebug_receive_thread_read(call_t *call)
 {
-        uintptr_t uspace_addr;
-        size_t buf_size;
+        unative_t uspace_addr;
+        unative_t to_copy;
+        unsigned total_bytes;
+        unsigned buf_size;
         void *buffer;
-        size_t copied, needed;
+        size_t n;
         int rc;
 
@@ -179 +180 @@
          * of threads times thread-id size.
          */
-        rc = udebug_thread_read(&buffer, buf_size, &copied, &needed);
+        rc = udebug_thread_read(&buffer, buf_size, &n);
         if (rc < 0) {
                 IPC_SET_RETVAL(call->data, rc);
@@ -186 +187 @@
         }
 
-        /*
-         * 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)
-{
-        sysarg_t uspace_addr;
-        sysarg_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 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;
+        total_bytes = n;
+
+        /* Copy MAX(buf_size, total_bytes) bytes */
+
+        if (buf_size > total_bytes)
+                to_copy = total_bytes;
         else
                 to_copy = buf_size;
@@ -242 +207 @@
         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 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)
-{
-        sysarg_t uspace_addr;
-        sysarg_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;
+        IPC_SET_ARG3(call->data, total_bytes);
+        call->buffer = buffer;
+
+        ipc_answer(&TASK->kb.box, call);
+}
+
+/** Process an ARGS_READ call.
+ *
+ * Reads the argument of a current syscall event (SYSCALL_B or SYSCALL_E).
+ * @param call  The call structure.
+ */
+static void udebug_receive_args_read(call_t *call)
+{
+        thread_t *t;
+        unative_t uspace_addr;
+        int rc;
+        void *buffer;
+
+        t = (thread_t *)IPC_GET_ARG2(call->data);
+
+        rc = udebug_args_read(t, &buffer);
+        if (rc != EOK) {
+                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);
 
         IPC_SET_RETVAL(call->data, 0);
@@ -287 +245 @@
            (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.
- *
- * Reads the argument of a current syscall event (SYSCALL_B or SYSCALL_E).
- * @param call  The call structure.
- */
-static void udebug_receive_args_read(call_t *call)
-{
-        thread_t *t;
-        sysarg_t uspace_addr;
-        int rc;
-        void *buffer;
-
-        t = (thread_t *)IPC_GET_ARG2(call->data);
-
-        rc = udebug_args_read(t, &buffer);
-        if (rc != EOK) {
-                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);
-
-        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, 6 * sizeof(sysarg_t));
+        IPC_SET_ARG2(call->data, 6 * sizeof(unative_t));
         call->buffer = buffer;
 
@@ -334 +251 @@
 }
 
-/** 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;
-        sysarg_t uspace_addr;
-        sysarg_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.
  *
@@ -382 +258 @@
 static void udebug_receive_mem_read(call_t *call)
 {
-        sysarg_t uspace_dst;
-        sysarg_t uspace_src;
+        unative_t uspace_dst;
+        unative_t uspace_src;
         unsigned size;
         void *buffer;
@@ -455 +331 @@
                 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);