Skip to content

Commit

Permalink
Intergrate kilim-1.0/asm-4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@krestenkrab
krestenkrab committed Aug 16, 2013
1 parent 075ff45 commit 3ba242e
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 19 deletions.
3 changes: 2 additions & 1 deletion build.xml
View file
Expand Up @@ -6,7 +6,8 @@
<path id="erjang.classpath">
<pathelement location="target/classes/" />
<pathelement location="lib/js.jar" />
<pathelement location="lib/kilim-0.6-krab.jar" />
<pathelement location="lib/kilim.jar" />
<pathelement location="lib/asm-all-4.1.jar" />
<pathelement location="lib/OtpErlang.jar" />
<pathelement location="lib/junit.jar" />
<pathelement location="lib/clj-ds.jar" />
Expand Down
Binary file removed lib/kilim-0.6-krab.jar
View file
Binary file not shown.
8 changes: 5 additions & 3 deletions src/main/java/erjang/EFun.java
View file
Expand Up @@ -219,7 +219,7 @@ static byte[] gen_fun_class_data(int arity) {

String self_type = EFUN_TYPE.getInternalName() + arity;

ClassWriter cw = new ClassWriter(true);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC | Opcodes.ACC_ABSTRACT,
self_type, null, EFUN_TYPE.getInternalName(), null);

Expand Down Expand Up @@ -273,6 +273,7 @@ static byte[] gen_fun_class_data(int arity) {
static final Pattern JAVA_ID = Pattern.compile("([a-z]|[A-Z]|$|_|[0-9])*"); // valid java identifier

public static EFun get_fun_with_handler(String module, String function, int arity, EFunHandler handler, ClassLoader loader) {

String signature = module + function + arity;
Constructor<? extends EFun> h = handlers.get(signature);

Expand All @@ -287,7 +288,7 @@ public static EFun get_fun_with_handler(String module, String function, int arit
.append(safe_module).append(safe_function)
.append("Handler").append(arity).toString();

ClassWriter cw = new ClassWriter(true);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
String super_class_name = EFUN_TYPE.getInternalName() + arity;
cw.visit(Opcodes.V1_4, ACC_PUBLIC, self_type, null,
super_class_name, null);
Expand Down Expand Up @@ -555,7 +556,7 @@ static byte[] get_exported_fun_class_data(int arity) {
String super_type = EFUN_TYPE.getInternalName() + arity;
String self_type = super_type + "Exported";

ClassWriter cw = new ClassWriter(true);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC | Opcodes.ACC_ABSTRACT,
self_type, null, super_type, null);

Expand Down Expand Up @@ -633,6 +634,7 @@ private static void push_int(MethodVisitor mv, int i) {

public static byte[] weave(byte[] data) {
ClassWeaver w = new ClassWeaver(data, new Compiler.ErjangDetector("/xx/", (Set<String>)Collections.EMPTY_SET));
w.weave();
for (ClassInfo ci : w.getClassInfos()) {
// ETuple.dump(ci.className, ci.bytes);

Expand Down
10 changes: 10 additions & 0 deletions src/main/java/erjang/EProc.java
View file
Expand Up @@ -203,6 +203,8 @@ public EInternalPID self_handle() {

public int midx = 0;

private int priority = 2;

protected void link_failure(EHandle h) throws Pausable {
if (trap_exit == ERT.TRUE || h.testLocalHandle()==null) {
send_exit(h, ERT.am_noproc, false);
Expand Down Expand Up @@ -439,6 +441,14 @@ public EObject process_flag(EAtom flag, EObject value) {
throw new NotImplemented("process_flag flag="+flag+", value="+value);
}

private int getPriority() {
return this.priority;
}

private void setPriority(int i) {
this.priority = i;
}

@Override
public void execute() throws Pausable {
Throwable death = null;
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/erjang/ETuple.java
View file
Expand Up @@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Set;

import org.objectweb.asm.ClassAdapter;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
Expand Down Expand Up @@ -204,7 +204,7 @@ static public Class get_tuple_class(int num_cells) {
}

static byte[] make_tuple_class_data(int num_cells) {
ClassWriter cww = new ClassWriter(true);
ClassWriter cww = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);

CheckClassAdapter cw = new CheckClassAdapter(cww);

Expand Down Expand Up @@ -247,7 +247,7 @@ static byte[] make_tuple_class_data(int num_cells) {
return data;
}

private static void create_tuple_copy(int i, ClassAdapter cw,
private static void create_tuple_copy(int i, ClassVisitor cw,
String this_class_name, String super_class_name) {
MethodVisitor mv;
make_blank_bridge(cw, this_class_name, super_class_name);
Expand All @@ -266,7 +266,7 @@ private static void create_tuple_copy(int i, ClassAdapter cw,
mv.visitEnd();
}

private static void make_blank_bridge(ClassAdapter cw,
private static void make_blank_bridge(ClassVisitor cw,
String this_class_name, String super_class_name) {
MethodVisitor mv;
mv = cw.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC
Expand All @@ -281,7 +281,7 @@ private static void make_blank_bridge(ClassAdapter cw,
mv.visitEnd();
}

private static void create_tuple_nth(int n_cells, ClassAdapter cw,
private static void create_tuple_nth(int n_cells, ClassVisitor cw,
String this_class_name) {
MethodVisitor mv;
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "elm", "(I)"
Expand Down Expand Up @@ -321,7 +321,7 @@ private static void create_tuple_nth(int n_cells, ClassAdapter cw,
mv.visitEnd();
}

private static void create_tuple_set(int n_cells, ClassAdapter cw,
private static void create_tuple_set(int n_cells, ClassVisitor cw,
String this_class_name) {
MethodVisitor mv;
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "set", "(I"
Expand Down Expand Up @@ -368,7 +368,7 @@ protected final EObject bad_nth(int i) {
throw ERT.badarg(this);
}

private static void create_count(ClassAdapter cw, int n) {
private static void create_count(ClassVisitor cw, int n) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "arity", "()I",
null, null);
mv.visitCode();
Expand All @@ -383,7 +383,7 @@ private static void create_count(ClassAdapter cw, int n) {
mv.visitEnd();
}

private static void create_cast(ClassAdapter cw, int n) {
private static void create_cast(ClassVisitor cw, int n) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC
| Opcodes.ACC_STATIC, "cast", "(L" + ETUPLE_NAME + ";)L"
+ ETUPLE_NAME + n + ";", null, null);
Expand Down Expand Up @@ -414,7 +414,7 @@ private static void create_cast(ClassAdapter cw, int n) {
}


private static void create_cast2(ClassAdapter cw, int n) {
private static void create_cast2(ClassVisitor cw, int n) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC
| Opcodes.ACC_STATIC, "cast", "(L" + Type.getInternalName(EObject.class) + ";)L"
+ ETUPLE_NAME + n + ";", null, null);
Expand All @@ -439,7 +439,7 @@ private static void create_cast2(ClassAdapter cw, int n) {
mv.visitEnd();
}

private static void create_constructor(ClassAdapter cw,
private static void create_constructor(ClassVisitor cw,
String super_class_name) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V",
null, null);
Expand All @@ -452,7 +452,7 @@ private static void create_constructor(ClassAdapter cw,
mv.visitEnd();
}

static void dump(String name, byte[] data) {
public static void dump(String name, byte[] data) {

String pkg = name.substring(0, name.lastIndexOf('/'));

Expand Down
7 changes: 4 additions & 3 deletions src/main/java/erjang/beam/Compiler.java
View file
Expand Up @@ -32,7 +32,7 @@

import kilim.analysis.ClassInfo;
import kilim.analysis.ClassWeaver;
import kilim.analysis.Detector;
import kilim.mirrors.Detector;
import kilim.mirrors.ClassMirrorNotFoundException;
import kilim.mirrors.Mirrors;

Expand Down Expand Up @@ -70,7 +70,7 @@ public static void compile(BeamFileData data, ClassRepo repo) throws IOException
ClassWeaver.reset();

// class writer, phase 4
ClassWriter cw = new ClassWriter(true);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);

// class checker, optional phase
//CheckClassAdapter ca = new CheckClassAdapter(cw);
Expand Down Expand Up @@ -102,6 +102,7 @@ public static void compile(BeamFileData data, ClassRepo repo) throws IOException
boolean written = false;
ClassWeaver cwe = new ClassWeaver(byteArray, new ErjangDetector(
cv.getInternalClassName(), cv.non_pausable_methods));
cwe.weave();
for (ClassInfo ci : cwe.getClassInfos()) {
String name = ci.className;
byte[] bytes = ci.bytes;
Expand Down Expand Up @@ -137,7 +138,7 @@ static public class ErjangDetector extends Detector {
* @param mirrors
*/
public ErjangDetector(String className, Set<String> nonPausableMethods) {
super(Mirrors.getRuntimeMirrors());
super(Detector.DEFAULT.mirrors);
this.className = className;
this.nonPausableMethods = nonPausableMethods;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/erjang/beam/CompilerVisitor.java
View file
Expand Up @@ -682,6 +682,7 @@ public void visitEnd() {

ClassWeaver w = new ClassWeaver(data, new Compiler.ErjangDetector(
self_type.getInternalName(), non_pausable_methods));
w.weave();
if (w.getClassInfos().size() == 0) { // Class did not need weaving
try {
classRepo.store(full_inner_name, data);
Expand Down Expand Up @@ -3119,7 +3120,7 @@ static public byte[] make_invoker(String module, String function,
String inner_name = "FN_" + mname;
String full_inner_name = outer_name + "$" + inner_name;

ClassWriter cw = new ClassWriter(true);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
int residual_arity = arity - freevars;
String super_class_name = EFUN_NAME + residual_arity +
(exported ? "Exported" : "");
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/erjang/beam/FunctionVisitor.java
View file
Expand Up @@ -18,6 +18,8 @@

package erjang.beam;

import java.util.Collection;

/**
*
*/
Expand Down

0 comments on commit 3ba242e

Please sign in to comment.