mozilla
/
pluotsorbet
зеркало из https://github.com/mozilla/pluotsorbet.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

stop abusing frame as method/class pair and cleanup classfile loading a bit

This commit is contained in:
Andreas Gal 2014-07-12 22:19:03 -07:00
Родитель 9cb5538a5b
Коммит 135e18ea3e
4 изменённых файлов: 51 добавлений и 45 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
classes.js
Просмотреть файл

@ -73,7 +73,7 @@ Classes.prototype.getEntryPoint = function(className, methodName) {
ACCESS_FLAGS.isStatic(methods[i].access_flags) &&
!ACCESS_FLAGS.isNative(methods[i].access_flags) &&
cp[methods[i].name_index].bytes === methodName) {
return new Frame(classInfo, methods[i]);
return methods[i];
}
}
}
@ -87,7 +87,7 @@ Classes.prototype.initClass = function(className) {
if (!clinit)
return;
LOG.debug("call " + className + ".<clinit> ...");
clinit.run(THREADS.current.stack);
new Frame(clinit).run(THREADS.current.stack);
}
Classes.prototype.getClass = function(className, initialize) {
@ -124,7 +124,7 @@ Classes.prototype.getMethod = function(className, methodName, signature, staticF
if (ACCESS_FLAGS.isNative(methods[i].access_flags)) {
return NATIVE.getMethod(className, methodName, signature);
}
return new Frame(classInfo, methods[i]);
return methods[i];
}
}
}

74
classfile/classinfo.js
Просмотреть файл

@ -5,7 +5,7 @@
var ClassInfo = function(classBytes) {
if (this instanceof ClassInfo) {
this.classImage = getClassImage(classBytes);
this.classImage = getClassImage(classBytes, this);
} else {
return new ClassInfo(classBytes);
}
@ -51,7 +51,36 @@ ClassInfo.prototype.getClasses = function() {
return classes;
}
var getClassImage = function(classBytes) {
var FieldInfo = function(classInfo, access_flags, name_index, descriptor_index) {
this.classInfo = classInfo;
this.access_flags = access_flags;
this.name_index = name_index;
this.descriptor_index = descriptor_index;
this.attributes = [];
}
var MethodInfo = function(classInfo, access_flags, name_index, signature_index) {
this.classInfo = classInfo;
this.access_flags = access_flags;
this.name_index = name_index;
this.signature_index = signature_index;
this.attributes = [];
}
var AttributeInfo = function(attribute_name_index, attribute_length, info) {
this.attribute_name_index = attribute_name_index;
this.attribute_length = attribute_length;
this.info = info;
}
var ExceptionInfo = function(start_pc, end_pc, handler_pc, catch_type) {
this.start_pc = start_pc;
this.end_pc = end_pc;
this.handler_pc = handler_pc;
this.catch_type = catch_type;
}
var getClassImage = function(classBytes, classInfo) {
var classImage = {};
var getAttribues = function(attribute_name_index, bytes) {
@ -67,7 +96,7 @@ var getClassImage = function(classBytes) {
case TAGS.CONSTANT_Integer:
case TAGS.CONSTANT_String:
attribute.type = ATTRIBUTE_TYPES.ConstantValue;
attribute.constantvalue_index = reader.read16();
attribute.info = reader.read16();
return attribute;
case TAGS.CONSTANT_Utf8:
@ -86,7 +115,7 @@ var getClassImage = function(classBytes) {
var end_pc = reader.read16();
var handler_pc= reader.read16();
var catch_type = reader.read16();
attribute.exception_table.push({start_pc:start_pc,end_pc:end_pc,handler_pc:handler_pc,catch_type:catch_type });
attribute.exception_table.push(new ExceptionInfo(start_pc, end_pc, handler_pc, catch_type));
}
var attributes_count = reader.read16();
@ -95,7 +124,7 @@ var getClassImage = function(classBytes) {
var attribute_name_index = reader.read16();
var attribute_length = reader.read32();
var info = reader.readBytes(attribute_length);
attribute.attributes.push({ attribute_name_index: attribute_name_index, attribute_length: attribute_length, info: info });
attribute.attributes.push(new AttributeInfo(attribute_name_index, attribute_length, info));
}
return attribute;
@ -224,22 +253,12 @@ var getClassImage = function(classBytes) {
var name_index = reader.read16();
var descriptor_index = reader.read16();
var attributes_count = reader.read16();
var field_info = {
access_flags: access_flags,
name_index: name_index,
descriptor_index: descriptor_index,
attributes_count: attributes_count,
attributes: []
}
var field_info = new FieldInfo(access_flags, name_index, descriptor_index);
for(var j=0; j <attributes_count; j++) {
var attribute_name_index = reader.read16();
var attribute_length = reader.read32();
var constantvalue_index = reader.read16();
var attribute = {
attribute_name_index: attribute_name_index,
attribute_length: attribute_length,
constantvalue_index: constantvalue_index
}
var info = reader.read16();
var attribute = new AttributeInfo(attribute_name_index, attribute_length, info);
field_info.attributes.push(attribute);
}
classImage.fields.push(field_info);
@ -252,21 +271,12 @@ var getClassImage = function(classBytes) {
var name_index = reader.read16();
var signature_index = reader.read16();
var attributes_count = reader.read16();
var method_info = {
access_flags: access_flags,
name_index: name_index,
signature_index: signature_index,
attributes: []
}
var method_info = new MethodInfo(classInfo, access_flags, name_index, signature_index);
for(var j=0; j <attributes_count; j++) {
var attribute_name_index = reader.read16();
var attribute_length = reader.read32();
var info = getAttribues(attribute_name_index, reader.readBytes(attribute_length));
var attribute = {
attribute_name_index: attribute_name_index,
attribute_length: attribute_length,
info: info
}
var attribute = new AttributeInfo(attribute_name_index, attribute_length, info);
method_info.attributes.push(attribute);
if (info.type === ATTRIBUTE_TYPES.Code) {
method_info.code = Uint8Array(info.code);
@ -283,11 +293,7 @@ var getClassImage = function(classBytes) {
var attribute_name_index = reader.read16();
var attribute_length = reader.read32();
var info = getAttribues(attribute_name_index, reader.readBytes(attribute_length));
var attribute = {
attribute_name_index: attribute_name_index,
attribute_length: attribute_length,
info: info
}
var attribute = new AttributeInfo(attribute_name_index, attribute_length, info);
classImage.attributes.push(attribute);
}

14
frame.js
Просмотреть файл

@ -3,15 +3,15 @@
'use strict';
var Frame = function(classData, methodInfo) {
var Frame = function(methodInfo) {
if (this instanceof Frame) {
this.cp = classData.getConstantPool();
this.classData = classData;
this.methodInfo = methodInfo;
this.classInfo = methodInfo.classInfo;
this.cp = this.classInfo.getConstantPool();
this.signature = Signature.parse(this.cp[methodInfo.signature_index].bytes);
this.code = methodInfo.code;
} else {
return new Frame(classData, method);
return new Frame(methodInfo);
}
}
@ -108,7 +108,7 @@ Frame.prototype.run = function(stack) {
while (true) {
var op = this.read8();
console.log(this.classData.getClassName(), this.cp[this.methodInfo.name_index].bytes,
console.log(this.classInfo.getClassName(), this.cp[this.methodInfo.name_index].bytes,
this.ip - 1, OPCODES[op], stack.array.length);
switch (op) {
case OPCODES.return:
@ -962,7 +962,7 @@ Frame.prototype.putstatic = function(stack, locals) {
Frame.prototype.invoke = function(stack, method, signature) {
var result;
if (!(method instanceof Frame)) {
if (!(method instanceof MethodInfo)) {
signature = Signature.parse(signature);
var args = stack.popArgs(signature.IN);
var instance = null;
@ -973,7 +973,7 @@ Frame.prototype.invoke = function(stack, method, signature) {
if (OUT.length)
stack.pushType(OUT[0], result);
} else {
method.run(stack);
new Frame(method).run(stack);
}
}

2
jvm.js
Просмотреть файл

@ -61,5 +61,5 @@ JVM.prototype.run = function() {
var stack = THREADS.current.stack;
stack.push(null); // args
entryPoint.run(stack);
new Frame(entryPoint).run(stack);
}