Author: ed
Date: Sun Dec 10 12:25:32 2017
New Revision: 326743
URL: https://svnweb.freebsd.org/changeset/base/326743
Log:
MFC r326228 and r326229:
Use TO_PTR() to convert integers to pointers.
For FreeBSD/arm64's cloudabi32 support, I'm going to need a TO_PTR() in
this place. Also use it for all of the other source files, so that the
difference remains as minimal as possible.
Modified:
stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c
stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c
stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c
stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c
stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 09:17:21
2017 (r326742)
+++ stable/11/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 12:25:32
2017 (r326743)
@@ -86,7 +86,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag
{
ia32_setregs(td, imgp, stack);
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
Modified: stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 09:17:21
2017 (r326742)
+++ stable/11/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 12:25:32
2017 (r326743)
@@ -83,7 +83,7 @@ cloudabi64_proc_setregs(struct thread *td, struct imag
regs = td->td_frame;
regs->tf_rdi = stack + sizeof(register_t) +
roundup(sizeof(cloudabi64_tcb_t), sizeof(register_t));
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
@@ -188,7 +188,7 @@ cloudabi64_thread_setregs(struct thread *td,
frame->tf_rdi = td->td_tid;
frame->tf_rsi = attr->argument;
- return (cpu_set_user_tls(td, (void *)tcbptr));
+ return (cpu_set_user_tls(td, TO_PTR(tcbptr)));
}
static struct sysentvec cloudabi64_elf_sysvec = {
Modified: stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 09:17:21
2017 (r326742)
+++ stable/11/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 12:25:32
2017 (r326743)
@@ -63,7 +63,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag
regs = td->td_frame;
regs->tf_r0 = td->td_retval[0] =
stack + roundup(sizeof(cloudabi32_tcb_t), sizeof(register_t));
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
@@ -165,7 +165,7 @@ cloudabi32_thread_setregs(struct thread *td,
frame->tf_r1 = attr->argument;
/* Set up TLS. */
- return (cpu_set_user_tls(td, (void *)tcb));
+ return (cpu_set_user_tls(td, TO_PTR(tcb)));
}
static struct sysentvec cloudabi32_elf_sysvec = {
Modified: stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 09:17:21
2017 (r326742)
+++ stable/11/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Dec 10 12:25:32
2017 (r326743)
@@ -63,7 +63,7 @@ cloudabi64_proc_setregs(struct thread *td, struct imag
regs = td->td_frame;
regs->tf_x[0] = td->td_retval[0] =
stack + roundup(sizeof(cloudabi64_tcb_t), sizeof(register_t));
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
@@ -157,7 +157,7 @@ cloudabi64_thread_setregs(struct thread *td,
frame->tf_x[1] = attr->argument;
/* Set up TLS. */
- return (cpu_set_user_tls(td, (void *)tcb));
+ return (cpu_set_user_tls(td, TO_PTR(tcb)));
}
static struct sysentvec cloudabi64_elf_sysvec = {
Modified: stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 09:17:21
2017 (r326742)
+++ stable/11/sys/i386/cloudabi32/cloudabi32_sysvec.c Sun Dec 10 12:25:32
2017 (r326743)
@@ -81,7 +81,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag
{
exec_setregs(td, imgp, stack);
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
