sim: Convert GuestABI example signatures to comments.

In the base Result and Argument templates, there were private static
functions which weren't meant to be used, but which would act as
documentation for what those functions should look like. They were
marked as private to prevent them from being accidentally used and
causing confusing, hard to debug errors.

Unfortunately, that also meant that those functions exist, and
apparently cause inconsistent problems with SFINAE. I assume if the
functions don't exist at all, then SFINAE will work properly. When
they're private, that seems to cause a substitution failure which
actually is an error which makes the build fail.

Change-Id: I326e9e1d05eafe1b00732ae10264354b07426e74
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28308
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/sim/guest_abi/definition.hh b/src/sim/guest_abi/definition.hh
index becdb3c85950a7013d95d3053f5b7fb689b7ccea..4928b93529c92f0cc2540bc97029b1a5d0a2326a 100644 (file)
--- a/src/sim/guest_abi/definition.hh
+++ b/src/sim/guest_abi/definition.hh
@@ -57,27 +57,28 @@ namespace GuestABI
 template <typename ABI, typename Ret, typename Enabled=void>
 struct Result
 {
-  private:
     /*
      * Store result "ret" into the state accessible through tc. Optionally
      * accept "state" in case it holds some signature wide information.
      *
      * Note that the declaration below is only to document the expected
-     * signature and is private so it won't be used by accident.
+     * signature and is commented out so it won't be used by accident.
      * Specializations of this Result class should define their own version
-     * of this method which actually does something and is public.
+     * of this method which actually does something.
+     *
+     * static void store(ThreadContext *tc, const Ret &ret);
+     * static void store(ThreadContext *tc, const Ret &ret,
+     *                   typename ABI::State &state);
      */
-    static void store(ThreadContext *tc, const Ret &ret);
-    static void store(ThreadContext *tc, const Ret &ret,
-                      typename ABI::State &state);
 
     /*
      * Prepare for a result of type Ret. This might mean, for instance,
      * allocating an argument register for a result pointer.
      *
      * This method can be excluded if no preparation is necessary.
+     *
+     * static void prepare(ThreadContext *tc, typename ABI::State &state);
      */
-    static void prepare(ThreadContext *tc, typename ABI::State &state);
 };
 
 /*
@@ -98,16 +99,18 @@ struct Argument
      *
      * Like Result::store above, the declaration below is only to document
      * the expected method signature.
+     *
+     * static Arg get(ThreadContext *tc, typename ABI::State &state);
      */
-    static Arg get(ThreadContext *tc, typename ABI::State &state);
 
     /*
      * Prepare for an argument of type Arg. This might mean, for instance,
      * allocating an argument register for a result pointer.
      *
      * This method can be excluded if no preparation is necessary.
+     *
+     * static void allocate(ThreadContext *tc, typename ABI::State &state);
      */
-    static void allocate(ThreadContext *tc, typename ABI::State &state);
 };
 
 } // namespace GuestABI