diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-16 20:10:04 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-16 20:10:04 +0000 |
| commit | 08beb206526f64799d9458cc970203977f931080 (patch) | |
| tree | 540653b08d73236a128cc43a0b021597a98f56ed | |
| parent | 3c35441e1547cdc7223a24640ca86a3ebd5ed8d3 (diff) | |
| parent | fea1ce655de92a5411589d2f4a6b8973cd911a77 (diff) | |
Merge release-20200115.0-7-gfea1ce6 (automated)
| -rwxr-xr-x | pkg/sentry/platform/ring0/entry_impl_arm64.s | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index 9d7bedf48..36c3d9233 100755 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -538,6 +538,16 @@ TEXT ·El1_sync(SB),NOSPLIT,$0 B el1_invalid el1_da: + WORD $0xd538d092 //MRS TPIDR_EL1, R18 + WORD $0xd538601a //MRS FAR_EL1, R26 + + MOVD R26, CPU_FAULT_ADDR(RSV_REG) + + MOVD $0, CPU_ERROR_TYPE(RSV_REG) + + MOVD $PageFault, R3 + MOVD R3, CPU_VECTOR_CODE(RSV_REG) + B ·Halt(SB) el1_ia: |