Subzero, MIPS32: Binding intrablock labels, unconditional branch

This patch was supposed to be a part of patch with instruction encodings. R=stichnot@chromium.org Review URL: https://codereview.chromium.org/2367743004 . Patch from Jaydeep Patil <jaydeep.patil@imgtec.com>. Author: Jaydeep Patil

Subzero, MIPS32: Binding intrablock labels, unconditional branch
58eeedf7 · Jaydeep Patil · Jim Stichnoth · 4c49b108 · 58eeedf7 · 58eeedf7
Commit 58eeedf7 authored Sep 26, 2016 by Jaydeep Patil Committed by Jim Stichnoth Sep 26, 2016
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 3 deletions

IceAssemblerMIPS32.h src/IceAssemblerMIPS32.h +10 -0

IceInstMIPS32.cpp src/IceInstMIPS32.cpp +10 -3

No files found.
--- a/src/IceAssemblerMIPS32.h
+++ b/src/IceAssemblerMIPS32.h
@@ -301,6 +301,16 @@ public:
    return getOrCreateLabel(Number, LocalLabels);
  }

+  void bindLocalLabel(const InstMIPS32Label *InstL, SizeT Number) {
+    if (BuildDefs::dump() && !getFlags().getDisableHybridAssembly()) {
+      constexpr SizeT InstSize = 0;
+      emitTextInst(InstL->getLabelName() + ":", InstSize);
+    }
+    Label *L = getOrCreateLocalLabel(Number);
+    if (!getPreliminary())
+      this->bind(L);
+  }
+
  bool fixupIsPCRel(FixupKind Kind) const override {
    (void)Kind;
    llvm::report_fatal_error("Not yet implemented.");

--- a/src/IceInstMIPS32.cpp
+++ b/src/IceInstMIPS32.cpp
@@ -273,8 +273,8 @@ void InstMIPS32Label::emit(const Cfg *Func) const {
 }

 void InstMIPS32Label::emitIAS(const Cfg *Func) const {
-  (void)Func;
-  llvm_unreachable("Not yet implemented");
+  auto *Asm = Func->getAssembler<MIPS32::AssemblerMIPS32>();
+  Asm->bindLocalLabel(this, Number);
 }

 InstMIPS32Call::InstMIPS32Call(Cfg *Func, Variable *Dest, Operand *CallTarget)
@@ -419,7 +419,11 @@ void InstMIPS32Ret::emit(const Cfg *Func) const {

 void InstMIPS32Br::emitIAS(const Cfg *Func) const {
  auto *Asm = Func->getAssembler<MIPS32::AssemblerMIPS32>();
-  if (isUnconditionalBranch()) {
+  if (Label != nullptr) {
+    // Intra-block branches are of kind bcc
+    Asm->bcc(Predicate, getSrc(0), getSrc(1),
+             Asm->getOrCreateLocalLabel(Label->getNumber()));
+  } else if (isUnconditionalBranch()) {
    Asm->b(Asm->getOrCreateCfgNodeLabel(getTargetFalse()->getIndex()));
  } else {
    switch (Predicate) {
@@ -440,6 +444,9 @@ void InstMIPS32Br::emitIAS(const Cfg *Func) const {
               Asm->getOrCreateCfgNodeLabel(getTargetFalse()->getIndex()));
      break;
    }
+    if (getTargetTrue()) {
+      Asm->b(Asm->getOrCreateCfgNodeLabel(getTargetTrue()->getIndex()));
+    }
  }
 }