Backend\X64: r10 and r11 should be caller-saved.

fleroviux · May 5, 2021 · 538a60f · 538a60f
1 parent 6e1ddb9
commit 538a60f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/backend/x86_64/backend.cpp b/src/backend/x86_64/backend.cpp
@@ -701,6 +701,8 @@ void X64Backend::Run(Memory& memory, State& state, IREmitter const& emitter, boo
           code.push(rdx);
           code.push(r8);
           code.push(r9);
+          code.push(r10);
+          code.push(r11);
 
           code.sub(rsp, 0x28);
           code.mov(edx, address_reg);
@@ -710,6 +712,8 @@ void X64Backend::Run(Memory& memory, State& state, IREmitter const& emitter, boo
           code.call(rax);
           code.add(rsp, 0x28);
 
+          code.pop(r11);
+          code.pop(r10);
           code.pop(r9);
           code.pop(r8);
           code.pop(rdx);

diff --git a/src/backend/x86_64/register_allocator.cpp b/src/backend/x86_64/register_allocator.cpp
@@ -16,8 +16,8 @@ namespace backend {
 X64RegisterAllocator::X64RegisterAllocator(IREmitter const& emitter, Xbyak::CodeGenerator& code)
     : emitter(emitter)
     , code(code) {
+  // rax and rcx are statically allocated
   Xbyak::Reg32 regs[] = {
-    // ecx,
     edx,
     ebx,
     esi,
@@ -123,7 +123,13 @@ void X64RegisterAllocator::ExpireVariables(int location) {
 }
 
 auto X64RegisterAllocator::IsCallerSaved(Xbyak::Reg32 reg) -> bool {
-  return reg == eax || reg == ecx || reg == edx || reg == r8d || reg == r9d;
+  return reg == eax  ||
+         reg == ecx  ||
+         reg == edx  ||
+         reg == r8d  ||
+         reg == r9d  ||
+         reg == r10d ||
+         reg == r11d;
 }
 
 } // namespace lunatic::backend