commit 0faec4c9e067b974ec1d3f65c71af3abaca143aa
author Jan Voung <jvoung@chromium.org> Wed Nov 05 17:29:56 2014 -0800
committer Jan Voung <jvoung@chromium.org> Wed Nov 05 17:29:56 2014 -0800
tree a20d61bc15c81fe04591a9b5fd2c2ee4f2c39970
parent bfb410dd04d46ca34b2ea437151af2dc26930b5b

Rearrange emit vs emitIAS. Wait till function is done before dumping text.

Eventually, I wanted to have a flag "UseELFWriter" like:
https://codereview.chromium.org/678533005/diff/120001/src/IceCfg.cpp

Where the emit OStream would not have text, and only have
binary. This refactor hopefully means fewer places to
check for a flag to disable the text version of IAS,
and be able to write binary. Otherwise, there are some
text labels for branches that are still being dumped out.

BUG=none
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/700263003

src/assembler.cpp

diff --git a/src/assembler.cpp b/src/assembler.cpp
index 50d82b7..b0bd297 100644
--- a/src/assembler.cpp
+++ b/src/assembler.cpp
@@ -19,7 +19,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "assembler.h"
+#include "IceGlobalContext.h"
 #include "IceMemoryRegion.h"
+#include "IceOperand.h"
 
 namespace Ice {
 
@@ -74,18 +76,6 @@
 
 AssemblerBuffer::~AssemblerBuffer() {}
 
-// Returns the latest fixup at or after the given position, or nullptr if
-// there is none.  Assumes fixups were added in increasing order.
-AssemblerFixup *AssemblerBuffer::GetLatestFixup(intptr_t position) const {
-  AssemblerFixup *latest_fixup = nullptr;
-  for (auto I = fixups_.rbegin(), E = fixups_.rend(); I != E; ++I) {
-    if ((*I)->position() < position)
-      return latest_fixup;
-    latest_fixup = *I;
-  }
-  return latest_fixup;
-}
-
 void AssemblerBuffer::ProcessFixups(const MemoryRegion &region) {
   for (SizeT I = 0; I < fixups_.size(); ++I) {
     AssemblerFixup *fixup = fixups_[I];
@@ -133,4 +123,43 @@
   assert(Size() == old_size);
 }
 
+void Assembler::emitIASBytes(GlobalContext *Ctx) const {
+  Ostream &Str = Ctx->getStrEmit();
+  intptr_t EndPosition = buffer_.Size();
+  intptr_t CurPosition = 0;
+  const intptr_t FixupSize = 4;
+  for (AssemblerBuffer::FixupList::const_iterator
+           FixupI = buffer_.fixups_begin(),
+           FixupE = buffer_.fixups_end(); FixupI != FixupE; ++FixupI) {
+    AssemblerFixup *NextFixup = *FixupI;
+    intptr_t NextFixupLoc = NextFixup->position();
+    for (intptr_t i = CurPosition; i < NextFixupLoc; ++i) {
+      Str << "\t.byte 0x";
+      Str.write_hex(buffer_.Load<uint8_t>(i));
+      Str << "\n";
+    }
+    Str << "\t.long ";
+    const ConstantRelocatable *Reloc = NextFixup->value();
+    if (Reloc->getSuppressMangling())
+      Str << Reloc->getName();
+    else
+      Str << Ctx->mangleName(Reloc->getName());
+    if (Reloc->getOffset()) {
+      Str << " + " << Reloc->getOffset();
+    }
+    bool IsPCRel = NextFixup->kind() == FK_PcRel_4;
+    if (IsPCRel)
+      Str << " - (. + " << FixupSize << ")";
+    Str << "\n";
+    CurPosition = NextFixupLoc + FixupSize;
+    assert(CurPosition <= EndPosition);
+  }
+  // Handle any bytes that are not prefixed by a fixup.
+  for (intptr_t i = CurPosition; i < EndPosition; ++i) {
+    Str << "\t.byte 0x";
+    Str.write_hex(buffer_.Load<uint8_t>(i));
+    Str << "\n";
+  }
+}
+
 } // end of namespace Ice