VM: New calling convention for generated code.

runtime/vm/native_entry.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/native_entry.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap.h"
 #include "vm/code_patcher.h"
@@ skipping 192 matching lines @@
     }
 
     bool is_bootstrap_native = false;
     target_function = ResolveNativeFunction(
         arguments->thread()->isolate(), func, &is_bootstrap_native);
     ASSERT(target_function != NULL);
 
 #if defined(DEBUG)
     {
       NativeFunction current_function = NULL;
-      uword current_trampoline =
+      const Code& current_trampoline = Code::Handle(
           CodePatcher::GetNativeCallAt(caller_frame->pc(),
                                        code,
-                                       &current_function);
+                                       &current_function));
 #if !defined(USING_SIMULATOR)
       ASSERT(current_function ==
              reinterpret_cast<NativeFunction>(LinkNativeCall));
 #else
       ASSERT(current_function ==
              reinterpret_cast<NativeFunction>(
                  Simulator::RedirectExternalReference(
                      reinterpret_cast<uword>(LinkNativeCall),
                      Simulator::kBootstrapNativeCall,
                      NativeEntry::kNumArguments)));
 #endif
-      ASSERT(current_trampoline ==
-             StubCode::CallBootstrapCFunction_entry()->EntryPoint());
+      ASSERT(current_trampoline.raw() ==
+             StubCode::CallBootstrapCFunction_entry()->code());
     }
 #endif
 
     const intptr_t argc_tag = NativeArguments::ComputeArgcTag(func);
     const bool is_leaf_call =
       (argc_tag & NativeArguments::AutoSetupScopeMask()) == 0;
 
     call_through_wrapper = !is_bootstrap_native && !is_leaf_call;
 
     const Code& trampoline = Code::Handle(call_through_wrapper ?
@@ skipping 26 matching lines @@
   if (call_through_wrapper) {
     NativeEntry::NativeCallWrapper(
         args, reinterpret_cast<Dart_NativeFunction>(target_function));
   } else {
     target_function(arguments);
   }
 }
 
 
 }  // namespace dart