kmillikin@google.com
6c7d65e482
Only allocate space for the bits covered by the stackmap, instead of for the backing store of the utility class that built it. Fix a bug where the size in bytes was multiplied by the word size in bytes. Also do some cleanup of the stackmap code and renaming in the tests. BUG= Review URL: https://chromiumcodereview.appspot.com//10832292 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@10870 260f80e4-7a28-3924-810f-c04153c831b5
101 lines
2.9 KiB
C++
101 lines
2.9 KiB
C++
// Copyright (c) 2012, 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/code_descriptors.h"
|
|
|
|
namespace dart {
|
|
|
|
void DescriptorList::AddDescriptor(PcDescriptors::Kind kind,
|
|
intptr_t pc_offset,
|
|
intptr_t deopt_id,
|
|
intptr_t token_index,
|
|
intptr_t try_index) {
|
|
struct PcDesc data;
|
|
data.pc_offset = pc_offset;
|
|
data.kind = kind;
|
|
data.deopt_id = deopt_id;
|
|
data.token_index = token_index;
|
|
data.try_index = try_index;
|
|
list_.Add(data);
|
|
}
|
|
|
|
|
|
void DescriptorList::AddDeoptInfo(intptr_t pc_offset,
|
|
intptr_t deopt_id,
|
|
intptr_t token_index,
|
|
intptr_t deopt_array_index) {
|
|
struct PcDesc data;
|
|
data.pc_offset = pc_offset;
|
|
data.kind = PcDescriptors::kDeoptIndex;
|
|
data.deopt_id = deopt_id;
|
|
data.token_index = token_index;
|
|
// Try_index is reused for deopt_array_index.
|
|
data.try_index = deopt_array_index;
|
|
list_.Add(data);
|
|
}
|
|
|
|
|
|
RawPcDescriptors* DescriptorList::FinalizePcDescriptors(uword entry_point) {
|
|
intptr_t num_descriptors = Length();
|
|
const PcDescriptors& descriptors =
|
|
PcDescriptors::Handle(PcDescriptors::New(num_descriptors));
|
|
for (intptr_t i = 0; i < num_descriptors; i++) {
|
|
descriptors.AddDescriptor(i,
|
|
(entry_point + PcOffset(i)),
|
|
Kind(i),
|
|
DeoptId(i),
|
|
TokenPos(i),
|
|
TryIndex(i));
|
|
}
|
|
return descriptors.raw();
|
|
}
|
|
|
|
|
|
void StackmapTableBuilder::AddEntry(intptr_t pc_offset,
|
|
BitmapBuilder* bitmap) {
|
|
stack_map_ = Stackmap::New(pc_offset, entry_length_in_bits_, bitmap);
|
|
list_.Add(stack_map_);
|
|
}
|
|
|
|
|
|
bool StackmapTableBuilder::Verify() {
|
|
intptr_t num_entries = Length();
|
|
Stackmap& map1 = Stackmap::Handle();
|
|
Stackmap& map2 = Stackmap::Handle();
|
|
for (intptr_t i = 1; i < num_entries; i++) {
|
|
map1 = MapAt(i - 1);
|
|
map2 = MapAt(i);
|
|
// Ensure there are no duplicates and the entries are sorted.
|
|
if (map1.PC() >= map2.PC()) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
RawArray* StackmapTableBuilder::FinalizeStackmaps(const Code& code) {
|
|
ASSERT(Verify());
|
|
intptr_t num_entries = Length();
|
|
if (num_entries == 0) {
|
|
return Object::empty_array();
|
|
}
|
|
uword entry_point = code.EntryPoint();
|
|
for (intptr_t i = 0; i < num_entries; i++) {
|
|
stack_map_ = MapAt(i);
|
|
stack_map_.SetPC(entry_point + stack_map_.PC());
|
|
stack_map_.SetCode(code);
|
|
}
|
|
return Array::MakeArray(list_);
|
|
}
|
|
|
|
|
|
RawStackmap* StackmapTableBuilder::MapAt(int index) const {
|
|
Stackmap& map = Stackmap::Handle();
|
|
map ^= list_.At(index);
|
|
return map.raw();
|
|
}
|
|
|
|
} // namespace dart
|