6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-19 20:34:38 +00:00
Code Issues Projects Releases Wiki Activity

Don't allow unaligned offsets and sizes in the Win64 EH directives.

Browse Source 
Also, fix threshold for 'Big' register saves.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131830 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Charles Davis 2011-05-22 00:56:20 +00:00
parent 9bb4a2ae8a
commit edeecbff0e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/MC/MCStreamer.cpp
View File

@ -388,6 +388,8 @@ void MCStreamer::EmitWin64EHPushReg(unsigned Register) {
void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) { void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) {
EnsureValidW64UnwindInfo(); EnsureValidW64UnwindInfo();
if (Offset & 0x0F)
report_fatal_error("Misaligned frame pointer offset!");
MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo;
MCWin64EHInstruction Inst(Win64EH::UOP_SetFPReg, Register, Offset); MCWin64EHInstruction Inst(Win64EH::UOP_SetFPReg, Register, Offset);
CurFrame->LastFrameInst = CurFrame->Instructions.size(); CurFrame->LastFrameInst = CurFrame->Instructions.size();
@ -396,6 +398,8 @@ void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) {
void MCStreamer::EmitWin64EHAllocStack(unsigned Size) { void MCStreamer::EmitWin64EHAllocStack(unsigned Size) {
EnsureValidW64UnwindInfo(); EnsureValidW64UnwindInfo();
if (Size & 7)
report_fatal_error("Misaligned stack allocation!");
MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo;
MCWin64EHInstruction Inst(Size); MCWin64EHInstruction Inst(Size);
CurFrame->Instructions.push_back(Inst); CurFrame->Instructions.push_back(Inst);
@ -403,18 +407,22 @@ void MCStreamer::EmitWin64EHAllocStack(unsigned Size) {
void MCStreamer::EmitWin64EHSaveReg(unsigned Register, unsigned Offset) { void MCStreamer::EmitWin64EHSaveReg(unsigned Register, unsigned Offset) {
EnsureValidW64UnwindInfo(); EnsureValidW64UnwindInfo();
if (Offset & 7)
report_fatal_error("Misaligned saved register offset!");
MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo;
MCWin64EHInstruction Inst( MCWin64EHInstruction Inst(
Offset > 0xFFFF ? Win64EH::UOP_SaveNonVol : Win64EH::UOP_SaveNonVolBig, Offset > 512*1024-8 ? Win64EH::UOP_SaveNonVol : Win64EH::UOP_SaveNonVolBig,
Register, Offset); Register, Offset);
CurFrame->Instructions.push_back(Inst); CurFrame->Instructions.push_back(Inst);
} }
void MCStreamer::EmitWin64EHSaveXMM(unsigned Register, unsigned Offset) { void MCStreamer::EmitWin64EHSaveXMM(unsigned Register, unsigned Offset) {
EnsureValidW64UnwindInfo(); EnsureValidW64UnwindInfo();
if (Offset & 0x0F)
report_fatal_error("Misaligned saved vector register offset!");
MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo; MCWin64EHUnwindInfo *CurFrame = CurrentW64UnwindInfo;
MCWin64EHInstruction Inst( MCWin64EHInstruction Inst(
Offset > 0xFFFF ? Win64EH::UOP_SaveXMM128 : Win64EH::UOP_SaveXMM128Big, Offset > 512*1024-16 ? Win64EH::UOP_SaveXMM128 : Win64EH::UOP_SaveXMM128Big,
Register, Offset); Register, Offset);
CurFrame->Instructions.push_back(Inst); CurFrame->Instructions.push_back(Inst);
} }