summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHoward Zhang <howard.zhang@arm.com>2021-03-25 17:06:44 +0800
committerHoward Zhang <howard.zhang@arm.com>2021-03-25 17:39:28 +0800
commita01fc7108f68b6e5098f97f837f7f7b91edf91df (patch)
tree9ea10c495ae171abbabd3da7cf3ea2bbff8f98eb
parentc27fac421b760e62a8becf5d2c53ddbdf4ae5a4c (diff)
Fix nogo test error
Signed-off-by: Howard Zhang <howard.zhang@arm.com>
-rw-r--r--pkg/ring0/lib_arm64.go3
-rw-r--r--pkg/sentry/arch/fpu/fpu_arm64.go2
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/ring0/lib_arm64.go b/pkg/ring0/lib_arm64.go
index edf24eda3..e44df00a6 100644
--- a/pkg/ring0/lib_arm64.go
+++ b/pkg/ring0/lib_arm64.go
@@ -62,9 +62,10 @@ func LoadFloatingPoint(*byte)
// SaveFloatingPoint saves floating point state.
func SaveFloatingPoint(*byte)
+// FPSIMDDisableTrap disables fpsimd.
func FPSIMDDisableTrap()
-// DisableVFP disables fpsimd.
+// FPSIMDEnableTrap enables fpsimd.
func FPSIMDEnableTrap()
// Init sets function pointers based on architectural features.
diff --git a/pkg/sentry/arch/fpu/fpu_arm64.go b/pkg/sentry/arch/fpu/fpu_arm64.go
index d2f62631d..46634661f 100644
--- a/pkg/sentry/arch/fpu/fpu_arm64.go
+++ b/pkg/sentry/arch/fpu/fpu_arm64.go
@@ -58,6 +58,8 @@ func (s *State) Fork() State {
}
// BytePointer returns a pointer to the first byte of the state.
+//
+//go:nosplit
func (s *State) BytePointer() *byte {
return &(*s)[0]
}