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

[vm/kernel/bytecode] Write constant pool before bytecode and exceptions table

Browse source 
This simplifies reading, as exceptions table refers to constant pool.

Change-Id: Id20d2a315ad87aa4e5247fcd98d7e5996c188eec
Reviewed-on: https://dart-review.googlesource.com/56032
Reviewed-by: Régis Crelier <regis@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Alexander Markov 2018-05-21 23:51:41 +00:00 committed by commit-bot@chromium.org
parent 80b48195b1
commit 714697efbb
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/vm/lib/bytecode/gen_bytecode.dart
View file

@ -475,7 +475,7 @@ class BytecodeGenerator extends RecursiveVisitor<Null> {
void end(Member node) {
metadata.mapping[node] =
new BytecodeMetadata(asm.bytecode, asm.exceptionsTable, cp, closures);
new BytecodeMetadata(cp, asm.bytecode, asm.exceptionsTable, closures);
if (isTraceEnabled) {
print('Generated bytecode for $node');

15
pkg/vm/lib/metadata/bytecode.dart
View file

@ -14,9 +14,9 @@ import 'package:vm/bytecode/exceptions.dart' show ExceptionsTable;
/// In kernel binary, bytecode metadata is encoded as following:
///
/// type BytecodeMetadata {
/// ConstantPool constantPool
/// List<Byte> bytecodes
/// ExceptionsTable exceptionsTable
/// ConstantPool constantPool
/// List<ClosureBytecode> closures
/// }
///
@ -33,14 +33,15 @@ import 'package:vm/bytecode/exceptions.dart' show ExceptionsTable;
/// pkg/vm/lib/bytecode/constant_pool.dart.
///
class BytecodeMetadata {
final ConstantPool constantPool;
final List<int> bytecodes;
final ExceptionsTable exceptionsTable;
final ConstantPool constantPool;
final List<ClosureBytecode> closures;
BytecodeMetadata(
this.bytecodes, this.exceptionsTable, this.constantPool, this.closures);
this.constantPool, this.bytecodes, this.exceptionsTable, this.closures);
// TODO(alexmarkov): Consider printing constant pool before bytecode.
@override
String toString() => "\n"
"Bytecode {\n"
@ -96,22 +97,22 @@ class BytecodeMetadataRepository extends MetadataRepository<BytecodeMetadata> {
@override
void writeToBinary(BytecodeMetadata metadata, Node node, BinarySink sink) {
metadata.constantPool.writeToBinary(node, sink);
sink.writeByteList(metadata.bytecodes);
metadata.exceptionsTable.writeToBinary(sink);
metadata.constantPool.writeToBinary(node, sink);
sink.writeUInt30(metadata.closures.length);
metadata.closures.forEach((c) => c.writeToBinary(sink));
}
@override
BytecodeMetadata readFromBinary(Node node, BinarySource source) {
final List<int> bytecodes = source.readByteList();
final exceptionsTable = new ExceptionsTable.readFromBinary(source);
final ConstantPool constantPool =
new ConstantPool.readFromBinary(node, source);
final List<int> bytecodes = source.readByteList();
final exceptionsTable = new ExceptionsTable.readFromBinary(source);
final List<ClosureBytecode> closures = new List<ClosureBytecode>.generate(
source.readUInt(), (_) => new ClosureBytecode.readFromBinary(source));
return new BytecodeMetadata(
bytecodes, exceptionsTable, constantPool, closures);
constantPool, bytecodes, exceptionsTable, closures);
}
}