X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Ftests%2FCallTest.java;h=1d57bceab3241f82c922c779b56115320bab7670;hp=77fd2174e0894b531d92e45d146fc171f15afeb8;hb=b11e7c6c29f2b5f7b0828bf93eb741c4a30ec411;hpb=777acd138d857049f58620b5c2003733798e69f0 diff --git a/src/tests/CallTest.java b/src/tests/CallTest.java index 77fd217..1d57bce 100644 --- a/src/tests/CallTest.java +++ b/src/tests/CallTest.java @@ -1,3 +1,7 @@ +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the Apache License 2.0 ("the License"). +// You may not use this file except in compliance with the License. + package tests; import org.ibex.nestedvm.Runtime; @@ -26,7 +30,7 @@ public class CallTest { case 1: return rt.strdup("OS: " + System.getProperty("os.name")); case 2: return rt.strdup(System.getProperty("os.version")); case 3: return rt.strdup(new Date().toString()); - case 4: return rt.addFD(new Runtime.OutputStreamFD(new CustomOS())); + case 4: return rt.addFD(new Runtime.InputOutputStreamFD(null,new CustomOS())); case 5: System.out.println("In callJava() in Java"); try { rt.call("backinmips"); } catch(Runtime.CallException e) { } @@ -43,12 +47,13 @@ public class CallTest { System.out.println("== Start of CallTest =="); System.out.println("Back in java... calling callme()"); - int ret = rt.call("callme",a1,a2,a3,a4,a5,a6); + int ret = rt.call("callme",new int[]{a1,a2,a3,a4,a5,a6}); System.out.println("callme returned: " + ret); int addr = rt.strdup("Hello, World from java"); rt.call("echo",addr,4); rt.free(addr); + rt.call("echo",new Object[]{"Hello, World, from the Object[] call method",new Integer(2)}); System.out.println("== End of CallTest =="); rt.execute();