V8. ASM-2-WASM. Another asm-types.h revision.

src/wasm/asm-types.h

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SRC_WASM_ASM_TYPES_H_
 #define SRC_WASM_ASM_TYPES_H_
 
 #include <string>
 
 #include "src/base/macros.h"
 #include "src/zone-containers.h"
 #include "src/zone.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
 class AsmType;
+class AsmFFIType;
 class AsmFunctionType;
 class AsmOverloadedFunctionType;
+class AsmFunctionTableType;
 
 // List of V(CamelName, string_name, number, parent_types)
 #define FOR_EACH_ASM_VALUE_TYPE_LIST(V)                                       \
   /* These tags are not types that are expressable in the asm source. They */ \
   /* are used to express semantic information about the types they tag.    */ \
   V(Heap, "[]", 1, 0)                                                         \
   /*The following are actual types that appear in the asm source. */          \
   V(Void, "void", 2, 0)                                                       \
   V(Extern, "extern", 3, 0)                                                   \
   V(DoubleQ, "double?", 4, 0)                                                 \
@@ skipping 17 matching lines @@
   V(Float64Array, "Float64Array", 21, kAsmHeap)                               \
   /* Pseudo-types used in representing heap access for fp types.*/            \
   V(FloatishDoubleQ, "floatish|double?", 23, kAsmFloatish | kAsmDoubleQ)      \
   V(FloatQDoubleQ, "float?|double?", 24, kAsmFloatQ | kAsmDoubleQ)            \
   /* None is used to represent errors in the type checker. */                 \
   V(None, "<none>", 31, 0)
 
 // List of V(CamelName)
 #define FOR_EACH_ASM_CALLABLE_TYPE_LIST(V) \
   V(FunctionType)                          \
-  V(OverloadedFunctionType)
+  V(FFIType)                               \
+  V(OverloadedFunctionType)                \
+  V(FunctionTableType)
 
 class AsmValueType {
  public:
   typedef uint32_t bitset_t;
 
   enum : uint32_t {
 #define DEFINE_TAG(CamelName, string_name, number, parent_types) \
   kAsm##CamelName = ((1u << (number)) | (parent_types)),
     FOR_EACH_ASM_VALUE_TYPE_LIST(DEFINE_TAG)
 #undef DEFINE_TAG
@@ skipping 88 matching lines @@
   explicit AsmOverloadedFunctionType(Zone* zone) : overloads_(zone) {}
 
   std::string Name() override;
   AsmType* ValidateCall(AsmType* function_type) override;
 
   ZoneVector<AsmType*> overloads_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AsmOverloadedFunctionType);
 };
 
+class AsmFFIType final : public AsmCallableType {
+ public:
+  AsmFFIType* AsFFIType() override { return this; }
+
+  std::string Name() override { return "Function"; }
+  AsmType* ValidateCall(AsmType* function_type) override;
+
+ private:
+  friend AsmType;
+
+  AsmFFIType() = default;
+
+  DISALLOW_COPY_AND_ASSIGN(AsmFFIType);
+};
+
+class AsmFunctionTableType : public AsmCallableType {
+ public:
+  AsmFunctionTableType* AsFunctionTableType() override { return this; }
+
+  std::string Name() override;
+
+  AsmType* ValidateCall(AsmType* function_type) override;
+
+  void set_signature(AsmType* function_type);

[bradnelson, 2016/06/17 23:38:50]

Will you need a method to check if the signature was ever set?

[John, 2016/06/20 15:09:52]

Not really.

tl;dr Looking at how this class is used in typing-asm (not on this CL) this
method is not really necessary. Jump table signatures are known when the types
are created, so I'll remove it.

+  size_t length() const { return length_; }
+
+ private:
+  friend class AsmType;
+
+  explicit AsmFunctionTableType(size_t length) : length_(length) {}
+
+  size_t length_;
+  AsmType* signature_ = nullptr;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(AsmFunctionTableType);
+};
+
 class AsmType {
  public:
 #define DEFINE_CONSTRUCTOR(CamelName, string_name, number, parent_types) \
   static AsmType* CamelName() {                                          \
     return AsmValueType::New(AsmValueType::kAsm##CamelName);             \
   }
   FOR_EACH_ASM_VALUE_TYPE_LIST(DEFINE_CONSTRUCTOR)
 #undef DEFINE_CONSTRUCTOR
 
 #define DEFINE_CAST(CamelCase)                                        \
@@ skipping 21 matching lines @@
     auto* f = new (zone) AsmOverloadedFunctionType(zone);
     return reinterpret_cast<AsmType*>(f);
   }
 
   // The type for fround(src).
   static AsmType* FroundType(Zone* zone);
 
   // The (variadic) type for min and max.
   static AsmType* MinMaxType(Zone* zone, AsmType* dest, AsmType* src);
 
+  // The type for foreign functions.
+  static AsmType* FFIType(Zone* zone) {
+    auto* f = new (zone) AsmFFIType();
+    return reinterpret_cast<AsmType*>(f);
+  }
+
+  // The type for function tables.
+  static AsmType* FunctionTableType(Zone* zone, size_t length) {
+    auto* f = new (zone) AsmFunctionTableType(length);
+    return reinterpret_cast<AsmType*>(f);
+  }
+
   std::string Name();
   // IsExactly returns true if this is the exact same type as that. For
   // non-value types (e.g., callables), this returns this == that.
   bool IsExactly(AsmType* that);
   // IsA is used to query whether this is an instance of that (i.e., if this is
   // a type derived from that.) For non-value types (e.g., callables), this
   // returns this == that.
   bool IsA(AsmType* that);
 
   // Types allowed in return statements. void is the type for returns without
   // an expression.
   bool IsReturnType() {
     return this == AsmType::Void() || this == AsmType::Double() ||
            this == AsmType::Signed() || this == AsmType::Float();
   }
 
+  // Converts this to the corresponding valid argument type.
+  AsmType* ToReturnType() {
+    if (this->IsA(AsmType::Signed())) {
+      return AsmType::Signed();
+    }
+    if (this->IsA(AsmType::Double())) {
+      return AsmType::Double();
+    }
+    if (this->IsA(AsmType::Float())) {
+      return AsmType::Float();
+    }
+    if (this->IsA(AsmType::Void())) {
+      return AsmType::Void();
+    }
+    return AsmType::None();
+  }
+
   // Types allowed to be parameters in asm functions.
   bool IsParameterType() {
     return this == AsmType::Double() || this == AsmType::Int() ||
            this == AsmType::Float();
   }
 
+  // Converts this to the corresponding valid argument type.
+  AsmType* ToParameterType() {
+    if (this->IsA(AsmType::Int())) {
+      return AsmType::Int();
+    }
+    if (this->IsA(AsmType::Double())) {
+      return AsmType::Double();
+    }
+    if (this->IsA(AsmType::Float())) {
+      return AsmType::Float();
+    }
+    return AsmType::None();
+  }
+
   // Types allowed to be compared using the comparison operators.
   bool IsComparableType() {
     return this == AsmType::Double() || this == AsmType::Signed() ||
            this == AsmType::Unsigned() || this == AsmType::Float();
   }
 
   // The following methods are meant to be used for inspecting the traits of
   // element types for the heap view types.
   enum : int32_t { kNotHeapType = -1 };
 
   // Returns the element size if this is a heap type. Otherwise returns
   // kNotHeapType.
   int32_t ElementSizeInBytes();
   // Returns the load type if this is a heap type. AsmType::None is returned if
   // this is not a heap type.
   AsmType* LoadType();
   // Returns the store type if this is a heap type. AsmType::None is returned if
   // this is not a heap type.
   AsmType* StoreType();
 };
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // SRC_WASM_ASM_TYPES_H_