Fix issues so that ARM test passes

Author: theIDinside

src/CheckpointInfo.cc

@@ -39,8 +39,9 @@ MarkData::MarkData(rr::pcp::MarkData::Reader reader,
           reader.getSinglestepToNextMarkNoSignal()),
       arch(from_trace_arch(reader.getArch())) {
   regs.set_arch(arch);
-  regs.set_from_trace(arch, reader.getRegs().getRaw().begin(),
-                      reader.getRegs().getRaw().size());
+  regs.restore_from_persistent_checkpoint(arch,
+                                          reader.getRegs().getRaw().begin(),
+                                          reader.getRegs().getRaw().size());
   auto eregs = reader.getExtraRegs().getRaw();
   set_extra_regs_from_raw(arch, cpuid_recs, eregs, extra_regs);
   auto i = 0;

src/Registers.cc

@@ -639,7 +639,7 @@ void Registers::restore_from_persistent_checkpoint(SupportedArch arch,
       memcpy(&u.x64regs, data, size);
       break;
     case aarch64:
-      DEBUG_ASSERT(sizeof(u.x64regs) == size);
+      DEBUG_ASSERT(sizeof(u.arm64regs) == size);
       memcpy(&u.arm64regs, data, size);
       break;
   }

src/util.cc

@@ -2763,8 +2763,7 @@ trace::Arch to_trace_arch(SupportedArch arch) {
 }
 
 capnp::Data::Reader regs_to_raw(const Registers& regs) {
-  return { regs.get_ptrace_for_self_arch().data,
-           regs.get_ptrace_for_self_arch().size };
+  return { regs.get_regs_for_trace().data, regs.get_regs_for_trace().size };
 }
 
 kj::ArrayPtr<const capnp::byte> str_to_data(const std::string& str) {