Hooking up asm-wasm conversion.

src/builtins.h

 // Copyright 2011 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 V8_BUILTINS_H_
 #define V8_BUILTINS_H_
 
 #include "src/base/flags.h"
 #include "src/handles.h"
 
@@ skipping 159 matching lines @@
                                           \
   V(TypedArrayPrototypeBuffer)            \
                                           \
   V(HandleApiCall)                        \
   V(HandleApiCallAsFunction)              \
   V(HandleApiCallAsConstructor)           \
                                           \
   V(RestrictedFunctionPropertiesThrower)  \
   V(RestrictedStrictArgumentsPropertiesThrower)
 
+// TODO(bradnelson): Implement for all arches and drop.
+#if defined(V8_TARGET_ARCH_X64)

[Michael Starzinger, 2016/06/29 08:29:23]

We usually implement new features on all architectures in one go. Lets drop
these #ifdef guards.

[bradn, 2016/06/30 07:59:36]

Done.

+#define BUILTIN_LIST_A_PARTIAL(V) V(InstantiateAsmJs, BUILTIN, kNoExtraICState)
+#else
+#define BUILTIN_LIST_A_PARTIAL(V)
+#endif
+
 // Define list of builtins implemented in assembly.
 #define BUILTIN_LIST_A(V)                                                    \
+  BUILTIN_LIST_A_PARTIAL(V)                                                  \
   V(AllocateInNewSpace, BUILTIN, kNoExtraICState)                            \
   V(AllocateInOldSpace, BUILTIN, kNoExtraICState)                            \
                                                                              \
   V(ArgumentsAdaptorTrampoline, BUILTIN, kNoExtraICState)                    \
                                                                              \
   V(ConstructedNonConstructable, BUILTIN, kNoExtraICState)                   \
                                                                              \
   V(CallFunction_ReceiverIsNullOrUndefined, BUILTIN, kNoExtraICState)        \
   V(CallFunction_ReceiverIsNotNullOrUndefined, BUILTIN, kNoExtraICState)     \
   V(CallFunction_ReceiverIsAny, BUILTIN, kNoExtraICState)                    \
@@ skipping 198 matching lines @@
 #undef DEF_ENUM_T
 #undef DEF_ENUM_S
 #undef DEF_ENUM_H
                 builtin_count
   };
 
   enum CFunctionId {
 #define DEF_ENUM_C(name) c_##name,
     BUILTIN_LIST_C(DEF_ENUM_C)
 #undef DEF_ENUM_C
-    cfunction_count
+        cfunction_count
   };
 
 #define DECLARE_BUILTIN_ACCESSOR_C(name) Handle<Code> name();
 #define DECLARE_BUILTIN_ACCESSOR_A(name, kind, extra) Handle<Code> name();
 #define DECLARE_BUILTIN_ACCESSOR_T(name, argc) Handle<Code> name();
 #define DECLARE_BUILTIN_ACCESSOR_S(name, kind, extra, interface_descriptor) \
   Handle<Code> name();
 #define DECLARE_BUILTIN_ACCESSOR_H(name, kind) Handle<Code> name();
   BUILTIN_LIST_C(DECLARE_BUILTIN_ACCESSOR_C)
   BUILTIN_LIST_A(DECLARE_BUILTIN_ACCESSOR_A)
@@ skipping 52 matching lines @@
   // IterateBuiltins() above which assumes Object**'s for the callback
   // function f, we use an Object* array here.
   Object* builtins_[builtin_count];
   const char* names_[builtin_count];
 
   static void Generate_Adaptor(MacroAssembler* masm, CFunctionId id);
   static void Generate_AllocateInNewSpace(MacroAssembler* masm);
   static void Generate_AllocateInOldSpace(MacroAssembler* masm);
   static void Generate_ConstructedNonConstructable(MacroAssembler* masm);
   static void Generate_CompileLazy(MacroAssembler* masm);
+#if defined(V8_TARGET_ARCH_X64)

[Michael Starzinger, 2016/06/29 08:29:23]

Likewise.

[bradn, 2016/06/30 07:59:36]

Done.

+  // TODO(bradnelson): Implement on all arches.
+  static void Generate_InstantiateAsmJs(MacroAssembler* masm);

[Michael Starzinger, 2016/06/29 08:29:23]

nit: Can we move this declaration up one line? Then it is not hiding in the
middle of the compilation stub generators for the other three tiers

[bradn, 2016/06/30 07:59:36]

Done.

+#endif
   static void Generate_CompileBaseline(MacroAssembler* masm);
   static void Generate_InOptimizationQueue(MacroAssembler* masm);
   static void Generate_CompileOptimized(MacroAssembler* masm);
   static void Generate_CompileOptimizedConcurrent(MacroAssembler* masm);
   static void Generate_JSConstructStubGeneric(MacroAssembler* masm);
   static void Generate_JSBuiltinsConstructStub(MacroAssembler* masm);
   static void Generate_JSBuiltinsConstructStubForDerived(MacroAssembler* masm);
   static void Generate_JSConstructStubApi(MacroAssembler* masm);
   static void Generate_JSEntryTrampoline(MacroAssembler* masm);
   static void Generate_JSConstructEntryTrampoline(MacroAssembler* masm);
@@ skipping 268 matching lines @@
   friend class BuiltinFunctionTable;
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(Builtins);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_BUILTINS_H_