commit be548ad9668179bce62cc8e1a08f5144c6801e58
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 07 17:30:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 07 17:30:22 2023 +0000
tree 53d37be87d5d4a516ac2f681b3cfb4435d214e92
parent e98dd47ae33a69abf36b544aa9769fbe1222a2a1
parent 9a7328e1d206217e8a79851d88afad5d10f2791f

Merge "vmbase/rialto: Read ESR_EL1 with read_sysreg!()" into main

rialto/src/exceptions.rs

diff --git a/rialto/src/exceptions.rs b/rialto/src/exceptions.rs
index 61f7846..3c12c25 100644
--- a/rialto/src/exceptions.rs
+++ b/rialto/src/exceptions.rs
@@ -14,8 +14,7 @@
 
 //! Exception handlers.
 
-use core::arch::asm;
-use vmbase::{console::emergency_write_str, eprintln, power::reboot};
+use vmbase::{console::emergency_write_str, eprintln, power::reboot, read_sysreg};
 
 #[no_mangle]
 extern "C" fn sync_exception_current() {
@@ -71,9 +70,6 @@
 
 #[inline]
 fn print_esr() {
-    let mut esr: u64;
-    unsafe {
-        asm!("mrs {esr}, esr_el1", esr = out(reg) esr);
-    }
+    let esr = read_sysreg!("esr_el1");
     eprintln!("esr={:#08x}", esr);
 }

vmbase/example/src/exceptions.rs

diff --git a/vmbase/example/src/exceptions.rs b/vmbase/example/src/exceptions.rs
index 0522013..5d7768a 100644
--- a/vmbase/example/src/exceptions.rs
+++ b/vmbase/example/src/exceptions.rs
@@ -14,8 +14,7 @@
 
 //! Exception handlers.
 
-use core::arch::asm;
-use vmbase::{eprintln, power::reboot};
+use vmbase::{eprintln, power::reboot, read_sysreg};
 
 #[no_mangle]
 extern "C" fn sync_exception_current(_elr: u64, _spsr: u64) {
@@ -71,9 +70,6 @@
 
 #[inline]
 fn print_esr() {
-    let mut esr: u64;
-    unsafe {
-        asm!("mrs {esr}, esr_el1", esr = out(reg) esr);
-    }
+    let esr = read_sysreg!("esr_el1");
     eprintln!("esr={:#08x}", esr);
 }