Merge release-20210315.0-18-g56a9a1397 (automated)

1 files changed, 9 insertions, 4 deletions

diff --git a/pkg/sentry/arch/arch_amd64.go b/pkg/sentry/arch/arch_amd64.go
index 15d8ddb40..2571be60f 100644
--- a/pkg/sentry/arch/arch_amd64.go
+++ b/pkg/sentry/arch/arch_amd64.go
@@ -25,6 +25,7 @@ import (
 	"gvisor.dev/gvisor/pkg/cpuid"
 	"gvisor.dev/gvisor/pkg/marshal"
 	"gvisor.dev/gvisor/pkg/marshal/primitive"
+	"gvisor.dev/gvisor/pkg/sentry/arch/fpu"
 	"gvisor.dev/gvisor/pkg/sentry/limits"
 	"gvisor.dev/gvisor/pkg/usermem"
 )
@@ -105,7 +106,7 @@ const (
 // +stateify savable
 type context64 struct {
 	State
-	sigFPState []x86FPState // fpstate to be restored on sigreturn.
+	sigFPState []fpu.State // fpstate to be restored on sigreturn.
 }
 
 // Arch implements Context.Arch.
@@ -113,14 +114,18 @@ func (c *context64) Arch() Arch {
 	return AMD64
 }
 
-func (c *context64) copySigFPState() []x86FPState {
-	var sigfps []x86FPState
+func (c *context64) copySigFPState() []fpu.State {
+	var sigfps []fpu.State
 	for _, s := range c.sigFPState {
-		sigfps = append(sigfps, s.fork())
+		sigfps = append(sigfps, s.Fork())
 	}
 	return sigfps
 }
 
+func (c *context64) FloatingPointData() *fpu.State {
+	return &c.State.fpState
+}
+
 // Fork returns an exact copy of this context.
 func (c *context64) Fork() Context {
 	return &context64{