a few changes

Author: mateoconlechuga

llvm/lib/Target/Z80/GISel/Z80CallLowering.cpp

@@ -29,8 +29,8 @@
 using namespace llvm;
 using namespace MIPatternMatch;
 
-cl::opt<bool> ReturnSRet("z80-return-sret", cl::desc("Return sret pointers"),
-                         cl::init(true), cl::Hidden);
+static cl::opt<bool> ReturnSRet("z80-return-sret", cl::desc("Return sret pointers"),
+                                cl::init(true), cl::Hidden);
 
 #define DEBUG_TYPE "z80-call-lowering"
 

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

@@ -24,8 +24,7 @@ static cl::opt<bool> EscapeNonPrint(
         "Avoid outputting non-printable ascii characters to assembly files."),
     cl::Hidden);
 
-// TODO: Put this somewhere more appropriate for a global
-cl::opt<bool> GasStyle(
+cl::opt<bool> Z80GasStyle(
     "z80-gas-style",
     cl::desc("Use GAS style assembly syntax instead of FASMG style."),
     cl::NotHidden);
@@ -36,8 +35,8 @@ Z80MCAsmInfoELF::Z80MCAsmInfoELF(const Triple &T) {
   bool Is16Bit = T.isArch16Bit() || T.getEnvironment() == Triple::CODE16;
   CodePointerSize = CalleeSaveStackSlotSize = Is16Bit ? 2 : 3;
   MaxInstLength = 6;
-  
-  if (!GasStyle) {
+
+  if (!Z80GasStyle) {
     DollarIsPC = true;
     SeparatorString = nullptr;
     CommentString = ";";
@@ -92,7 +91,7 @@ MCSection *Z80MCAsmInfoELF::getNonexecutableStackSection(MCContext &Ctx) const {
 }
 
 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 {
@@ -102,10 +101,10 @@ bool Z80MCAsmInfoELF::shouldOmitSectionDirective(StringRef SectionName) const {
 const char *Z80MCAsmInfoELF::getBlockDirective(int64_t Size) const {
   switch (Size) {
   default: return nullptr;
-  case 1: return GasStyle ? "\t.byte" : "\tdb\t";
-  case 2: return GasStyle ? "\t.short" : "\tdw\t";
-  case 3: return GasStyle ? "\t.long" : "\tdl\t";
-  case 4: return GasStyle ? "\t.quad" : "\tdd\t";
+  case 1: return Z80GasStyle ? "\t.byte" : "\tdb\t";
+  case 2: return Z80GasStyle ? "\t.short" : "\tdw\t";
+  case 3: return Z80GasStyle ? "\t.long" : "\tdl\t";
+  case 4: return Z80GasStyle ? "\t.quad" : "\tdd\t";
   }
 }
 

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

@@ -19,7 +19,7 @@
 
 using namespace llvm;
 
-extern cl::opt<bool> GasStyle;
+extern cl::opt<bool> Z80GasStyle;
 
 Z80TargetStreamer::Z80TargetStreamer(MCStreamer &S)
     : MCTargetStreamer(S) {}
@@ -35,36 +35,34 @@ void Z80TargetAsmStreamer::emitLabel(MCSymbol *Symbol) {
 
 void Z80TargetAsmStreamer::emitAlign(Align Alignment) {
   if (auto Mask = Alignment.value() - 1)
-    GasStyle ? OS << "\t.skip\t($$ - $) and " << Mask << '\n' : OS << "\trb\t($$ - $) and " << Mask << '\n';
+    Z80GasStyle ? OS << "\t.skip\t($$ - $) and " << Mask << '\n' : OS << "\trb\t($$ - $) and " << Mask << '\n';
 }
 
 void Z80TargetAsmStreamer::emitBlock(uint64_t NumBytes) {
   if (NumBytes)
-    GasStyle ? OS << "\t.skip\t" << NumBytes << '\n' : OS << "\trb\t" << NumBytes << '\n';
+    Z80GasStyle ? OS << "\t.skip\t" << NumBytes << '\n' : OS << "\trb\t" << NumBytes << '\n';
 }
 
 void Z80TargetAsmStreamer::emitLocal(MCSymbol *Symbol) {
-  if (!GasStyle) {
-    OS << "\tprivate\t";
-    Symbol->print(OS, MAI);
-    OS << '\n';
-  }
+  Z80GasStyle ? OS << "\t.local\t" : OS << "\tprivate\t";
+  Symbol->print(OS, MAI);
+  OS << '\n';
 }
 
 void Z80TargetAsmStreamer::emitWeakGlobal(MCSymbol *Symbol) {
-  GasStyle ? OS << "\t.weak\t" : OS << "\tweak\t";
+  Z80GasStyle ? OS << "\t.weak\t" : OS << "\tweak\t";
   Symbol->print(OS, MAI);
   OS << '\n';
 }
 
 void Z80TargetAsmStreamer::emitGlobal(MCSymbol *Symbol) {
-  GasStyle ? OS << "\t.globl\t" : OS << "\tpublic\t";
+  Z80GasStyle ? OS << "\t.global\t" : OS << "\tpublic\t";
   Symbol->print(OS, MAI);
   OS << '\n';
 }
 
 void Z80TargetAsmStreamer::emitExtern(MCSymbol *Symbol) {
-  GasStyle ? OS << "\t.extern\t" : OS << "\textern\t";
+  Z80GasStyle ? OS << "\t.extern\t" : OS << "\textern\t";
   Symbol->print(OS, MAI);
   OS << '\n';
 }