thermosphere: fix various vgic bugs; fix register access OOB bug (xzr)

2019-12-24 17:35:47 +00:00
parent 62fe082cd4
commit f75f584f2f
3 changed files with 27 additions and 10 deletions
--- a/thermosphere/src/exceptions.h
+++ b/thermosphere/src/exceptions.h
@@ -102,6 +102,19 @@ static inline void spsrSetT32ItFlags(u64 *spsr, u32 itFlags)
    *spsr |= ((itFlags >> 2) & 0x3F) << 10;
 }

+static inline u64 readFrameRegisterZ(ExceptionStackFrame *frame, u32 id)
+{
+    return id == 31 ? 0 /* xzr */ : frame->x[id];
+}
+
+static inline void writeFrameRegisterZ(ExceptionStackFrame *frame, u32 id, u64 val)
+{
+    if (id != 31) {
+        // If not xzr
+        frame->x[id] = val;
+    }
+}
+
 bool spsrEvaluateConditionCode(u64 spsr, u32 conditionCode);
 void skipFaultingInstruction(ExceptionStackFrame *frame, u32 size);
 void dumpStackFrame(const ExceptionStackFrame *frame, bool sameEl);