Changeset dc5c303 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• kernel/generic/src/proc/program.c (modified) (3 diffs)

kernel/generic/src/proc/program.c

@@ -49 +49 @@
 #include <lib/elf_load.h>
 #include <str.h>
+#include <str_error.h>
 #include <log.h>
 #include <syscall/copy.h>
@@ -142 +143 @@
  *
  */
-errno_t program_create_from_image(void *image_addr, char *name, program_t *prg)
+errno_t program_create_from_image(void *image_addr, size_t image_size, char *name, program_t *prg)
 {
         as_t *as = as_create(0);
@@ -156 +157 @@
         }
 
-        return program_create(as, ((elf_header_t *) image_addr)->e_entry,
+        errno_t rc = program_create(as, ((elf_header_t *) image_addr)->e_entry,
             name, prg);
+
+        if (rc == EOK) {
+                prg->task->debug_sections = calloc(1, sizeof(debug_sections_t));
+                if (prg->task->debug_sections != NULL)
+                        *prg->task->debug_sections = get_debug_sections(image_addr, image_size);
+        }
+
+        return rc;
 }