summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Bugaev <bugaevc@gmail.com>2023-05-09 00:31:14 +0300
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-10 02:33:37 +0200
commit6e5ad3f307307b87f87d1cc662ec1ea13ad4ade4 (patch)
tree696900480667479203ef8f49fcd67608e7d300f2
parent11892f0282aa3431051b1d8996f68d9f7895f818 (diff)
exec: Port to x86_64
Message-Id: <20230508213136.608575-20-bugaevc@gmail.com>
-rw-r--r--exec/elfcore.c6
-rw-r--r--exec/exec.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/exec/elfcore.c b/exec/elfcore.c
index 5f489a1e..ab6dc2ba 100644
--- a/exec/elfcore.c
+++ b/exec/elfcore.c
@@ -168,7 +168,7 @@ dump_core (task_t task, file_t file, off_t corelimit,
pid_t pid;
thread_t *threads;
- size_t nthreads, i;
+ mach_msg_type_number_t nthreads, i;
off_t notestart;
/* Helper macros for writing notes. */
@@ -432,7 +432,7 @@ dump_core (task_t task, file_t file, off_t corelimit,
task given the locations we now have. But we are lazy and have
the proc server do it for us. */
char *data = psinfo.data.pr_psargs;
- size_t datalen = sizeof psinfo.data.pr_psargs;
+ mach_msg_type_number_t datalen = sizeof psinfo.data.pr_psargs;
err = proc_getprocargs (procserver, pid, &data, &datalen);
if (err == 0)
{
@@ -531,7 +531,7 @@ dump_core (task_t task, file_t file, off_t corelimit,
do
{
pointer_t copied;
- size_t copy_count;
+ mach_msg_type_number_t copy_count;
err = vm_read (task, va, sz, &copied, &copy_count);
if (err == 0)
{
diff --git a/exec/exec.c b/exec/exec.c
index 026acf03..8944167d 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -203,7 +203,7 @@ load_section (void *section, struct execdata *u, int interp)
first page boundary. */
vm_address_t overlap_page = trunc_page (addr);
vm_address_t ourpage = 0;
- vm_size_t size = 0;
+ mach_msg_type_number_t size = 0;
void *readaddr;
size_t readsize;
@@ -312,7 +312,7 @@ load_section (void *section, struct execdata *u, int interp)
/* Zero space in the section before the first page boundary. */
vm_address_t overlap_page = trunc_page (addr);
vm_address_t ourpage = 0;
- vm_size_t size = 0;
+ mach_msg_type_number_t size = 0;
u->error = vm_read (u->task, overlap_page, vm_page_size,
&ourpage, &size);
if (u->error)