[z80] fix gas output for string escape sequences

Author: mateoconlechuga

llvm/lib/Target/Z80/MCTargetDesc/Z80MCAsmInfo.cpp

@@ -24,69 +24,92 @@ static cl::opt<bool> EscapeNonPrint(
         "Avoid outputting non-printable ascii characters to assembly files."),
     cl::Hidden);
 
+cl::opt<bool> Z80GasStyle(
+    "z80-gas-style",
+    cl::desc("Use GAS style assembly syntax instead of FASMG style."),
+    cl::NotHidden);
+
 void Z80MCAsmInfoELF::anchor() { }
 
 Z80MCAsmInfoELF::Z80MCAsmInfoELF(const Triple &T) {
   bool Is16Bit = T.isArch16Bit() || T.getEnvironment() == Triple::CODE16;
   CodePointerSize = CalleeSaveStackSlotSize = Is16Bit ? 2 : 3;
   MaxInstLength = 6;
-  DollarIsPC = true;
-  SeparatorString = nullptr;
+
+  // Common to both GAS and fasmg
   CommentString = ";";
-  PrivateGlobalPrefix = PrivateLabelPrefix = "";
-  Code16Directive = "assume\tadl = 0";
-  Code24Directive = "assume\tadl = 1";
+  AscizDirective = nullptr;
   Code32Directive = Code64Directive = nullptr;
+  UseIntegratedAssembler = false;
   AssemblerDialect = !Is16Bit;
-  SupportsQuotedNames = false;
-  ZeroDirective = AscizDirective = nullptr;
-  BlockSeparator = " dup ";
-  AsciiDirective = ByteListDirective = Data8bitsDirective = "\tdb\t";
-  NumberLiteralSyntax = ANLS_PlainDecimal;
-  CharacterLiteralSyntax = ACLS_SingleQuotes;
-  HasPairedDoubleQuoteStringConstants = true;
-  HasBackslashEscapesInStringConstants = false;
-  StringConstantsEscapeNonPrint = EscapeNonPrint;
-  StringConstantsRequiredEscapes = {"\n\r\32", 4}; // include null
-  Data16bitsDirective = "\tdw\t";
-  Data24bitsDirective = "\tdl\t";
-  Data32bitsDirective = "\tdd\t";
-  Data64bitsDirective = "\tdq\t";
-  DataULEB128Directive = "\tuleb128\t";
-  DataSLEB128Directive = "\tsleb128\t";
-  SectionDirective = "\tsection\t";
-  AlwaysChangeSection = true;
-  GlobalDirective = "\tpublic\t";
-  LGloblDirective = "\tprivate\t";
-  SetDirective = "\tlabel\t";
-  SetSeparator = " at ";
   HasFunctionAlignment = false;
-  HasDotTypeDotSizeDirective = false;
-  IdentDirective = "\tident\t";
-  WeakDirective = "\tweak\t";
-  UseIntegratedAssembler = false;
-  UseLogicalShr = false;
-  HasSingleParameterDotFile = false;
-  SupportsDebugInformation = SupportsCFI = true;
   ExceptionsType = ExceptionHandling::SjLj;
-  DwarfFileDirective = "\tfile\t";
-  DwarfLocDirective = "\tloc\t";
-  DwarfCFIDirectivePrefix = "\tcfi_";
+
+  if (Z80GasStyle) {
+    Code16Directive = ".assume\tADL = 0";
+    Code24Directive = ".assume\tADL = 1";
+    AsciiDirective = ByteListDirective = Data8bitsDirective = "\tdb\t";
+    Data16bitsDirective = "\tdw\t";
+    Data24bitsDirective = "\td24\t";
+    Data32bitsDirective = "\td32\t";
+    StringConstantsEscapeNonPrint = true;
+    StringConstantsRequiredEscapes = {"\n\r\32", 4}; // include null
+  } else {
+    Code16Directive = "assume\tadl = 0";
+    Code24Directive = "assume\tadl = 1";
+    DollarIsPC = true;
+    SeparatorString = nullptr;
+    PrivateGlobalPrefix = PrivateLabelPrefix = "";
+    SupportsQuotedNames = false;
+    ZeroDirective = nullptr;
+    BlockSeparator = " dup ";
+    AsciiDirective = ByteListDirective = Data8bitsDirective = "\tdb\t";
+    NumberLiteralSyntax = ANLS_PlainDecimal;
+    CharacterLiteralSyntax = ACLS_SingleQuotes;
+    HasPairedDoubleQuoteStringConstants = true;
+    HasBackslashEscapesInStringConstants = false;
+    StringConstantsEscapeNonPrint = EscapeNonPrint;
+    StringConstantsRequiredEscapes = {"\n\r\32", 4}; // include null
+    Data16bitsDirective = "\tdw\t";
+    Data24bitsDirective = "\tdl\t";
+    Data32bitsDirective = "\tdd\t";
+    Data64bitsDirective = "\tdq\t";
+    DataULEB128Directive = "\tuleb128\t";
+    DataSLEB128Directive = "\tsleb128\t";
+    SectionDirective = "\tsection\t";
+    AlwaysChangeSection = true;
+    GlobalDirective = "\tpublic\t";
+    LGloblDirective = "\tprivate\t";
+    SetDirective = "\tlabel\t";
+    SetSeparator = " at ";
+    HasDotTypeDotSizeDirective = false;
+    IdentDirective = "\tident\t";
+    WeakDirective = "\tweak\t";
+    UseLogicalShr = false;
+    HasSingleParameterDotFile = false;
+    SupportsDebugInformation = SupportsCFI = true;
+    DwarfFileDirective = "\tfile\t";
+    DwarfLocDirective = "\tloc\t";
+    DwarfCFIDirectivePrefix = "\tcfi_";
+  }
 }
 
 MCSection *Z80MCAsmInfoELF::getNonexecutableStackSection(MCContext &Ctx) const {
   return nullptr;
 }
 
 bool Z80MCAsmInfoELF::isAcceptableChar(char C) const {
-  return MCAsmInfo::isAcceptableChar(C) || C == '%' || C == '^';
+  return Z80GasStyle ? MCAsmInfo::isAcceptableChar(C) : (MCAsmInfo::isAcceptableChar(C) || C == '%' || C == '^');
 }
 
 bool Z80MCAsmInfoELF::shouldOmitSectionDirective(StringRef SectionName) const {
   return false;
 }
 
 const char *Z80MCAsmInfoELF::getBlockDirective(int64_t Size) const {
+  if (Z80GasStyle) {
+    return MCAsmInfoELF::getBlockDirective(Size);
+  }
   switch (Size) {
   default: return nullptr;
   case 1: return "\tdb\t";
@@ -97,6 +120,9 @@ const char *Z80MCAsmInfoELF::getBlockDirective(int64_t Size) const {
 }
 
 const char *Z80MCAsmInfoELF::getUnaryOperator(unsigned Opc) const {
+  if (Z80GasStyle) {
+    return MCAsmInfoELF::getUnaryOperator(Opc);
+  }
   switch (Opc) {
   default: llvm_unreachable("unknown opcode");
   case MCUnaryExpr::LNot:  return "~";
@@ -107,6 +133,9 @@ const char *Z80MCAsmInfoELF::getUnaryOperator(unsigned Opc) const {
 }
 
 const char *Z80MCAsmInfoELF::getBinaryOperator(unsigned Opc) const {
+  if (Z80GasStyle) {
+    return MCAsmInfoELF::getBinaryOperator(Opc);
+  }
   switch (Opc) {
   default: llvm_unreachable("unknown opcode");
   case MCBinaryExpr::Add:   return     "+";