Page MenuHomeFreeBSD

D23218.diff
No OneTemporary

D23218.diff

Index: head/sys/arm64/arm64/machdep.c
===================================================================
--- head/sys/arm64/arm64/machdep.c
+++ head/sys/arm64/arm64/machdep.c
@@ -98,6 +98,8 @@
#include <dev/ofw/openfirm.h>
#endif
+static void get_fpcontext(struct thread *td, mcontext_t *mcp);
+static void set_fpcontext(struct thread *td, mcontext_t *mcp);
enum arm64_bus arm64_bus_method = ARM64_BUS_NONE;
@@ -473,6 +475,7 @@
mcp->mc_gpregs.gp_sp = tf->tf_sp;
mcp->mc_gpregs.gp_lr = tf->tf_lr;
mcp->mc_gpregs.gp_elr = tf->tf_elr;
+ get_fpcontext(td, mcp);
return (0);
}
@@ -495,6 +498,7 @@
tf->tf_lr = mcp->mc_gpregs.gp_lr;
tf->tf_elr = mcp->mc_gpregs.gp_elr;
tf->tf_spsr = mcp->mc_gpregs.gp_spsr;
+ set_fpcontext(td, mcp);
return (0);
}
@@ -667,15 +671,12 @@
ucontext_t uc;
int error;
- if (uap == NULL)
- return (EFAULT);
if (copyin(uap->sigcntxp, &uc, sizeof(uc)))
return (EFAULT);
error = set_mcontext(td, &uc.uc_mcontext);
if (error != 0)
return (error);
- set_fpcontext(td, &uc.uc_mcontext);
/* Restore signal mask. */
kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
@@ -747,7 +748,6 @@
/* Fill in the frame to copy out */
bzero(&frame, sizeof(frame));
get_mcontext(td, &frame.sf_uc.uc_mcontext, 0);
- get_fpcontext(td, &frame.sf_uc.uc_mcontext);
frame.sf_si = ksi->ksi_info;
frame.sf_uc.uc_sigmask = *mask;
frame.sf_uc.uc_stack = td->td_sigstk;
Index: head/sys/riscv/riscv/machdep.c
===================================================================
--- head/sys/riscv/riscv/machdep.c
+++ head/sys/riscv/riscv/machdep.c
@@ -99,6 +99,9 @@
#include <dev/ofw/openfirm.h>
#endif
+static void get_fpcontext(struct thread *td, mcontext_t *mcp);
+static void set_fpcontext(struct thread *td, mcontext_t *mcp);
+
struct pcpu __pcpu[MAXCPU];
static struct trapframe proc0_tf;
@@ -352,6 +355,7 @@
mcp->mc_gpregs.gp_tp = tf->tf_tp;
mcp->mc_gpregs.gp_sepc = tf->tf_sepc;
mcp->mc_gpregs.gp_sstatus = tf->tf_sstatus;
+ get_fpcontext(td, mcp);
return (0);
}
@@ -372,6 +376,7 @@
tf->tf_gp = mcp->mc_gpregs.gp_gp;
tf->tf_sepc = mcp->mc_gpregs.gp_sepc;
tf->tf_sstatus = mcp->mc_gpregs.gp_sstatus;
+ set_fpcontext(td, mcp);
return (0);
}
@@ -522,8 +527,6 @@
ucontext_t uc;
int error;
- if (uap == NULL)
- return (EFAULT);
if (copyin(uap->sigcntxp, &uc, sizeof(uc)))
return (EFAULT);
@@ -540,8 +543,6 @@
if (error != 0)
return (error);
- set_fpcontext(td, &uc.uc_mcontext);
-
/* Restore signal mask. */
kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
@@ -612,7 +613,6 @@
/* Fill in the frame to copy out */
bzero(&frame, sizeof(frame));
get_mcontext(td, &frame.sf_uc.uc_mcontext, 0);
- get_fpcontext(td, &frame.sf_uc.uc_mcontext);
frame.sf_si = ksi->ksi_info;
frame.sf_uc.uc_sigmask = *mask;
frame.sf_uc.uc_stack = td->td_sigstk;

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 18, 6:09 PM (50 m, 38 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23888552
Default Alt Text
D23218.diff (2 KB)

Event Timeline