fixed .class references, todo: fill out class data in ReflectionGener…

…ator :D
badlogic · Sep 6, 2012 · c6b903a · c6b903a
1 parent 7b6d6e5
commit c6b903a
Show file tree

Hide file tree

Showing 30 changed files with 308 additions and 132 deletions.
diff --git a/classpath/src/jack/Arithmetic.java → classpath/src/jack/tests/Arithmetic.java b/classpath/src/jack/Arithmetic.java → classpath/src/jack/tests/Arithmetic.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Arithmetic {
 	public int arithmetic() {

diff --git a/classpath/src/jack/ArrayTest.java → classpath/src/jack/tests/ArrayTest.java b/classpath/src/jack/ArrayTest.java → classpath/src/jack/tests/ArrayTest.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class ArrayTest {
 	public static final Object[] staticArray = new Object[1000000];

diff --git a/classpath/src/jack/Arrays.java → classpath/src/jack/tests/Arrays.java b/classpath/src/jack/Arrays.java → classpath/src/jack/tests/Arrays.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Arrays {
 	int[] ia = new int[10];

diff --git a/classpath/src/jack/Exceptions.java → classpath/src/jack/tests/Exceptions.java b/classpath/src/jack/Exceptions.java → classpath/src/jack/tests/Exceptions.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Exceptions {
 	public void runtime() {

diff --git a/classpath/src/jack/InstanceOf.java → classpath/src/jack/tests/InstanceOf.java b/classpath/src/jack/InstanceOf.java → classpath/src/jack/tests/InstanceOf.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class InstanceOf {
 	class A {

diff --git a/classpath/src/jack/Main.java → classpath/src/jack/tests/Main.java b/classpath/src/jack/Main.java → classpath/src/jack/tests/Main.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Main {
 	Statics statics;

diff --git a/classpath/src/jack/Primes.java → classpath/src/jack/tests/Primes.java b/classpath/src/jack/Primes.java → classpath/src/jack/tests/Primes.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Primes {
 

diff --git a/classpath/src/jack/tests/Reflection.java b/classpath/src/jack/tests/Reflection.java
@@ -0,0 +1,16 @@
+package jack.tests;
+
+public class Reflection {
+	public void test() throws ClassNotFoundException {
+		Class c = byte[].class;
+		c = byte[][][].class;
+		c = Object[][][].class;
+		c = int.class;
+		c = Object.class;
+		c = Class.forName("[C");
+	}
+
+	public static void main(String[] args) throws ClassNotFoundException {
+		new Reflection().test();
+	}
+}
diff --git a/classpath/src/jack/Statics.java → classpath/src/jack/tests/Statics.java b/classpath/src/jack/Statics.java → classpath/src/jack/tests/Statics.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Statics {
 	static final boolean z = true;

diff --git a/classpath/src/jack/Strings.java → classpath/src/jack/tests/Strings.java b/classpath/src/jack/Strings.java → classpath/src/jack/tests/Strings.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 public class Strings {
 	static String staticString = "static string";

diff --git a/classpath/src/jack/Synchronized.java → classpath/src/jack/tests/Synchronized.java b/classpath/src/jack/Synchronized.java → classpath/src/jack/tests/Synchronized.java
@@ -1,4 +1,4 @@
-package jack;
+package jack.tests;
 
 
 public class Synchronized {

diff --git a/classpath/src/java/lang/Boolean.java b/classpath/src/java/lang/Boolean.java
@@ -11,7 +11,8 @@
 package java.lang;
 
 public final class Boolean implements Comparable<Boolean> {
-	public static final Class TYPE = Class.forCanonicalName("Z");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 
 	public static final Boolean FALSE = new Boolean(false);
 	public static final Boolean TRUE = new Boolean(true);

diff --git a/classpath/src/java/lang/Byte.java b/classpath/src/java/lang/Byte.java
@@ -11,7 +11,8 @@
 package java.lang;
 
 public final class Byte extends Number implements Comparable<Byte> {
-	public static final Class TYPE = Class.forCanonicalName("B");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 
 	private final byte value;
 

diff --git a/classpath/src/java/lang/Character.java b/classpath/src/java/lang/Character.java
@@ -14,7 +14,8 @@ public final class Character implements Comparable<Character> {
 	public static final int MIN_RADIX = 2;
 	public static final int MAX_RADIX = 36;
 
-	public static final Class TYPE = Class.forCanonicalName("C");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 
 	private final char value;
 

diff --git a/classpath/src/java/lang/Class.java b/classpath/src/java/lang/Class.java
@@ -3,9 +3,17 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
 
 // FIXME reflection
 public final class Class<T> {
+	private static Map<String, Class> classes = new HashMap<String, Class>();
+
+	public static Class forName(String name) throws ClassNotFoundException {
+		throw new UnsupportedOperationException();
+	}
+
 	String name;
 	Class superClass;
 	Class[] interfaces;
@@ -34,14 +42,6 @@ public T newInstance() throws IllegalAccessException, InstantiationException {
 		throw new UnsupportedOperationException();
 	}
 
-	public static Class forName(String name) throws ClassNotFoundException {
-		throw new UnsupportedOperationException();
-	}
-
-	public static Class forCanonicalName(String name) {
-		throw new UnsupportedOperationException();
-	}
-
 	public Class getComponentType() {
 		return componentType;
 	}

diff --git a/classpath/src/java/lang/Double.java b/classpath/src/java/lang/Double.java
@@ -11,7 +11,8 @@
 package java.lang;
 
 public final class Double extends Number {
-	public static final Class TYPE = Class.forCanonicalName("D");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 
 	public static final double NEGATIVE_INFINITY = -1.0 / 0.0;
 	public static final double POSITIVE_INFINITY = 1.0 / 0.0;

diff --git a/classpath/src/java/lang/Float.java b/classpath/src/java/lang/Float.java
@@ -11,7 +11,8 @@
 package java.lang;
 
 public final class Float extends Number {
-	public static final Class TYPE = Class.forCanonicalName("F");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 	private static final int EXP_BIT_MASK = 0x7F800000;
 	private static final int SIGNIF_BIT_MASK = 0x007FFFFF;
 

diff --git a/classpath/src/java/lang/Integer.java b/classpath/src/java/lang/Integer.java
@@ -11,8 +11,8 @@
 package java.lang;
 
 public final class Integer extends Number implements Comparable<Integer> {
-	public static final Class TYPE = Class.forCanonicalName("I");
-
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 	public static final int MIN_VALUE = 0x80000000;
 	public static final int MAX_VALUE = 0x7FFFFFFF;
 

diff --git a/classpath/src/java/lang/Long.java b/classpath/src/java/lang/Long.java
@@ -14,7 +14,8 @@ public final class Long extends Number implements Comparable<Long> {
 	public static final long MIN_VALUE = -9223372036854775808l;
 	public static final long MAX_VALUE = 9223372036854775807l;
 
-	public static final Class TYPE = Class.forCanonicalName("J");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 
 	private final long value;
 

diff --git a/classpath/src/java/lang/Short.java b/classpath/src/java/lang/Short.java
@@ -11,7 +11,8 @@
 package java.lang;
 
 public final class Short extends Number implements Comparable<Short> {
-	public static final Class TYPE = Class.forCanonicalName("S");
+	// this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+	public static final Class TYPE = null;
 	public static final short MAX_VALUE = 32767;
 
 	private final short value;

diff --git a/classpath/src/java/lang/Void.java b/classpath/src/java/lang/Void.java
@@ -11,7 +11,8 @@
 package java.lang;
 
 public final class Void {
-  public static final Class TYPE = Class.forCanonicalName("V");
+  // this field is filled by ReflectionGenerator#initializePrimitiveTypes()
+  public static final Class TYPE = null;
 
   private Void() { }
 }
diff --git a/native/jack.cpp b/native/jack.cpp
@@ -10,7 +10,7 @@
 #include "vm/garbagecollection.h"
 
 void testPrimes() {
-	jack_Primes* primes = new jack_Primes();
+	jack_tests_Primes* primes = new jack_tests_Primes();
 	primes->m_init();
 	j_long sum = 0;
 	j_long start = getCurrentTimeMillis();
@@ -23,7 +23,7 @@ void testPrimes() {
 
 void testAllocation() {
 	for(int i = 0; i < 10000000; i++) {		
-		jack_ArrayTest* at = new jack_ArrayTest();
+		jack_tests_ArrayTest* at = new jack_tests_ArrayTest();
 		at->m_init();
 
 		if(i % 10000 == 0) {
@@ -32,6 +32,12 @@ void testAllocation() {
 	}
 }
 
+void testInstanceOf() {
+	jack_tests_InstanceOf* obj = new jack_tests_InstanceOf();
+	obj->m_init();
+	obj->m_test();
+}
+
 int main() {
 	jack_gc_init();
 	jack_init();	

diff --git a/src/com/badlogic/jack/Jack.java b/src/com/badlogic/jack/Jack.java
@@ -171,7 +171,7 @@ public static void main(String[] args) {
 		String sources = args[1].endsWith("/")? args[1]: args[1] + "/";
 		String outputDir = args[2].endsWith("/")? args[2]: args[2] + "/";
 
-		Jack compiler = new Jack(classpath, sources, outputDir, true);
+		Jack compiler = new Jack(classpath, sources, outputDir, false);
 		compiler.compile();
 	}
 }
diff --git a/src/com/badlogic/jack/generators/ReflectionGenerator.java b/src/com/badlogic/jack/generators/ReflectionGenerator.java
@@ -16,40 +16,76 @@
 public class ReflectionGenerator {
 	private final SourceWriter writer;
 	private final Map<SootClass, ClassInfo> infos;
+	private int nextLiteralId = 0;
 
 	public ReflectionGenerator(SourceWriter writer, Map<SootClass, ClassInfo> infos) {
 		this.writer = writer;
 		this.infos = infos;
 	}
 
 	public void generate() {
+		initializeClasses();
+		generatePrimitiveClasses();
+
+		// fill out their reflection data for each class
+		for(SootClass c: infos.keySet()) {
+			generateClassReflectionData(c);
+		}
+		writer.wl("");
+
+		addClassesToClassMap();
+	}
+
+	/**
+	 * Adds the references of each class' Class instance
+	 * to the Class#classes map.
+	 */
+	private void addClassesToClassMap() {
+
+	}
+
+	private String generateLiteral(String value) {
+		return null;
+	}
+
+	/**
+	 * Creates the xxx::clazz instances. Those have to be created first
+	 * as they are referenced later when generating their actual content.
+	 */
+	private void initializeClasses() {
 		// initialize the java_lang_Class* for each class/interface
 		for(SootClass c: infos.keySet()) {
 			String var = Mangling.mangle(c) + "::clazz";
 			writer.wl(var + "= new java_lang_Class();");
 		}
 		writer.wl("");
+	}
+
+	/**
+	 * Initializes the primitive type classes. 
+	 * @return
+	 */
+	private void generatePrimitiveClasses() {
+		writer.wl("error, need to create primitive classes");
+	}
+
+	private void generateClassReflectionData(SootClass c) {
+		String var = Mangling.mangle(c) + "::clazz";
+		writer.wl(var + "->m_init();");
+		// FIXME reflection
+//		writer.wl(var + "->f_isPrimitive = " + )
+//		writer.wl(var + "->f_isArray = " + );
+		if(c.hasSuperclass()) {
+			writer.wl(var + "->f_superClass = " + Mangling.mangle(c.getSuperclass()) + "::clazz;");
+		}
 
-		// fill out their reflection data
-		for(SootClass c: infos.keySet()) {
-			String var = Mangling.mangle(c) + "::clazz";
-			writer.wl(var + "->m_init();");
-			// FIXME reflection
-//			writer.wl(var + "->f_isPrimitive = " + )
-//			writer.wl(var + "->f_isArray = " + );
-			if(c.hasSuperclass()) {
-				writer.wl(var + "->f_superClass = " + Mangling.mangle(c.getSuperclass()) + "::clazz;");
-			}
-
-			// create array for interfaces
-			writer.wl(var + "->f_interfaces = new Array<java_lang_Class*>(" + c.getInterfaceCount() + ", false);");
-			int i = 0;
-			for(SootClass itf: c.getInterfaces()) {
-				writer.wl("(*" + var + "->f_interfaces)[" + i + "] = " + Mangling.mangle(itf) + "::clazz;");
-				i++;
-			}
-			writer.wl("");
+		// create array for interfaces
+		writer.wl(var + "->f_interfaces = new Array<java_lang_Class*>(" + c.getInterfaceCount() + ", false);");
+		int i = 0;
+		for(SootClass itf: c.getInterfaces()) {
+			writer.wl("(*" + var + "->f_interfaces)[" + i + "] = " + Mangling.mangle(itf) + "::clazz;");
+			i++;
 		}
-		writer.wl("");	
+		writer.wl("");
 	}
 }
diff --git a/src/com/badlogic/jack/generators/RuntimeGenerator.java b/src/com/badlogic/jack/generators/RuntimeGenerator.java
@@ -53,7 +53,7 @@ public void generate() {
 		writer.push();
 
 		// generate all the reflection info
-		new ReflectionGenerator(writer, infos);
+		new ReflectionGenerator(writer, infos).generate();
 
 		// call all m_clinit methods, this should cascade
 		// FIXME clinit (propagation correct?)