From edeecbff0e231c04b7222a79a26017a48668f0e2 Mon Sep 17 00:00:00 2001 From: Charles Davis Date: Sun, 22 May 2011 00:56:20 +0000 Subject: Don't allow unaligned offsets and sizes in the Win64 EH directives. Also, fix threshold for 'Big' register saves. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131830 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCStreamer.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/MC/MCStreamer.cpp b/lib/MC/MCStreamer.cpp index a760f2c..164325e 100644 --- a/lib/MC/MCStreamer.cpp +++ b/lib/MC/MCStreamer.cpp @@ -388,6 +388,8 @@ void MCStreamer::EmitWin64EHPushReg(unsigned Register) { void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) { EnsureValidW64UnwindInfo(); + if (Offset & 0x0F) + report_fatal_error("Misaligned frame pointer offset!"); MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHInstruction Inst(Win64EH::UOP_SetFPReg, Register, Offset); CurFrame->LastFrameInst = CurFrame->Instructions.size(); @@ -396,6 +398,8 @@ void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) { void MCStreamer::EmitWin64EHAllocStack(unsigned Size) { EnsureValidW64UnwindInfo(); + if (Size & 7) + report_fatal_error("Misaligned stack allocation!"); MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHInstruction Inst(Size); CurFrame->Instructions.push_back(Inst); @@ -403,18 +407,22 @@ void MCStreamer::EmitWin64EHAllocStack(unsigned Size) { void MCStreamer::EmitWin64EHSaveReg(unsigned Register, unsigned Offset) { EnsureValidW64UnwindInfo(); + if (Offset & 7) + report_fatal_error("Misaligned saved register offset!"); MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHInstruction Inst( - Offset > 0xFFFF ? Win64EH::UOP_SaveNonVol : Win64EH::UOP_SaveNonVolBig, + Offset > 512*1024-8 ? Win64EH::UOP_SaveNonVol : Win64EH::UOP_SaveNonVolBig, Register, Offset); CurFrame->Instructions.push_back(Inst); } void MCStreamer::EmitWin64EHSaveXMM(unsigned Register, unsigned Offset) { EnsureValidW64UnwindInfo(); + if (Offset & 0x0F) + report_fatal_error("Misaligned saved vector register offset!"); MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHInstruction Inst( - Offset > 0xFFFF ? Win64EH::UOP_SaveXMM128 : Win64EH::UOP_SaveXMM128Big, + Offset > 512*1024-16 ? Win64EH::UOP_SaveXMM128 : Win64EH::UOP_SaveXMM128Big, Register, Offset); CurFrame->Instructions.push_back(Inst); } -- cgit v1.1