[CodeGen] Separate assembly emission ownership

4 files changed, 80 insertions, 71 deletions

diff --git a/backend/include/rcc/CodeGen/AsmPrinter.h b/backend/include/rcc/CodeGen/AsmPrinter.h
index 82bad7d..4145093 100644
--- a/backend/include/rcc/CodeGen/AsmPrinter.h
+++ b/backend/include/rcc/CodeGen/AsmPrinter.h
@@ -3,14 +3,24 @@
 #ifndef RCC_CODEGEN_ASMPRINTER_H
 #define RCC_CODEGEN_ASMPRINTER_H
 
+#include "rcc/IR/DataLayout.h"
 #include "rcc/Support/Error.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <utility>
+
 namespace rcc {
 
 class CompilationUnit;
+class GlobalInitializer;
 class MachineFunction;
+class MachineJumpTableEntry;
 class MachineMCContext;
+struct GenericConstantData;
+class TargetConstant;
 class TargetDescription;
+class TargetLoweringObjectFile;
 class TargetMCInstLowering;
 
 namespace mc {
@@ -25,31 +35,56 @@ struct AsmPrinterOptions final {
   bool VerifyInput = true;
 };
 
-class AsmPrinter final {
+class AsmPrinter {
 public:
   AsmPrinter(const TargetDescription &Target, const TargetMCInstLowering &Lowering,
+             const TargetLoweringObjectFile &ObjectFile, DataLayout Layout,
              MachineMCContext &Context, mc::MCStreamer &Streamer,
              AsmPrinterOptions Options = {}) noexcept
-      : Target(&Target), Lowering(&Lowering), Context(&Context), Streamer(&Streamer),
-        Options(Options) {}
+      : Target(&Target), Lowering(&Lowering), ObjectFile(&ObjectFile), Layout(std::move(Layout)),
+        Context(&Context), Streamer(&Streamer), Options(Options) {}
+  virtual ~AsmPrinter() = default;
 
   [[nodiscard]] Expected<void> emitCompilationUnit(const CompilationUnit &Unit);
   [[nodiscard]] Expected<void> emitFunction(const MachineFunction &Function);
 
+protected:
+  [[nodiscard]] virtual Expected<void> emitStartOfAsmFile();
+  [[nodiscard]] virtual Expected<void> emitEndOfAsmFile();
+  [[nodiscard]] virtual Expected<void> emitTargetConstant(const TargetConstant &Constant);
+  [[nodiscard]] virtual Expected<void> emitTargetJumpTable(const MachineFunction &Function,
+                                                           const MachineJumpTableEntry &Entry);
+
+  [[nodiscard]] MachineMCContext &machineContext() const noexcept {
+    return *Context;
+  }
+
+  [[nodiscard]] mc::MCStreamer &streamer() const noexcept {
+    return *Streamer;
+  }
+
 private:
   [[nodiscard]] Expected<void> verifyFunction(const MachineFunction &Function) const;
   [[nodiscard]] Expected<void> emitGlobalObjects(const CompilationUnit &Unit);
+  [[nodiscard]] Expected<void> emitFunctionImpl(const MachineFunction &Function);
   [[nodiscard]] Expected<void> emitFunctionBody(const MachineFunction &Function);
   [[nodiscard]] Expected<void> emitConstantPool(const MachineFunction &Function);
   [[nodiscard]] Expected<void> emitJumpTables(const MachineFunction &Function);
+  [[nodiscard]] Expected<void> emitGenericConstant(const GenericConstantData &Constant,
+                                                   std::uint64_t AllocationSize,
+                                                   std::size_t Depth = 0);
+  [[nodiscard]] Expected<void> emitGlobalInitializer(const GlobalInitializer &Initializer,
+                                                     std::size_t Depth = 0);
 
   const TargetDescription *Target;
   const TargetMCInstLowering *Lowering;
+  const TargetLoweringObjectFile *ObjectFile;
+  DataLayout Layout;
   MachineMCContext *Context;
   mc::MCStreamer *Streamer;
   AsmPrinterOptions Options;
-  bool UnitEmissionStarted = false;
-  bool UnitEmissionFinished = false;
+  bool EmissionStarted = false;
+  bool EmissionFinished = false;
 };
 
 } // namespace rcc
diff --git a/backend/include/rcc/CodeGen/TargetLoweringObjectFile.h b/backend/include/rcc/CodeGen/TargetLoweringObjectFile.h
new file mode 100644
index 0000000..f415e4f
--- /dev/null
+++ b/backend/include/rcc/CodeGen/TargetLoweringObjectFile.h
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef RCC_CODEGEN_TARGETLOWERINGOBJECTFILE_H
+#define RCC_CODEGEN_TARGETLOWERINGOBJECTFILE_H
+
+#include "rcc/MC/MCSection.h"
+#include "rcc/Support/Error.h"
+
+namespace rcc {
+
+struct GlobalObjectDesc;
+class MachineConstantPoolEntry;
+class MachineFunction;
+class MachineJumpTableEntry;
+class MachineMCContext;
+
+class TargetLoweringObjectFile {
+public:
+  virtual ~TargetLoweringObjectFile() = default;
+
+  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
+  textSection(const MachineFunction &Function) const = 0;
+  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
+  globalSection(const GlobalObjectDesc &Object, MachineMCContext &Context) const = 0;
+  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
+  constantPoolSection(const MachineFunction &Function,
+                      const MachineConstantPoolEntry &Entry) const = 0;
+  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
+  jumpTableSection(const MachineFunction &Function, const MachineJumpTableEntry &Entry) const = 0;
+};
+
+} // namespace rcc
+
+#endif // RCC_CODEGEN_TARGETLOWERINGOBJECTFILE_H
diff --git a/backend/include/rcc/CodeGen/TargetMCInstLowering.h b/backend/include/rcc/CodeGen/TargetMCInstLowering.h
index 875d2dd..eacb48e 100644
--- a/backend/include/rcc/CodeGen/TargetMCInstLowering.h
+++ b/backend/include/rcc/CodeGen/TargetMCInstLowering.h
@@ -3,23 +3,16 @@
 #ifndef RCC_CODEGEN_TARGETMCINSTLOWERING_H
 #define RCC_CODEGEN_TARGETMCINSTLOWERING_H
 
+#include "rcc/MC/MCExpr.h"
 #include "rcc/MC/MCInst.h"
 #include "rcc/MC/MCInstPrinter.h"
-#include "rcc/MC/MCSection.h"
 #include "rcc/MC/MCStreamer.h"
 #include "rcc/Support/Error.h"
 
 namespace rcc {
 
-class MachineConstantPoolEntry;
-class GlobalInitializer;
-struct GlobalObjectDesc;
-class MachineFunction;
 class MachineInstr;
-class MachineJumpTableEntry;
 class MachineMCContext;
-struct GenericConstantData;
-class TargetConstant;
 
 class TargetMCInstLowering {
 public:
@@ -30,38 +23,12 @@ public:
   [[nodiscard]] virtual Expected<mc::MCInst> lowerInstruction(const MachineInstr &Instruction,
                                                               MachineMCContext &Context) const = 0;
 
+  [[nodiscard]] virtual Expected<mc::MCExprRef>
+  lowerSymbolExpression(mc::MCExprRef Expression, std::uint32_t TargetFlags) const = 0;
+
   [[nodiscard]] virtual Expected<void> emitTerminalInstruction(const MachineInstr &Instruction,
                                                                MachineMCContext &Context,
                                                                mc::MCStreamer &Streamer) const;
-
-  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
-  textSection(const MachineFunction &Function) const = 0;
-  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
-  globalSection(const GlobalObjectDesc &Object, MachineMCContext &Context) const = 0;
-  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
-  constantPoolSection(const MachineFunction &Function,
-                      const MachineConstantPoolEntry &Entry) const = 0;
-  [[nodiscard]] virtual Expected<mc::MCSectionDesc>
-  jumpTableSection(const MachineFunction &Function, const MachineJumpTableEntry &Entry) const = 0;
-
-  [[nodiscard]] virtual Expected<void> emitFileHeader(MachineMCContext &Context,
-                                                      mc::MCStreamer &Streamer) const;
-  [[nodiscard]] virtual Expected<void> emitFileTrailer(MachineMCContext &Context,
-                                                       mc::MCStreamer &Streamer) const;
-  [[nodiscard]] virtual Expected<void> emitGenericConstant(const GenericConstantData &Constant,
-                                                           std::uint64_t Size,
-                                                           MachineMCContext &Context,
-                                                           mc::MCStreamer &Streamer) const;
-  [[nodiscard]] virtual Expected<void> emitGlobalInitializer(const GlobalInitializer &Initializer,
-                                                             MachineMCContext &Context,
-                                                             mc::MCStreamer &Streamer) const;
-  [[nodiscard]] virtual Expected<void> emitTargetConstant(const TargetConstant &Constant,
-                                                          MachineMCContext &Context,
-                                                          mc::MCStreamer &Streamer) const;
-  [[nodiscard]] virtual Expected<void> emitTargetJumpTable(const MachineFunction &Function,
-                                                           const MachineJumpTableEntry &Entry,
-                                                           MachineMCContext &Context,
-                                                           mc::MCStreamer &Streamer) const;
 };
 
 } // namespace rcc
diff --git a/backend/include/rcc/Target/RISCV/RISCVMCTargetLowering.h b/backend/include/rcc/Target/RISCV/RISCVMCTargetLowering.h
index fd620ad..3713bb5 100644
--- a/backend/include/rcc/Target/RISCV/RISCVMCTargetLowering.h
+++ b/backend/include/rcc/Target/RISCV/RISCVMCTargetLowering.h
@@ -19,39 +19,12 @@ public:
 
   [[nodiscard]] Expected<mc::MCInst> lowerInstruction(const MachineInstr &Instruction,
                                                       MachineMCContext &Context) const override;
+  [[nodiscard]] Expected<mc::MCExprRef>
+  lowerSymbolExpression(mc::MCExprRef Expression, std::uint32_t TargetFlags) const override;
   [[nodiscard]] Expected<void> emitTerminalInstruction(const MachineInstr &Instruction,
                                                        MachineMCContext &Context,
                                                        mc::MCStreamer &Streamer) const override;
 
-  [[nodiscard]] Expected<mc::MCSectionDesc>
-  textSection(const MachineFunction &Function) const override;
-  [[nodiscard]] Expected<mc::MCSectionDesc> globalSection(const GlobalObjectDesc &Object,
-                                                          MachineMCContext &Context) const override;
-  [[nodiscard]] Expected<mc::MCSectionDesc>
-  constantPoolSection(const MachineFunction &Function,
-                      const MachineConstantPoolEntry &Entry) const override;
-  [[nodiscard]] Expected<mc::MCSectionDesc>
-  jumpTableSection(const MachineFunction &Function,
-                   const MachineJumpTableEntry &Entry) const override;
-
-  [[nodiscard]] Expected<void> emitFileHeader(MachineMCContext &Context,
-                                              mc::MCStreamer &Streamer) const override;
-  [[nodiscard]] Expected<void> emitFileTrailer(MachineMCContext &Context,
-                                               mc::MCStreamer &Streamer) const override;
-  [[nodiscard]] Expected<void> emitGenericConstant(const GenericConstantData &Constant,
-                                                   std::uint64_t Size, MachineMCContext &Context,
-                                                   mc::MCStreamer &Streamer) const override;
-  [[nodiscard]] Expected<void> emitGlobalInitializer(const GlobalInitializer &Initializer,
-                                                     MachineMCContext &Context,
-                                                     mc::MCStreamer &Streamer) const override;
-  [[nodiscard]] Expected<void> emitTargetConstant(const TargetConstant &Constant,
-                                                  MachineMCContext &Context,
-                                                  mc::MCStreamer &Streamer) const override;
-  [[nodiscard]] Expected<void> emitTargetJumpTable(const MachineFunction &Function,
-                                                   const MachineJumpTableEntry &Entry,
-                                                   MachineMCContext &Context,
-                                                   mc::MCStreamer &Streamer) const override;
-
 private:
   const TargetDescription *Target;
   RISCVInstPrinter Printer;