Fix vldrd/vstrd handling of immediate offsets in ARM.

src/IceInstARM32.cpp

 //===- subzero/src/IceInstARM32.cpp - ARM32 instruction implementation ----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 1354 matching lines @@
   }
   Str << VectorMarker << "\t";
   getDest()->emit(Func);
   Str << ", ";
   getSrc(0)->emit(Func);
 }
 
 template <> void InstARM32Ldr::emitIAS(const Cfg *Func) const {
   assert(getSrcSize() == 1);
   Variable *Dest = getDest();
   Type DestTy = Dest->getType();

[Jim Stichnoth, 2016/01/22 05:10:30]

const, if you feel so inclined...

[Karl, 2016/01/22 16:24:29]

Done.

   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   if (isScalarFloatingType(DestTy)) {
-    if (DestTy == IceType_f32)
+    switch (DestTy) {
+    default:
+      // TODO(kschimpf) Does this happen?

[John, 2016/01/22 15:04:28]

It does not happen at the moment, but it will once we have vldr for vector
types.

[Karl, 2016/01/22 16:24:29]

Actually, due to the if above, this shouldn't happen. However, there are so many
type cases to this code that we should flatten to a single switch. However, I
will do that in a separate CL.

+      Asm->setNeedsTextFixup();
+      break;
+    case IceType_f32:
       Asm->vldrs(Dest, getSrc(0), getPredicate(), Func->getTarget());
-    else
+      break;
+    case IceType_f64:
       Asm->vldrd(Dest, getSrc(0), getPredicate(), Func->getTarget());
+      break;
+    }
   } else if (isVectorType(DestTy))
     // TODO(kschimpf) Handle case.
     Asm->setNeedsTextFixup();
   else
     Asm->ldr(Dest, getSrc(0), getPredicate(), Func->getTarget());
   if (Asm->needsTextFixup())
     emitUsingTextFixup(Func);
 }
 
 template <> void InstARM32Ldrex::emit(const Cfg *Func) const {
@@ skipping 278 matching lines @@
   getSrc(0)->emit(Func);
   Str << ", ";
   getSrc(1)->emit(Func);
 }
 
 void InstARM32Str::emitIAS(const Cfg *Func) const {
   assert(getSrcSize() == 2);
   Type Ty = getSrc(0)->getType();
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   if (isScalarFloatingType(Ty)) {
-    if (Ty == IceType_f32)
+    switch (Ty) {
+    default:
+      // TODO(kschimpf) Does this happen?
+      Asm->setNeedsTextFixup();
+      break;
+    case IceType_f32:
       Asm->vstrs(getSrc(0), getSrc(1), getPredicate(), Func->getTarget());
-    else
+      break;
+    case IceType_f64:
       Asm->vstrd(getSrc(0), getSrc(1), getPredicate(), Func->getTarget());
+      break;
+    }
   } else if (isVectorType(Ty))
     // TODO(kschimpf) Handle case.
     Asm->setNeedsTextFixup();
   else
     Asm->str(getSrc(0), getSrc(1), getPredicate(), Func->getTarget());
   if (Asm->needsTextFixup())
     emitUsingTextFixup(Func);
 }
 
 void InstARM32Str::dump(const Cfg *Func) const {
@@ skipping 540 matching lines @@
 
 template class InstARM32FourAddrGPR<InstARM32::Mla>;
 template class InstARM32FourAddrGPR<InstARM32::Mls>;
 
 template class InstARM32CmpLike<InstARM32::Cmn>;
 template class InstARM32CmpLike<InstARM32::Cmp>;
 template class InstARM32CmpLike<InstARM32::Tst>;
 
 } // end of namespace ARM32
 } // end of namespace Ice