From 53378c145dd13e0c0f0be5275a8f297fb037f18b Mon Sep 17 00:00:00 2001
From: Karl Schimpf <kschimpf@google.com>
Date: Thu, 21 Jan 2016 10:16:43 -0800
Subject: [PATCH] Add instruction veord to the integrated ARM assembler.

BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4334
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1604043005 .
---
 src/DartARM32/assembler_arm.h     |  1 +
 src/IceAssemblerARM32.cpp         | 20 ++++++++++++++++++++
 src/IceAssemblerARM32.h           |  2 ++
 src/IceInstARM32.cpp              |  8 ++++++++
 tests_lit/assembler/arm32/veor.ll | 37 +++++++++++++++++++++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 tests_lit/assembler/arm32/veor.ll

diff --git a/src/DartARM32/assembler_arm.h b/src/DartARM32/assembler_arm.h
index 93e91afee..7e9e8b0f0 100644
--- a/src/DartARM32/assembler_arm.h
+++ b/src/DartARM32/assembler_arm.h
@@ -1365,6 +1365,7 @@ class Assembler : public ValueObject {
   // ARM32::AssemblerARM32::vpop()
   // ARM32::AssemblerARM32::vpush()
   // ARM32::AssemblerARM:rbit().
+  // ARM32::AssemblerARM::veord()
 #endif
 
   DISALLOW_ALLOCATION();
diff --git a/src/IceAssemblerARM32.cpp b/src/IceAssemblerARM32.cpp
index fdb2686e0..66713a96d 100644
--- a/src/IceAssemblerARM32.cpp
+++ b/src/IceAssemblerARM32.cpp
@@ -2188,6 +2188,26 @@ void AssemblerARM32::vdivd(const Operand *OpDd, const Operand *OpDn,
   emitVFPddd(Cond, VdivdOpcode, Dd, Dn, Dm);
 }
 
+void AssemblerARM32::veord(const Operand *OpDd, const Operand *OpDn,
+                           const Operand *OpDm) {
+  // VEOR - ARM secdtion A8.8.315, encoding A1:
+  //   veor<c> <Dd>, <Dn>, <Dm>
+  //
+  // 111100110D00nnnndddd0001N0M1mmmm where Ddddd=Dd, Nnnnn=Dn, and Mmmmm=Dm.
+  constexpr const char *Veord = "veord";
+  IValueT Dd = encodeDRegister(OpDd, "Dd", Veord);
+  IValueT Dn = encodeDRegister(OpDn, "Dn", Veord);
+  IValueT Dm = encodeDRegister(OpDm, "Dm", Veord);
+  AssemblerBuffer::EnsureCapacity ensured(&Buffer);
+  const IValueT Encoding =
+      B25 | B24 | B8 | B4 |
+      (encodeCondition(CondARM32::Cond::kNone) << kConditionShift) |
+      (getYInRegYXXXX(Dd) << 22) | (getXXXXInRegYXXXX(Dn) << 16) |
+      (getXXXXInRegYXXXX(Dd) << 12) | (getYInRegYXXXX(Dn) << 7) |
+      (getYInRegYXXXX(Dm) << 5) | getXXXXInRegYXXXX(Dm);
+  emitInst(Encoding);
+}
+
 void AssemblerARM32::vldrd(const Operand *OpDd, const Operand *OpAddress,
                            CondARM32::Cond Cond, const TargetInfo &TInfo) {
   // VLDR - ARM section A8.8.333, encoding A1.
diff --git a/src/IceAssemblerARM32.h b/src/IceAssemblerARM32.h
index 953b95ba3..9a76338fe 100644
--- a/src/IceAssemblerARM32.h
+++ b/src/IceAssemblerARM32.h
@@ -338,6 +338,8 @@ public:
   void vdivs(const Operand *OpSd, const Operand *OpSn, const Operand *OpSm,
              CondARM32::Cond Cond);
 
+  void veord(const Operand *OpDd, const Operand *OpDn, const Operand *OpDm);
+
   void vldrd(const Operand *OpDd, const Operand *OpAddress,
              CondARM32::Cond Cond, const TargetInfo &TInfo);
 
diff --git a/src/IceInstARM32.cpp b/src/IceInstARM32.cpp
index a82c148b6..c7d4e10dc 100644
--- a/src/IceInstARM32.cpp
+++ b/src/IceInstARM32.cpp
@@ -633,6 +633,14 @@ template <> void InstARM32Vdiv::emitIAS(const Cfg *Func) const {
   assert(!Asm->needsTextFixup());
 }
 
+template <> void InstARM32Veor::emitIAS(const Cfg *Func) const {
+  auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
+  const Variable *Dest = getDest();
+  assert(Dest->getType() == IceType_f64);
+  Asm->veord(Dest, getSrc(0), getSrc(1));
+  assert(!Asm->needsTextFixup());
+}
+
 template <> void InstARM32Vsub::emitIAS(const Cfg *Func) const {
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   const Variable *Dest = getDest();
diff --git a/tests_lit/assembler/arm32/veor.ll b/tests_lit/assembler/arm32/veor.ll
new file mode 100644
index 000000000..8b138a176
--- /dev/null
+++ b/tests_lit/assembler/arm32/veor.ll
@@ -0,0 +1,37 @@
+; Show that we know how to translate veor. Does this by noting that
+; loading a double 0.0 introduces a veor.
+
+; REQUIRES: allow_dump
+
+; Compile using standalone assembler.
+; RUN: %p2i --filetype=asm -i %s --target=arm32 --args -Om1 \
+; RUN:   | FileCheck %s --check-prefix=ASM
+
+; Show bytes in assembled standalone code.
+; RUN: %p2i --filetype=asm -i %s --target=arm32 --assemble --disassemble \
+; RUN:   --args -Om1 \
+; RUN:   | FileCheck %s --check-prefix=DIS
+
+; Compile using integrated assembler.
+; RUN: %p2i --filetype=iasm -i %s --target=arm32 --args -Om1 \
+; RUN:   | FileCheck %s --check-prefix=IASM
+
+; Show bytes in assembled integrated code.
+; RUN: %p2i --filetype=iasm -i %s --target=arm32 --assemble --disassemble \
+; RUN:   --args -Om1 \
+; RUN:   | FileCheck %s --check-prefix=DIS
+
+define internal double @testVeor() {
+; ASM-LABEL: testVeor:
+; DIS: 00000000 <testVeor>:
+
+entry:
+; ASM: .LtestVeor$entry:
+
+  ret double 0.0
+
+; ASM:  veor.f64        d0, d0, d0
+; DIS:    0:    f3000110
+; IASM-NOT: veor
+
+}
-- 
2.11.0