diff options
| author | Kai Nacke <kai.nacke@redstar.de> | 2013-07-08 04:48:34 +0000 |
|---|---|---|
| committer | Kai Nacke <kai.nacke@redstar.de> | 2013-07-08 04:48:34 +0000 |
| commit | c5cca5ab42030468c9132748c239061785060eaf (patch) | |
| tree | 2eda668db8b7f1c2dd09cc7db90d1652984392de /llvm/lib | |
| parent | ac9201a48ffbfe86e7440f17476208379703cb0a (diff) | |
| download | bcm5719-llvm-c5cca5ab42030468c9132748c239061785060eaf.tar.gz bcm5719-llvm-c5cca5ab42030468c9132748c239061785060eaf.zip | |
Revert: Fix wrong code offset for unwind code SET_FPREG.
llvm-svn: 185793
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCStreamer.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/MC/MCWin64EH.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp index fb43a4adbda..6542f42a03b 100644 --- a/llvm/lib/MC/MCStreamer.cpp +++ b/llvm/lib/MC/MCStreamer.cpp @@ -470,9 +470,7 @@ void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) { report_fatal_error("Frame register and offset already specified!"); if (Offset & 0x0F) report_fatal_error("Misaligned frame pointer offset!"); - MCSymbol *Label = getContext().CreateTempSymbol(); - MCWin64EHInstruction Inst(Win64EH::UOP_SetFPReg, Label, Register, Offset); - EmitLabel(Label); + MCWin64EHInstruction Inst(Win64EH::UOP_SetFPReg, 0, Register, Offset); CurFrame->LastFrameInst = CurFrame->Instructions.size(); CurFrame->Instructions.push_back(Inst); } diff --git a/llvm/lib/MC/MCWin64EH.cpp b/llvm/lib/MC/MCWin64EH.cpp index 8db1fa2a93c..c5b637c9244 100644 --- a/llvm/lib/MC/MCWin64EH.cpp +++ b/llvm/lib/MC/MCWin64EH.cpp @@ -64,7 +64,7 @@ static void EmitAbsDifference(MCStreamer &streamer, MCSymbol *lhs, static void EmitUnwindCode(MCStreamer &streamer, MCSymbol *begin, MCWin64EHInstruction &inst) { - uint8_t b2; + uint8_t b1, b2; uint16_t w; b2 = (inst.getOperation() & 0x0F); switch (inst.getOperation()) { @@ -93,7 +93,8 @@ static void EmitUnwindCode(MCStreamer &streamer, MCSymbol *begin, streamer.EmitIntValue(b2, 1); break; case Win64EH::UOP_SetFPReg: - EmitAbsDifference(streamer, inst.getLabel(), begin); + b1 = inst.getOffset() & 0xF0; + streamer.EmitIntValue(b1, 1); streamer.EmitIntValue(b2, 1); break; case Win64EH::UOP_SaveNonVol: |
