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 | 5310cdbcc909a7c35d4c7df0fd5703850a9db2a5 (patch) | |
| tree | 16f7afc56d40c48ac05724a291bbb5b764e4067b /lib/MC | |
| parent | 9611873724b9f8d6cbbed7924c972e8d026cc263 (diff) | |
| download | llvm-5310cdbcc909a7c35d4c7df0fd5703850a9db2a5.tar.gz llvm-5310cdbcc909a7c35d4c7df0fd5703850a9db2a5.tar.bz2 llvm-5310cdbcc909a7c35d4c7df0fd5703850a9db2a5.tar.xz | |
Revert: Fix wrong code offset for unwind code SET_FPREG.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185793 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC')
| -rw-r--r-- | lib/MC/MCStreamer.cpp | 4 | ||||
| -rw-r--r-- | lib/MC/MCWin64EH.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/MC/MCStreamer.cpp b/lib/MC/MCStreamer.cpp index fb43a4adbd..6542f42a03 100644 --- a/lib/MC/MCStreamer.cpp +++ b/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/lib/MC/MCWin64EH.cpp b/lib/MC/MCWin64EH.cpp index 8db1fa2a93..c5b637c924 100644 --- a/lib/MC/MCWin64EH.cpp +++ b/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: |