diff options
author | Howard Zhang <howard.zhang@arm.com> | 2020-11-03 13:54:40 +0800 |
---|---|---|
committer | Howard Zhang <howard.zhang@arm.com> | 2020-11-03 14:28:56 +0800 |
commit | d0f8b3174e01cc14939d8f631e4415cf30925208 (patch) | |
tree | 91272e17297943817a0317e6eb5dd9e90cad7a69 | |
parent | 34a6e9576a9684087f95f57ee73171a637bee8b2 (diff) |
ARM64: follow nogo rules add function description
Signed-off-by: Howard Zhang <howard.zhang@arm.com>
-rw-r--r-- | pkg/sentry/platform/ring0/kernel_arm64.go | 6 | ||||
-rw-r--r-- | pkg/sentry/platform/ring0/lib_arm64.go | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/kernel_arm64.go b/pkg/sentry/platform/ring0/kernel_arm64.go index b294ccc7c..68291b504 100644 --- a/pkg/sentry/platform/ring0/kernel_arm64.go +++ b/pkg/sentry/platform/ring0/kernel_arm64.go @@ -51,6 +51,12 @@ func IsCanonical(addr uint64) bool { return addr <= 0x0000ffffffffffff || addr > 0xffff000000000000 } +// SwitchToUser performs an eret. +// +// The return value is the exception vector. +// +// +checkescape:all +// //go:nosplit func (c *CPU) SwitchToUser(switchOpts SwitchOpts) (vector Vector) { storeAppASID(uintptr(switchOpts.UserASID)) diff --git a/pkg/sentry/platform/ring0/lib_arm64.go b/pkg/sentry/platform/ring0/lib_arm64.go index d91a09de1..456107cd8 100644 --- a/pkg/sentry/platform/ring0/lib_arm64.go +++ b/pkg/sentry/platform/ring0/lib_arm64.go @@ -28,13 +28,13 @@ func FlushTlbAll() // CPACREL1 returns the value of the CPACR_EL1 register. func CPACREL1() (value uintptr) -// FPCR returns the value of FPCR register. +// GetFPCR returns the value of FPCR register. func GetFPCR() (value uintptr) // SetFPCR writes the FPCR value. func SetFPCR(value uintptr) -// FPSR returns the value of FPSR register. +// GetFPSR returns the value of FPSR register. func GetFPSR() (value uintptr) // SetFPSR writes the FPSR value. |