Skip to content

refactor: Clean up Invoke calls in dart_entry #56309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

refactor: Clean up Invoke calls in dart_entry #56309

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d44ecd
refactor: Clean up Invoke calls in dart_entry
eseidel Jul 24, 2024
131e721
fix swapped arguments in TESTING case
eseidel Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 32 additions & 43 deletions runtime/vm/dart_entry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,31 @@ extern "C" typedef uword /*ObjectPtr*/ (*invokestub)(
uword /*ArrayPtr*/ arguments,
Thread* thread);

// Private helper for converting types and switching between Simulator
// and CPU invocations.
static ObjectPtr InvokeDartCode(uword entry_point,
const Array& arguments_descriptor,
const Array& arguments,
Thread* thread) {
DartEntryScope dart_entry_scope(thread);

const uword stub = StubCode::InvokeDartCode().EntryPoint();
#if defined(USING_SIMULATOR)
auto invoke = [&](uword entry_point, uword arguments_descriptor,
uword arguments, Thread* thread) -> uword {
return Simulator::Current()->Call(stub, entry_point, arguments_descriptor,
arguments,
reinterpret_cast<int64_t>(thread));
};
#else
auto invoke = reinterpret_cast<invokestub>(stub);
#endif
uword result =
invoke(entry_point, static_cast<uword>(arguments_descriptor.ptr()),
static_cast<uword>(arguments.ptr()), thread);
return static_cast<ObjectPtr>(result);
}

ObjectPtr DartEntry::InvokeFunction(const Function& function,
const Array& arguments,
const Array& arguments_descriptor) {
Expand All @@ -107,30 +132,15 @@ ObjectPtr DartEntry::InvokeFunction(const Function& function,

ASSERT(function.HasCode());

DartEntryScope dart_entry_scope(thread);

const uword stub = StubCode::InvokeDartCode().EntryPoint();
#if defined(USING_SIMULATOR)
return bit_copy<ObjectPtr, int64_t>(Simulator::Current()->Call(
static_cast<intptr_t>(stub),
#if defined(DART_PRECOMPILED_RUNTIME)
static_cast<intptr_t>(function.entry_point()),
#else
static_cast<intptr_t>(function.CurrentCode()),
#endif
static_cast<intptr_t>(arguments_descriptor.ptr()),
static_cast<intptr_t>(arguments.ptr()),
reinterpret_cast<intptr_t>(thread)));
#else // USING_SIMULATOR
return static_cast<ObjectPtr>((reinterpret_cast<invokestub>(stub))(
// Note: InvokeFunction takes Arguments then ArgumentsDescriptor,
// where as InvokeDartCode takes ArgumentsDescriptor then Arguments.
return InvokeDartCode(
#if defined(DART_PRECOMPILED_RUNTIME)
function.entry_point(),
#else
static_cast<uword>(function.CurrentCode()),
#endif
static_cast<uword>(arguments_descriptor.ptr()),
static_cast<uword>(arguments.ptr()), thread));
#endif
arguments_descriptor, arguments, thread);
}

#if defined(TESTING)
Expand All @@ -148,34 +158,13 @@ ObjectPtr DartEntry::InvokeCode(const Code& code,
ASSERT(!code.IsNull());
ASSERT(thread->no_callback_scope_depth() == 0);

DartEntryScope dart_entry_scope(thread);

const uword stub = StubCode::InvokeDartCode().EntryPoint();
return InvokeDartCode(
#if defined(DART_PRECOMPILED_RUNTIME)
#if defined(USING_SIMULATOR)
return bit_copy<ObjectPtr, int64_t>(Simulator::Current()->Call(
static_cast<intptr_t>(stub), static_cast<intptr_t>(code.EntryPoint()),
static_cast<intptr_t>(arguments_descriptor.ptr()),
static_cast<intptr_t>(arguments.ptr()),
reinterpret_cast<intptr_t>(thread)));
#else
return static_cast<ObjectPtr>((reinterpret_cast<invokestub>(stub))(
code.EntryPoint(), arguments_descriptor.ptr(), arguments.ptr(), thread));
#endif
code.EntryPoint(),
#else // defined(DART_PRECOMPILED_RUNTIME)
#if defined(USING_SIMULATOR)
return bit_copy<ObjectPtr, int64_t>(Simulator::Current()->Call(
static_cast<intptr_t>(stub), static_cast<intptr_t>(code.ptr()),
static_cast<intptr_t>(arguments_descriptor.ptr()),
static_cast<intptr_t>(arguments.ptr()),
reinterpret_cast<intptr_t>(thread)));
#else
return static_cast<ObjectPtr>((reinterpret_cast<invokestub>(stub))(
static_cast<uword>(code.ptr()),
static_cast<uword>(arguments_descriptor.ptr()),
static_cast<uword>(arguments.ptr()), thread));
#endif
#endif
arguments_descriptor, arguments, thread);
}
#endif // defined(TESTING)

Expand Down