tons of stuff

[nestedvm.git] / src / tests / FreeTypeDemo.java

diff --git a/src/tests/FreeTypeDemo.java b/src/tests/FreeTypeDemo.java
index 0ac84cd..6749728 100644 (file)
--- a/src/tests/FreeTypeDemo.java
+++ b/src/tests/FreeTypeDemo.java
@@ -1,7 +1,7 @@
 package tests;
 
-import org.xwt.mips.Runtime;
-import org.xwt.mips.Interpreter;
+import org.ibex.nestedvm.Runtime;
+import org.ibex.nestedvm.Interpreter;
 
 import javax.swing.*;
 import java.awt.*;
@@ -40,7 +40,7 @@ public class FreeTypeDemo {
             name = "Interpreter";
             rt = new Interpreter("build/FreeTypeDemoHelper.mips");
         } else {
-            rt = new FreeTypeDemoHelper();
+            rt = (Runtime) Class.forName("tests.FreeTypeDemoHelper").newInstance();
             name = "Compiler";
         }
         
@@ -106,7 +106,8 @@ public class FreeTypeDemo {
             }
             rt.copyout(b,stringAddr,b.length);
             long start = System.currentTimeMillis();
-            if(rt.call("render",stringAddr,size,renderAddr,OURWIDTH,OURHEIGHT,BASELINE)==0) throw new Error("render() failed");
+            if(rt.call("render",new int[]{stringAddr,size,renderAddr,OURWIDTH,OURHEIGHT,BASELINE})==0)
+                throw new Error("render() failed");
             System.out.println(name + ": Render of: " + s + " took " + (System.currentTimeMillis()-start) + " ms");
             rt.copyin(renderAddr,render,render.length);
             createImage();