[llvm] r346751 - Fix .cfi_restore with register numbers > 64

[Alexander Richardson via llvm-commits]

Author: arichardson
Date: Tue Nov 13 02:54:49 2018
New Revision: 346751

URL: http://llvm.org/viewvc/llvm-project?rev=346751&view=rev
Log:
Fix .cfi_restore with register numbers > 64

Summary:
DW_CFA_restore can only encode register numbers up to 64 (6 bits unsigned
int). For regsiter numbers > 64 we have to use DW_CFA_restore_extended
instead which uses a ULEB128 value.
I discovered this problem in the out-of-tree CHERI target since we use
DWARF register number 89 for our return capability register.

Reviewers: probinson, dblaikie, aprantl, espindola

Reviewed By: dblaikie

Subscribers: JohnReagan, emaste, JDevlieghere, llvm-commits

Differential Revision: https://reviews.llvm.org/D54420

Added:
    llvm/trunk/test/MC/ELF/cfi-restore-extended.s   (with props)
Modified:
    llvm/trunk/lib/MC/MCDwarf.cpp

Modified: llvm/trunk/lib/MC/MCDwarf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDwarf.cpp?rev=346751&r1=346750&r2=346751&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDwarf.cpp (original)
+++ llvm/trunk/lib/MC/MCDwarf.cpp Tue Nov 13 02:54:49 2018
@@ -1418,7 +1418,12 @@ void FrameEmitterImpl::EmitCFIInstructio
     unsigned Reg = Instr.getRegister();
     if (!IsEH)
       Reg = MRI->getDwarfRegNumFromDwarfEHRegNum(Reg);
-    Streamer.EmitIntValue(dwarf::DW_CFA_restore | Reg, 1);
+    if (Reg < 64) {
+      Streamer.EmitIntValue(dwarf::DW_CFA_restore | Reg, 1);
+    } else {
+      Streamer.EmitIntValue(dwarf::DW_CFA_restore_extended, 1);
+      Streamer.EmitULEB128IntValue(Reg);
+    }
     return;
   }
   case MCCFIInstruction::OpGnuArgsSize:

Added: llvm/trunk/test/MC/ELF/cfi-restore-extended.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/cfi-restore-extended.s?rev=346751&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/cfi-restore-extended.s (added)
+++ llvm/trunk/test/MC/ELF/cfi-restore-extended.s Tue Nov 13 02:54:49 2018
@@ -0,0 +1,17 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-dwarfdump -debug-frame - | FileCheck %s
+
+// Check that register numbers greater than 63 can be used in .cfi_restore directives
+f:
+  .cfi_startproc
+  nop
+// CHECK: DW_CFA_advance_loc: 1
+  .cfi_restore %rbp
+// CHECK-NEXT: DW_CFA_restore: reg6
+  nop
+// CHECK-NEXT: DW_CFA_advance_loc: 1
+  .cfi_restore 89
+// CHECK-NEXT: DW_CFA_restore_extended: reg89
+// CHECK-NEXT: DW_CFA_nop:
+  nop
+  .cfi_endproc
+

Propchange: llvm/trunk/test/MC/ELF/cfi-restore-extended.s
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: llvm/trunk/test/MC/ELF/cfi-restore-extended.s
------------------------------------------------------------------------------
    svn:keywords = FreeBSD=%H

Propchange: llvm/trunk/test/MC/ELF/cfi-restore-extended.s
------------------------------------------------------------------------------
    svn:mime-type = text/plain