i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unifyOptimierung

Browse Source 
merge bytecode2
This commit is contained in:
Martin Plümicke 2018-05-09 13:29:11 +02:00
commit 1c22fc7d57
13 changed files with 198 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/de/dhbwstuttgart/bytecode/BytecodeGen.java
View File

@ -187,7 +187,11 @@ public class BytecodeGen implements ASTVisitor {
// Method getModifiers() ?
int acc = isInterface?Opcodes.ACC_ABSTRACT:method.modifier;
System.out.println(acc);
/*Prüfe, ob die Rückgabe-Type der Methode eine Type-Variable ist*/
boolean hasGenInParameterList = genericsAndBounds.containsKey(resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor()));
/*Wenn die Rückgabe-Type eine Typ-variable ist, erzeuge direkt die Signature, wenn nicht,
* prüfe, ob einer der Parameter Typ-Variable als Typ hat*/
if(!hasGenInParameterList) {
for(String paramName : methodParamsAndTypes.keySet()) {
String typeOfParam = methodParamsAndTypes.get(paramName).acceptTV(new TypeToDescriptor());
@ -202,6 +206,8 @@ public class BytecodeGen implements ASTVisitor {
//then create the descriptor with the new syntax.
String sig = null;
/* method.getGenerics: <....> RT method(..)
* */
boolean hasGen = method.getGenerics().iterator().hasNext() || hasGenInParameterList;
/* if method has generics or return type is TPH, create signature */

16
src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
View File

@ -546,7 +546,7 @@ public class BytecodeGenMethod implements StatementVisitor {
cw.visitInnerClass("java/lang/invoke/MethodHandles$Lookup", "java/lang/invoke/MethodHandles", "Lookup",
Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC + Opcodes.ACC_FINAL);
// generateBCForFunN(lambdaExpression,typeErasure);
generateBCForFunN(lambdaExpression,typeErasure);
}
private void generateBCForFunN(LambdaExpression lambdaExpression, String methDesc) {
@ -580,7 +580,7 @@ public class BytecodeGenMethod implements StatementVisitor {
try {
System.out.println("generating " + name + ".class file...");
output = new FileOutputStream(
new File(System.getProperty("user.dir") + "/testBytecode/generatedBC/examples/" + name + ".class"));
new File(System.getProperty("user.dir") + "/testBytecode/generatedBC/" + name + ".class"));
output.write(bytecode);
output.close();
System.out.println(name + ".class file generated");
@ -772,7 +772,19 @@ public class BytecodeGenMethod implements StatementVisitor {
@Override
public void visit(Return aReturn) {
if(aReturn.retexpr instanceof BinaryExpr)
isBinaryExp = true;
aReturn.retexpr.accept(this);
if (isBinaryExp) {
BinaryExpr binary = (BinaryExpr) aReturn.retexpr;
String lexpType = getResolvedType(binary.lexpr.getType());
String rexpType = getResolvedType(binary.rexpr.getType());
getValueOfIns(getLargerType(lexpType, rexpType));
isBinaryExp = false;
}
mv.visitInsn(Opcodes.ARETURN);
}

7
src/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
View File

@ -49,9 +49,10 @@ public class DescriptorToString implements DescriptorVisitor{
desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
}
}
// else if(((RefType) fp.getType()).getParaList().size() > 0){
// desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.toString().replace(".", "%").replace("<", "%%").replace(">", "%%")+ ";";
// }
//TODO: generate a class java%% ... %%
else if(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()).contains("<")){
desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.toString().replace(".", "%").replace("<", "%%").replace(">", "%%")+ ";";
}
else {
desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
}

41
test/bytecode/GenTest.java Normal file
View File

@ -0,0 +1,41 @@
package bytecode;
import static org.junit.Assert.*;
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
import org.junit.BeforeClass;
import org.junit.Test;
import de.dhbwstuttgart.core.JavaTXCompiler;
public class GenTest {
private static String path;
private static File fileToTest;
private static JavaTXCompiler compiler;
private static ClassLoader loader;
private static Class<?> classToTest;
private static String pathToClassFile;
private static Object instanceOfClass;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Gen.jav";
fileToTest = new File(path);
compiler = new JavaTXCompiler(fileToTest);
compiler.generateBytecode();
pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
classToTest = loader.loadClass("Gen");
instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
}
@Test
public void test() {
fail("Not yet implemented");
}
}

23
test/bytecode/LambdaTest.java Normal file
View File

@ -0,0 +1,23 @@
package bytecode;
import java.io.File;
import org.junit.Test;
import de.dhbwstuttgart.core.JavaTXCompiler;
public class LambdaTest {
private static String path;
private static File fileToTest;
private static JavaTXCompiler compiler;
@Test
public void generateBC() throws Exception {
path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Lambda.jav";
fileToTest = new File(path);
compiler = new JavaTXCompiler(fileToTest);
compiler.generateBytecode();
}
}

160
test/bytecode/OpTest.java
View File

@ -36,158 +36,26 @@ public class OpTest {
}
@Test
public void testClassname() {
assertEquals("Op", classToTest.getName());
public void testAddString() throws NoSuchMethodException, SecurityException, IllegalAccessException,
IllegalArgumentException, InvocationTargetException, InstantiationException {
Method m = classToTest.getDeclaredMethod("m", String.class,String.class);
String result = (String) m.invoke(instanceOfClass, "Byte","Code");
assertEquals("ByteCode", result);
}
@Test
public void testClassModifiers() {
assertEquals(Opcodes.ACC_PUBLIC, classToTest.getModifiers());
}
// @Test
// public void testNumberOfMethods() {
// int numOfMeth = classToTest.getDeclaredMethods().length;
// assertEquals(5, numOfMeth);
// }
//
// @Test
// public void testAddString() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method addString = classToTest.getDeclaredMethod("addString", String.class,String.class);
// String result = (String) addString.invoke(instanceOfClass, "Byte","Code");
// assertEquals("ByteCode", result);
// }
//
@Test
public void testAddInt() throws NoSuchMethodException, SecurityException, IllegalAccessException,
IllegalArgumentException, InvocationTargetException, InstantiationException {
Method addInt = classToTest.getDeclaredMethod("addInt", Integer.class,Integer.class);
Number result = (Number) addInt.invoke(instanceOfClass, 7,3);
Method m = classToTest.getDeclaredMethod("m", Integer.class,Integer.class);
Integer result = (Integer) m.invoke(instanceOfClass, 7,3);
assertEquals(10, result);
}
// @Test
// public void testAddLong() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method addLong = classToTest.getDeclaredMethod("addLong", Long.class,Long.class);
// Long result = (Long) addLong.invoke(instanceOfClass, 7L,3L);
// assertEquals(10L, result);
// }
//
// @Test
// public void testAddFloat() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method addFloat = classToTest.getDeclaredMethod("addFloat", Float.class,Float.class);
// Float result = (Float) addFloat.invoke(instanceOfClass, 7f,3f);
// assertEquals(10f, result);
// }
//
// @Test
// public void testAddDouble() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method addDouble = classToTest.getDeclaredMethod("addDouble", Double.class,Double.class);
// Double result = (Double) addDouble.invoke(instanceOfClass, 7.0,3.0);
// assertEquals(10.0, result);
// }
// @Test
// public void testAddIntLong() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Integer.class,Long.class);
// Long result = (Long) add.invoke(instanceOfClass, 7,3L);
// assertEquals(10L, result);
// }
// @Test
// public void testAddDLong() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Double.class,Long.class);
// Double result = (Double) add.invoke(instanceOfClass, 7d,3L);
// assertEquals(10d, result);
// }
// @Test
// public void testAddIntShort() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Integer.class,Short.class);
// Short s = 3;
// Integer result = (Integer) add.invoke(instanceOfClass, 7,s);
// assertEquals(10, result);
// }
// @Test
// public void testAddIntByte() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Integer.class,Byte.class);
// Byte b = 3;
// Integer result = (Integer) add.invoke(instanceOfClass, 7,b);
// assertEquals(10, result);
// }
// @Test
// public void testAddDFloat() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Float.class,Double.class);
// Double result = (Double) add.invoke(instanceOfClass, 7f,3d);
// assertEquals(10d, result);
// }
// @Test
// public void testAddIntD() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Integer.class,Double.class);
// Double result = (Double) add.invoke(instanceOfClass, 7,3d);
// assertEquals(10d, result);
// }
// @Test
// public void testAddShortD() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Short.class,Double.class);
// Short s = 7;
// Double result = (Double) add.invoke(instanceOfClass, s,3d);
// assertEquals(10d, result);
// }
// @Test
// public void testAddByteD() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method add = classToTest.getDeclaredMethod("add", Byte.class,Double.class);
// Byte b = 7;
// Double result = (Double) add.invoke(instanceOfClass, b,3d);
// assertEquals(10d, result);
// }
// @Test
// public void testMulInt() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method mulInt = classToTest.getDeclaredMethod("mulInt", Integer.class,Integer.class);
// Integer result = (Integer) mulInt.invoke(instanceOfClass, 7,3);
// assertEquals(21, result);
// }
//
// @Test
// public void testMulLong() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method mulLong = classToTest.getDeclaredMethod("mulLong", Long.class,Long.class);
// Long result = (Long) mulLong.invoke(instanceOfClass, 7L,3L);
// assertEquals(21L, result);
// }
//
// @Test
// public void testMulFloat() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method mulFloat = classToTest.getDeclaredMethod("mulFloat", Float.class,Float.class);
// Float result = (Float) mulFloat.invoke(instanceOfClass, 7f,3f);
// assertEquals(21f, result);
// }
//
// @Test
// public void testMulDouble() throws NoSuchMethodException, SecurityException, IllegalAccessException,
// IllegalArgumentException, InvocationTargetException, InstantiationException {
// Method mulDouble = classToTest.getDeclaredMethod("mulDouble", Double.class,Double.class);
// Double result = (Double) mulDouble.invoke(instanceOfClass, 7.0,3.0);
// assertEquals(21.0, result);
// }
}

54
test/bytecode/PlusTest.java Normal file
View File

@ -0,0 +1,54 @@
package bytecode;
import static org.junit.Assert.*;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import org.junit.BeforeClass;
import org.junit.Test;
import de.dhbwstuttgart.core.JavaTXCompiler;
public class PlusTest {
private static String path;
private static File fileToTest;
private static JavaTXCompiler compiler;
private static ClassLoader loader;
private static Class<?> classToTest;
private static String pathToClassFile;
private static Object instanceOfClass;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Plus.jav";
fileToTest = new File(path);
compiler = new JavaTXCompiler(fileToTest);
compiler.generateBytecode();
pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/examples/";
loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
classToTest = loader.loadClass("Plus");
instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
}
@Test
public void testAddInt() throws NoSuchMethodException, SecurityException, IllegalAccessException,
IllegalArgumentException, InvocationTargetException, InstantiationException {
Method addInt = classToTest.getDeclaredMethod("m", Integer.class,Integer.class);
Number result = (Number) addInt.invoke(instanceOfClass, 7,3);
assertEquals(10, result);
}
@Test
public void testAddString() throws NoSuchMethodException, SecurityException, IllegalAccessException,
IllegalArgumentException, InvocationTargetException, InstantiationException {
Method addString = classToTest.getDeclaredMethod("m", String.class,String.class);
String result = (String) addString.invoke(instanceOfClass, "Byte","Code");
assertEquals("ByteCode", result);
}
}

7
test/bytecode/javFiles/Gen.jav
View File

@ -1,5 +1,8 @@
import java.lang.Integer;
import java.util.Vector;
public class Gen{
Vector<Integer> m(Vector<Integer> v){
Vector<? extends Integer> m(Vector<Integer> v){
return v;
}
}
}

15
test/bytecode/javFiles/LamAssign.jav
View File

@ -1,15 +0,0 @@
import java.lang.Integer;
class LamAssign {
m () {
var lam1 = (Integer x) -> {
return x;
};
return lam1;
}
}
interface Fun1<A,B>{
public A apply(B b);
}

23
test/bytecode/javFiles/Lambda.jav
View File

@ -1,18 +1,11 @@
class Lambda{
import java.lang.Integer;
methode(){
return ((f) -> f);
}
}
/*
interface Fun0<A>{
A apply();
}
public class Lambda {
interface Fun1<A,B>{
A apply(B b);
m () {
var lam1 = (Integer x) -> {
return x;
};
return lam1;
}
}
*/
interface Fun2<A,B,C>{
A apply(B b, C c);
}

18
test/bytecode/javFiles/Lambda4.jav Normal file
View File

@ -0,0 +1,18 @@
class Lambda{
methode(){
return ((f) -> f);
}
}
/*
interface Fun0<A>{
A apply();
}
interface Fun1<A,B>{
A apply(B b);
}
*/
interface Fun2<A,B,C>{
A apply(B b, C c);
}

101
test/bytecode/javFiles/Op.jav
View File

@ -9,103 +9,8 @@ import java.lang.Byte;
public class Op {
addInt( a, b) {
var c = a+b;
return c;
Integer m(Integer a, Integer b) {
//var c = a+b;
return a+b;
}
// addString(String a, String b) {
// String c = a+b;
// return c;
// }
// addLong(Long a, Long b) {
// Long c = a+b;
// return c;
// }
// addFloat(Float a, Float b) {
// Float c = a+b;
// return c;
// }
// addDouble(Double a, Double b) {
// Double c = a+b;
// return c;
// }
// subInt(Integer a, Integer b) {
// Integer c = a-b;
// return c;
// }
// subLong(Long a, Long b) {
// Long c = a-b;
// return c;
// }
// subFloat(Float a, Float b) {
// Float c = a-b;
// return c;
// }
// subDouble(Double a, Double b) {
// Double c = a-b;
// return c;
// }
// Long add(Integer a, Long b) {
// Long c = a+b;
// return c;
// }
// mulInt(Integer a, Integer b) {
// Integer c = a*b;
// return c;
// }
//
// mulLong(Long a, Long b) {
// Long c = a*b;
// return c;
// }
//
// mulFloat(Float a, Float b) {
// Float c = a*b;
// return c;
// }
//
// mulDouble(Double a, Double b) {
// Double c = a*b;
// return c;
// }
// add(Double a, Long b) {
// Double c = a+b;
// return c;
// }
// add(Integer a, Short b) {
// Integer c = a+b;
// return c;
// }
//
// add(Integer a, Byte b) {
// Integer c = a+b;
// return c;
// }
// add(Float a, Double b) {
// Double c = a+b;
// return c;
//}
//
// add(Integer a, Double b) {
// Double c = a+b;
// return c;
// }
// add(Short a, Double b) {
// Double c = a+b;
// return c;
// }
// add(Byte a, Double b) {
// Double c = a+b;
// return c;
// }
}

8
test/bytecode/javFiles/Plus.jav Normal file
View File

@ -0,0 +1,8 @@
import java.lang.Integer;
public class Plus {
m(a,b) {
return a+b;
}
}