From 25ecaaadbe60f683bc61c4c78941f62d7c58ce33 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Thu, 25 Feb 2021 01:05:47 -0800
Subject: [PATCH] arch-arm: Switch the AAPCS ABIs to .as<>() instead of
 .laneView<>().

Change-Id: I9e9c7163db4c061af00111b8dc959c364c6b7ae6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41898
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/arch/arm/aapcs32.hh | 8 ++++----
 src/arch/arm/aapcs64.hh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/arch/arm/aapcs32.hh b/src/arch/arm/aapcs32.hh
index a1345bd571..c450237fae 100644
--- a/src/arch/arm/aapcs32.hh
+++ b/src/arch/arm/aapcs32.hh
@@ -463,7 +463,7 @@ struct Result<Aapcs32Vfp, Float, typename std::enable_if_t<
 
         RegId id(VecRegClass, 0);
         auto reg = tc->readVecReg(id);
-        reg.laneView<Float, 0>() = f;
+        reg.as<Float>()[0] = f;
         tc->setVecReg(id, reg);
     };
 };
@@ -487,7 +487,7 @@ struct Argument<Aapcs32Vfp, Float, typename std::enable_if_t<
 
             RegId id(VecRegClass, reg);
             auto val = tc->readVecReg(id);
-            return val.laneView<Float>(lane);
+            return val.as<Float>()[lane];
         }
 
         return loadFromStack<Float>(tc, state);
@@ -558,7 +558,7 @@ struct Argument<Aapcs32Vfp, HA, typename std::enable_if_t<
 
                 RegId id(VecRegClass, reg);
                 auto val = tc->readVecReg(id);
-                ha[i] = val.laneView<Elem>(lane);
+                ha[i] = val.as<Elem>()[lane];
             }
             return ha;
         }
@@ -605,7 +605,7 @@ struct Result<Aapcs32Vfp, HA,
 
             RegId id(VecRegClass, reg);
             auto val = tc->readVecReg(id);
-            val.laneView<Elem>(lane) = ha[i];
+            val.as<Elem>()[lane] = ha[i];
             tc->setVecReg(id, val);
         }
     }
diff --git a/src/arch/arm/aapcs64.hh b/src/arch/arm/aapcs64.hh
index fb7b8f8dfc..ddd560627e 100644
--- a/src/arch/arm/aapcs64.hh
+++ b/src/arch/arm/aapcs64.hh
@@ -186,7 +186,7 @@ struct Argument<Aapcs64, Float, typename std::enable_if_t<
     {
         if (state.nsrn <= state.MAX_SRN) {
             RegId id(VecRegClass, state.nsrn++);
-            return tc->readVecReg(id).laneView<Float, 0>();
+            return tc->readVecReg(id).as<Float>()[0];
         }
 
         return loadFromStack<Float>(tc, state);
@@ -203,7 +203,7 @@ struct Result<Aapcs64, Float, typename std::enable_if_t<
     {
         RegId id(VecRegClass, 0);
         auto reg = tc->readVecReg(id);
-        reg.laneView<Float, 0>() = f;
+        reg.as<Float>()[0] = f;
         tc->setVecReg(id, reg);
     }
 };