Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: src/IceAssembler.cpp

Issue 1417173003: Fix ARM integrated assembler to be able to compile spec2k examples. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix nits. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/IceAssembler.h ('k') | src/IceFixups.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/IceAssembler.cpp
diff --git a/src/IceAssembler.cpp b/src/IceAssembler.cpp
index 747ae584fd25051f61c6647c4e2dc2360f2073d1..1de15883660333e0d205d1eccaaacc34bf60166b 100644
--- a/src/IceAssembler.cpp
+++ b/src/IceAssembler.cpp
@@ -144,13 +144,7 @@ void Assembler::emitIASBytes() const {
Str.write_hex(Buffer.load<uint8_t>(i));
Str << "\n";
}
- // For PCRel fixups, we write the pc-offset from a symbol into the Buffer
- // (e.g., -4), but we don't represent that in the fixup's offset. Otherwise
- // the fixup holds the true offset, and so does the Buffer. Just load the
- // offset from the buffer.
- CurPosition = NextFixupLoc +
- NextFixup->emit(Ctx, Buffer.load<RelocOffsetT>(NextFixupLoc),
- fixupIsPCRel(NextFixup->kind()));
+ CurPosition = NextFixupLoc + NextFixup->emit(Ctx, *this);
assert(CurPosition <= EndPosition);
}
// Handle any bytes that are not prefixed by a fixup.
« no previous file with comments | « src/IceAssembler.h ('k') | src/IceFixups.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698