Add support for specifying register name in cfi-register/offset/def

as well as register number.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124379 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp
index b72894db78b3c6f9abd86d9683e44bd4908e6803..9cb15b496fb2dcbfbeb39928210b2ad4adb315c0 100644 (file)
--- a/lib/MC/MCParser/AsmParser.cpp
+++ b/lib/MC/MCParser/AsmParser.cpp
@@ -30,6 +30,7 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetAsmParser.h"
 #include <cctype>
 #include <vector>
@@ -274,6 +275,8 @@ public:
     AddDirectiveHandler<&GenericAsmParser::ParseDirectiveLEB128>(".uleb128");
   }
 
+  bool ParseRegisterOrRegisterNumber(int64_t &Register, SMLoc DirectiveLoc);
+
   bool ParseDirectiveFile(StringRef, SMLoc DirectiveLoc);
   bool ParseDirectiveLine(StringRef, SMLoc DirectiveLoc);
   bool ParseDirectiveLoc(StringRef, SMLoc DirectiveLoc);
@@ -2181,12 +2184,28 @@ bool GenericAsmParser::ParseDirectiveCFIEndProc(StringRef, SMLoc DirectiveLoc) {
   return getStreamer().EmitCFIEndProc();
 }
 
+/// ParseRegisterOrRegisterNumber - parse register name or number.
+bool GenericAsmParser::ParseRegisterOrRegisterNumber(int64_t &Register,
+                                                     SMLoc DirectiveLoc) {
+  unsigned RegNo;
+
+  if (getLexer().is(AsmToken::Percent)) {
+    if (getParser().getTargetParser().ParseRegister(RegNo, DirectiveLoc,
+      DirectiveLoc))
+      return true;
+    Register = getContext().getTargetAsmInfo().getDwarfRegNum(RegNo, true);
+  } else
+    return getParser().ParseAbsoluteExpression(Register);
+  
+  return false;
+}
+
 /// ParseDirectiveCFIDefCfa
 /// ::= .cfi_def_cfa register,  offset
 bool GenericAsmParser::ParseDirectiveCFIDefCfa(StringRef,
                                                SMLoc DirectiveLoc) {
   int64_t Register = 0;
-  if (getParser().ParseAbsoluteExpression(Register))
+  if (ParseRegisterOrRegisterNumber(Register, DirectiveLoc))
     return true;
 
   if (getLexer().isNot(AsmToken::Comma))
@@ -2216,7 +2235,7 @@ bool GenericAsmParser::ParseDirectiveCFIDefCfaOffset(StringRef,
 bool GenericAsmParser::ParseDirectiveCFIDefCfaRegister(StringRef,
                                                        SMLoc DirectiveLoc) {
   int64_t Register = 0;
-  if (getParser().ParseAbsoluteExpression(Register))
+  if (ParseRegisterOrRegisterNumber(Register, DirectiveLoc))
     return true;
 
   return getStreamer().EmitCFIDefCfaRegister(Register);
@@ -2227,7 +2246,8 @@ bool GenericAsmParser::ParseDirectiveCFIDefCfaRegister(StringRef,
 bool GenericAsmParser::ParseDirectiveCFIOffset(StringRef, SMLoc DirectiveLoc) {
   int64_t Register = 0;
   int64_t Offset = 0;
-  if (getParser().ParseAbsoluteExpression(Register))
+
+  if (ParseRegisterOrRegisterNumber(Register, DirectiveLoc))
     return true;
 
   if (getLexer().isNot(AsmToken::Comma))

diff --git a/test/MC/ELF/cfi-offset.s b/test/MC/ELF/cfi-offset.s
index ec26464f18ec9ae22830ed26fdc0e5f8d2a11812..2f7e7976fa570a77855138e8a75b0909f98bab3a 100644 (file)
--- a/test/MC/ELF/cfi-offset.s
+++ b/test/MC/ELF/cfi-offset.s
@@ -3,7 +3,7 @@
 f:
        .cfi_startproc
         nop
-       .cfi_offset 6, -16
+       .cfi_offset %ebp, -16
         nop
        .cfi_endproc