Add some more Win64 EH directives:

- StartChained and EndChained delimit a chained unwind area, which can contain
  additional operations to be undone if an exception occurs inside of it.
- UnwindOnly declares that this function doesn't handle any exceptions. If it
  has a handler, it's an unwind handler instead of an exception handler.
- Lsda declares the location and size of the LSDA, which in the Win64 EH
  scheme is kept inside the UNWIND_INFO struct. Windows itself ignores the
  LSDA; it's used by the Language-Specific Handler (the "Personality Function"
  from DWARF).

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

diff --git a/include/llvm/MC/MCStreamer.h b/include/llvm/MC/MCStreamer.h
index 1a01d6baa9e6adf055633825f4609fe5fda56072..aceba7612004090ef11f524e872f4433e5bcecf9 100644 (file)
--- a/include/llvm/MC/MCStreamer.h
+++ b/include/llvm/MC/MCStreamer.h
@@ -459,6 +459,10 @@ namespace llvm {
 
     virtual void EmitWin64EHStartProc(MCSymbol *Symbol, MCSymbol *EHandler = 0);
     virtual void EmitWin64EHEndProc();
+    virtual void EmitWin64EHStartChained();
+    virtual void EmitWin64EHEndChained();
+    virtual void EmitWin64EHUnwindOnly();
+    virtual void EmitWin64EHLsda(const MCSymbol *Sym, int64_t Size);
     virtual void EmitWin64EHPushReg(int64_t Register);
     virtual void EmitWin64EHSetFrame(int64_t Register, int64_t Offset);
     virtual void EmitWin64EHAllocStack(int64_t Size);

diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 41a821dbb9d54f3ded8356f195014e2533e3d070..f62111bcf86876e4a39b717bcf294e96e90babc0 100644 (file)
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -210,6 +210,10 @@ public:
 
   virtual void EmitWin64EHStartProc(MCSymbol *Symbol, MCSymbol *EHandler = 0);
   virtual void EmitWin64EHEndProc();
+  virtual void EmitWin64EHStartChained();
+  virtual void EmitWin64EHEndChained();
+  virtual void EmitWin64EHUnwindOnly();
+  virtual void EmitWin64EHLsda(cosnt MCSymbol *Sym, int64_t Size);
   virtual void EmitWin64EHPushReg(int64_t Register);
   virtual void EmitWin64EHSetFrame(int64_t Register, int64_t Offset);
   virtual void EmitWin64EHAllocStack(int64_t Size);
@@ -942,6 +946,38 @@ void MCAsmStreamer::EmitWin64EHEndProc()
   EmitEOL();
 }
 
+void MCAsmStreamer::EmitWin64EHStartChained()
+{
+  //MCStreamer::EmitWin64EHStartChained();
+
+  OS << "\t.w64_startchained";
+  EmitEOL();
+}
+
+void MCAsmStreamer::EmitWin64EHEndChained()
+{
+  //MCStreamer::EmitWin64EHEndChained();
+
+  OS << "\t.w64_endchained";
+  EmitEOL();
+}
+
+void MCAsmStreamer::EmitWin64EHUnwindOnly()
+{
+  //MCStreamer::EmitWin64EHUnwindOnly();
+
+  OS << "\t.w64_unwind_only";
+  EmitEOL();
+}
+
+void MCAsmStreamer::EmitWin64EHLsda(cosnt MCSymbol *Sym, int64_t Size)
+{
+  //MCStreamer::EmitWin64EHLsda(Sym, Size);
+
+  OS << "\t.w64_lsda " << *Sym << ", " << Size;
+  EmitEOL();
+}
+
 void MCAsmStreamer::EmitWin64EHPushReg(int64_t Register)
 {
   //MCStreamer::EmitWin64EHPushReg(Register);

diff --git a/lib/MC/MCStreamer.cpp b/lib/MC/MCStreamer.cpp
index 5924d02802ad4d7421524d1dba587604ce132b7a..bf63f8faee4cbe57109c91b7b7f25077c38cf647 100644 (file)
--- a/lib/MC/MCStreamer.cpp
+++ b/lib/MC/MCStreamer.cpp
@@ -322,6 +322,30 @@ void MCStreamer::EmitWin64EHEndProc()
   abort();
 }
 
+void MCStreamer::EmitWin64EHStartChained()
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
+void MCStreamer::EmitWin64EHEndChained()
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
+void MCStreamer::EmitWin64EHUnwindOnly()
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
+void MCStreamer::EmitWin64EHLsda(const MCSymbol *Sym, int64_t Size)
+{
+  errs() << "Not implemented yet\n";
+  abort();
+}
+
 void MCStreamer::EmitWin64EHPushReg(int64_t Register)
 {
   errs() << "Not implemented yet\n";