languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 12:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vm] Restore FrameLayout name

Browse source 
It was accidentally renamed to UntaggedFrame when we
were refactoring tagged pointers representation and
renaming Raw* classes.

TEST=just a rename

Change-Id: I399a9cdfd415ff8da9597c9a6fcd753f55d558d1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/291764
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Vyacheslav Egorov 2023-03-29 18:11:49 +00:00 committed by Commit Queue
parent d01421c837
commit d449a33285
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime/vm/compiler/runtime_api.h
View file

@ -331,7 +331,7 @@ inline intptr_t RoundedAllocationSize(intptr_t size) {
return Utils::RoundUp(size, kObjectAlignment);
}
// Information about frame_layout that compiler should be targeting.
extern UntaggedFrame frame_layout;
extern FrameLayout frame_layout;
constexpr intptr_t kIntSpillFactor = sizeof(int64_t) / kWordSize;
constexpr intptr_t kDoubleSpillFactor = sizeof(double) / kWordSize;

2
runtime/vm/dart.cc
View file

@ -292,7 +292,7 @@ char* Dart::DartInit(const Dart_InitializeParams* params) {
}
}
UntaggedFrame::Init();
FrameLayout::Init();
set_thread_start_callback(params->thread_start);
set_thread_exit_callback(params->thread_exit);

4
runtime/vm/frame_layout.h
View file

@ -8,7 +8,7 @@
#include "platform/assert.h"
#include "platform/globals.h"
// UntaggedFrame structure captures configuration specific properties of the
// FrameLayout structure captures configuration specific properties of the
// frame layout used by the runtime system and compiler.
//
// Runtime system uses runtime_frame_layout defined in stack_frame.h.
@ -19,7 +19,7 @@ namespace dart {
// Forward declarations.
class LocalVariable;
struct UntaggedFrame {
struct FrameLayout {
// The offset (in words) from FP to the first object.
int first_object_from_fp;

16
runtime/vm/stack_frame.cc
View file

@ -26,7 +26,7 @@
namespace dart {
const UntaggedFrame invalid_frame_layout = {
const FrameLayout invalid_frame_layout = {
/*.first_object_from_fp = */ -1,
/*.last_fixed_object_from_fp = */ -1,
/*.param_end_from_fp = */ -1,
@ -40,7 +40,7 @@ const UntaggedFrame invalid_frame_layout = {
/*.exit_link_slot_from_entry_fp = */ -1,
};
const UntaggedFrame default_frame_layout = {
const FrameLayout default_frame_layout = {
/*.first_object_from_fp = */ kFirstObjectSlotFromFp,
/*.last_fixed_object_from_fp = */ kLastFixedObjectSlotFromFp,
/*.param_end_from_fp = */ kParamEndSlotFromFp,
@ -53,7 +53,7 @@ const UntaggedFrame default_frame_layout = {
/*.code_from_fp = */ kPcMarkerSlotFromFp,
/*.exit_link_slot_from_entry_fp = */ kExitLinkSlotFromEntryFp,
};
const UntaggedFrame bare_instructions_frame_layout = {
const FrameLayout bare_instructions_frame_layout = {
/*.first_object_from_pc =*/kFirstObjectSlotFromFp, // No saved PP slot.
/*.last_fixed_object_from_fp = */ kLastFixedObjectSlotFromFp +
2, // No saved CODE, PP slots
@ -73,19 +73,19 @@ const UntaggedFrame bare_instructions_frame_layout = {
namespace compiler {
namespace target {
UntaggedFrame frame_layout = invalid_frame_layout;
FrameLayout frame_layout = invalid_frame_layout;
}
} // namespace compiler
UntaggedFrame runtime_frame_layout = invalid_frame_layout;
FrameLayout runtime_frame_layout = invalid_frame_layout;
int UntaggedFrame::FrameSlotForVariable(const LocalVariable* variable) const {
int FrameLayout::FrameSlotForVariable(const LocalVariable* variable) const {
ASSERT(!variable->is_captured());
return this->FrameSlotForVariableIndex(variable->index().value());
}
int UntaggedFrame::FrameSlotForVariableIndex(int variable_index) const {
int FrameLayout::FrameSlotForVariableIndex(int variable_index) const {
// Variable indices are:
// [1, 2, ..., M] for the M parameters.
// [0, -1, -2, ... -(N-1)] for the N [LocalVariable]s
@ -94,7 +94,7 @@ int UntaggedFrame::FrameSlotForVariableIndex(int variable_index) const {
: (variable_index + param_end_from_fp);
}
void UntaggedFrame::Init() {
void FrameLayout::Init() {
// By default we use frames with CODE_REG/PP in the frame.
compiler::target::frame_layout = default_frame_layout;
runtime_frame_layout = default_frame_layout;

2
runtime/vm/stack_frame.h
View file

@ -30,7 +30,7 @@ namespace dart {
class ObjectPointerVisitor;
class LocalVariable;
extern UntaggedFrame runtime_frame_layout;
extern FrameLayout runtime_frame_layout;
// Generic stack frame.
class StackFrame : public ValueObject {