Fix Class#isInstance, include NPE checks, non-integer literal fix

TheLogicMaster · May 24, 2022 · 4b9d879 · 4b9d879
1 parent 1f24e7d
commit 4b9d879
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ LibGDX backend but doesn't depend on it. An example project is provided in the `
 - Fix try-catch/synchronized block nesting (See SwitchGDX ThreadTest)
 - Dynamic cast checks
 - Reformat runtime and transpiler sources
+- Reflection type conversions (See SwitchGDX ReflectionTest)
 
 ## Notes
 - Requires retrolambda for lambda, default method, and method reference support (RetroLambda Gradle plugin doesn't support Gradle 7)
@@ -47,3 +48,4 @@ LibGDX backend but doesn't depend on it. An example project is provided in the `
 - JAVA_ARRAY_BYTE must be explicitly `unsigned char`, since it's compiler specific behavior otherwise
 - Array components in multidimensional arrays should refer to array classes of decreasing size
 - Added dedicated primitive types
+- Literals for non-integer types must be explicitly specified
diff --git a/runtime/res/nativeMethods.c b/runtime/res/nativeMethods.c
@@ -962,7 +962,7 @@ JAVA_BOOLEAN java_lang_Class_isAssignableFrom___java_lang_Class_R_boolean(CODENA
 JAVA_BOOLEAN java_lang_Class_isInstance___java_lang_Object_R_boolean(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT cls, JAVA_OBJECT obj) {
     struct clazz* clz1 = (struct clazz*)cls;
     struct clazz* clz2 = (struct clazz*)obj->__codenameOneParentClsReference;
-    return instanceofFunction(clz2->classId, clz1->classId);
+    return instanceofFunction(clz1->classId, clz2->classId);
 }
 
 JAVA_BOOLEAN java_lang_Class_isInterface___R_boolean(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT cls) {
@@ -1388,7 +1388,8 @@ JAVA_OBJECT java_lang_Object_getClassImpl___R_java_lang_Class(CODENAME_ONE_THREA
     if(!obj->__codenameOneParentClsReference) {
         return (JAVA_OBJECT)(&ClazzClazz);
     }
-    obj->__codenameOneParentClsReference->__codenameOneParentClsReference = &ClazzClazz;
+    if (obj->__codenameOneParentClsReference != &ClazzClazz && !obj->__codenameOneParentClsReference->__codenameOneParentClsReference)
+        obj->__codenameOneParentClsReference->__codenameOneParentClsReference = &ClazzClazz; // Todo: Is this even needed?
     return (JAVA_OBJECT)obj->__codenameOneParentClsReference;
 }
 

diff --git a/transpiler/src/com/thelogicmaster/clearwing/translator/ByteCodeTranslator.java b/transpiler/src/com/thelogicmaster/clearwing/translator/ByteCodeTranslator.java
@@ -158,6 +158,7 @@ private void copyDir(File source, File destDir) throws IOException {
      */
     public static void main(String[] args) throws Exception {
 //        System.setProperty("optimizer", "off");
+        System.setProperty("INCLUDE_NPE_CHECKS", "true");
 
         if(args.length != 3 && args.length != 4) {
             System.out.println("Usage: <input directory> <output directory> <config> <main class>");

diff --git a/transpiler/src/com/thelogicmaster/clearwing/translator/bytecodes/BasicInstruction.java b/transpiler/src/com/thelogicmaster/clearwing/translator/bytecodes/BasicInstruction.java
@@ -711,37 +711,37 @@ public boolean assignTo(String varName, StringBuilder sb) {
                 break;
 
             case Opcodes.LCONST_0:
-                b.append("0 /* LCONST_0 */");
+                b.append("((JAVA_LONG)0) /* LCONST_0 */");
                 //b2.append("CN1_TYPE_LONG");
                 break;
 
             case Opcodes.LCONST_1:
-                b.append("1 /* LCONST_1 */");
+                b.append("((JAVA_LONG)1) /* LCONST_1 */");
                 //b2.append("CN1_TYPE_LONG");
                 break;
 
             case Opcodes.FCONST_0:
-                b.append("0 /* FCONST_0 */");
+                b.append("((JAVA_FLOAT)0) /* FCONST_0 */");
                 //b2.append("CN1_TYPE_FLOAT");
                 break;
 
             case Opcodes.FCONST_1:
-                b.append("1 /* FCONST_1 */");
+                b.append("((JAVA_FLOAT)1) /* FCONST_1 */");
                 //b2.append("CN1_TYPE_FLOAT");
                 break;
 
             case Opcodes.FCONST_2:
-                b.append("2 /* FCONST_2 */");
+                b.append("((JAVA_FLOAT)2) /* FCONST_2 */");
                 //b2.append("CN1_TYPE_FLOAT");
                 break;
 
             case Opcodes.DCONST_0:
-                b.append("0 /* DCONST_0 */");
+                b.append("((JAVA_DOUBLE)0) /* DCONST_0 */");
                 //b2.append("CN1_TYPE_DOUBLE");
                 break;
 
             case Opcodes.DCONST_1:
-                b.append("1 /* DCONST_1 */");
+                b.append("((JAVA_DOUBLE)1) /* DCONST_1 */");
                 //b2.append("CN1_TYPE_DOUBLE");
                 break;