code to generate calls into JNI native code...

diff --git a/Robust/src/IR/ClassDescriptor.java b/Robust/src/IR/ClassDescriptor.java
index 136d64c357e98cfafe555d8993e7e3c09bb52078..6a8c210897aabdd1f083ebbbb9bf3a8809dba13e 100644 (file)
--- a/Robust/src/IR/ClassDescriptor.java
+++ b/Robust/src/IR/ClassDescriptor.java
@@ -99,6 +99,10 @@ public class ClassDescriptor extends Descriptor {
     return fieldvec;
   }
 
+  public String getPackage() {
+    return packagename;
+  }
+
   public SymbolTable getFlagTable() {
     return flags;
   }

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index a981d9de67fe5a810ddf04c87f6a1e5feb9daeb7..7a2950b9fa38898178c7c5d3cc8fd26ed9112d0b 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -78,7 +78,6 @@ public class BuildCode {
    * versions of the methods must already be generated and stored in
    * the State object. */
 
-
   public void buildCode() {
     /* Create output streams to write to */
     PrintWriter outclassdefs=null;
@@ -522,6 +521,8 @@ public class BuildCode {
        FlatMethod fm=state.getMethodFlat(md);
        if (!md.getModifiers().isNative()) {
          generateFlatMethod(fm, outmethod);
+       } else if (state.JNI) {
+         generateNativeFlatMethod(fm, outmethod);
        }
       }
     }
@@ -1824,6 +1825,64 @@ public class BuildCode {
       headersout.println(");\n");
     }
   }
+  
+  protected void generateNativeFlatMethod(FlatMethod fm, PrintWriter outmethod) {
+    MethodDescriptor md=fm.getMethod();
+    ClassDescriptor cd=md.getClassDesc();
+    generateHeader(fm, md, outmethod);
+    int startindex=0;
+    
+    if (md.getModifiers().isStatic()) {
+      outmethod.println("jobject rec=JNIWRAP(((void **)(((char *) &(global_defs_p->classobjs->___length___))+sizeof(int)))[" + cd.getId() + "]);");
+    } else {
+      outmethod.println("jobject rec=JNIWRAP("+generateTemp(fm, fm.getParameter(0))+");");
+      startindex=1;
+    }
+    for(int i=startindex;i<fm.numParameters();i++) {
+      TempDescriptor tmp=fm.getParameter(i);
+      if (tmp.getType().isPtr()) {
+       outmethod.println("jobject param"+i+"=JNIWRAP("+generateTemp(fm, fm.getParameter(i))+");");
+      }
+    }
+    if (GENERATEPRECISEGC) {
+      outmethod.println("stopforgc((struct garbagelist *)___params___)");
+    }
+    if (md.getReturnType()!=null) {
+      if (md.getReturnType().isPtr()) 
+       outmethod.print("jobject retval=");
+      else
+       outmethod.print(md.getReturnType().getSafeSymbol()+" retval=");
+    }
+    outmethod.print("Java_");
+    outmethod.print(cd.getPackage().replace('.','_'));
+    outmethod.print("_"+md.getSymbol()+"(");
+    outmethod.print("JNI_vtable, rec");
+
+    for(int i=startindex;i<fm.numParameters();i++) {
+      outmethod.print(", ");
+      TempDescriptor tmp=fm.getParameter(i);
+      if (tmp.getType().isPtr()) {
+       outmethod.print("param"+i);
+      } else {
+       outmethod.print(generateTemp(fm, tmp));
+      }
+    }
+    outmethod.println(");");
+    if (GENERATEPRECISEGC) {
+      outmethod.println("restartaftergc()");
+    }
+    if (md.getReturnType()!=null) {
+      if (md.getReturnType().isPtr()) {
+       outmethod.println("struct ___Object___ * retobj=JNIUNWRAP(retval);");
+       outmethod.println("JNIclearstack();");
+       outmethod.println("return retobj;");
+      } else {
+       outmethod.println("JNIclearstack();");
+       outmethod.println("return retval;");
+      }
+    }
+    outmethod.println("}");
+  }
 
   protected void generateFlatMethod(FlatMethod fm, PrintWriter output) {
     if (State.PRINTFLAT)
@@ -1868,8 +1927,7 @@ public class BuildCode {
       /* Check to see if we need to do a GC if this is a
        * multi-threaded program...*/
 
-      if (((state.OOOJAVA||state.THREAD)&&GENERATEPRECISEGC)
-          || this.state.MULTICOREGC) {
+      if (((state.OOOJAVA||state.THREAD)&&GENERATEPRECISEGC) || state.MULTICOREGC) {
         //Don't bother if we aren't in recursive methods...The loops case will catch it
         if (callgraph.getAllMethods(md).contains(md)) {
           if (this.state.MULTICOREGC) {
@@ -2343,9 +2401,7 @@ public class BuildCode {
       }
       // is a static block or is invoked in some static block
       ClassDescriptor cd = fm.getMethod().getClassDesc();
-      if(cd == cn) {
-       // the same class, do nothing
-      } else if(mgcstaticinit) {
+      if(cd != cn && mgcstaticinit) {
         // generate static init check code if it has not done static init in main()
        if((cn.getNumStaticFields() != 0) || (cn.getNumStaticBlocks() != 0)) {
          // need to check if the class' static fields have been initialized and/or
@@ -2394,7 +2450,7 @@ public class BuildCode {
     if(md.getSymbol().equals("MonitorEnter")) {
       output.println("int monitorenterline = __LINE__;");
     }
-    if ((GENERATEPRECISEGC) || (this.state.MULTICOREGC)) {
+    if (GENERATEPRECISEGC || state.MULTICOREGC) {
       output.print("       struct "+cn.getSafeSymbol()+md.getSafeSymbol()+"_"+mdstring+"_params __parameterlist__={");
       output.print(objectparams.numPointers());
       output.print(", "+localsprefixaddr);
@@ -2406,8 +2462,7 @@ public class BuildCode {
        System.out.println("WARNING!!!!!!!!!!!!");
        System.out.println("Source code calls static method "+md+" on an object in "+fm.getMethod()+"!");
       }
-
-
+      
       for(int i=0; i<fc.numArgs(); i++) {
        Descriptor var=md.getParameter(i);
        TempDescriptor paramtemp=(TempDescriptor)temptovar.get(var);
@@ -2430,12 +2485,6 @@ public class BuildCode {
       output.print(generateTemp(fm,fc.getReturnTemp())+"=");
 
     /* Do we need to do virtual dispatch? */
-    if (!md.isStatic()&&md.getReturnType()!=null&&fc.getThis().getType().getClassDesc()==null) {
-      System.out.println(fm);
-      System.out.println(md);
-      System.out.println(fc);
-      System.out.println(fm.printMethod());
-    }
 
     if (md.isStatic()||md.getReturnType()==null||singleCall(fc.getThis().getType().getClassDesc(),md)||fc.getSuper()) {
       //no
@@ -2522,7 +2571,7 @@ public class BuildCode {
     if(md.getSymbol().equals("MonitorEnter") && state.OBJECTLOCKDEBUG) {
       output.println(", monitorenterline);");
     } else {
-    output.println(");");
+      output.println(");");
     }
     output.println("   }");
   }

diff --git a/Robust/src/Tests/dotest b/Robust/src/Tests/dotest
index 09a2c52a5fbd95548cc05f2e0da93f61951e722b..e9e26374e9182b842c10922b92298b78510837ef 100755 (executable)
--- a/Robust/src/Tests/dotest
+++ b/Robust/src/Tests/dotest
@@ -7,7 +7,7 @@ shift
 dir=`pwd`
 
 echo Doing Test $ARG1
-../buildscript -64bit -debug -joptimize -robustroot ${dir}/../ -mainclass $ARG1 $ARG2 -o $ARG1
+../buildscript -64bit -debug -joptimize -robustroot ${dir}/../ -mac -mainclass $ARG1 $ARG2 -o $ARG1
 $ARG1.bin $@ &> output/$ARG1.output
 diff output/$ARG1.output output/$ARG1.output.goal
 rm $ARG1.bin

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index e328f0c8b1151fba926894e591df7f1c67530529..b50930c4d87100a0a704f15d69b4b81c9b36e818 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -258,14 +258,13 @@ elif [[ $1 = '-jni' ]]
 then
 JNI=true
 JAVAOPTS="$JAVAOPTS -jni"
+EXTRAOPTIONS="$EXTRAOPTIONS -DJNI"
 elif [[ $1 = '-justanalyze' ]]
 then
 EXITAFTERANALYSIS=true
-
 elif [[ $1 = '-src-after-pp' ]]
 then
 SRCAFTERPP=true
-
 elif [[ $1 = '-assembly' ]]
 then
 ASSEMBLY=true