diff --git a/qemu/saimaa.c b/qemu/saimaa.c
index a149865..d1d9cf8 100644
--- a/qemu/saimaa.c
+++ b/qemu/saimaa.c
@@ -196,9 +196,9 @@ static uint64_t saimaa_vec_read(void *opaque, hwaddr off, unsigned size)
         uint32_t dfar = 0, ifsr = 0, dfsr = 0;
         if (cpu) {
             /* CP15 DFAR/IFSR/DFSR for abort diagnosis */
-            dfar = cpu->env.cp15.c6_data;
-            ifsr = cpu->env.cp15.c6_insn;
-            dfsr = cpu->env.cp15.c5_data;
+            dfar = cpu->env.cp15.dfar_s;
+            ifsr = (uint32_t)cpu->env.cp15.ifsr_s;
+            dfsr = (uint32_t)cpu->env.cp15.dfsr_s;
         }
         fprintf(stderr, "saimaa-vec: %s off=0x%x pc=0x%lx",
                 size == 2 ? "fetch?" : "read",