X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FMain.java;h=0a4ff9107c684b50b764fec27c3e5104529ba669;hp=2f68bf01ae9c17a6bef3ff0be3af44f68dcd2a14;hb=a19b897271a8ab6b25aba63e4b30223c2477c28d;hpb=f9ad8c782590209a53070b7a8ea3de11efef04ea

diff --git a/src/org/ibex/core/Main.java b/src/org/ibex/core/Main.java
index 2f68bf0..0a4ff91 100644
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.java
@@ -35,7 +35,7 @@ public class Main {
         System.err.println("    -l user@host    email log to user@host");
         System.err.println("    -l host:port    emit log to TCP socket");
         System.err.println("    -l <file>       write log to a file on disk");
-        System.err.println("    -a              check assertions");
+        //System.err.println("    -a              check assertions");
         System.err.println("    -w <window-id>  reserved for libibex");
         System.err.println("    -p              dump profiling information [not yet supported]");
         Runtime.getRuntime().exit(-1);
@@ -45,7 +45,8 @@ public class Main {
         int startargs = 0;
         while (true) {
             if (startargs > args.length - 1) printUsage();
-            else if (args[startargs].equals("-a")) JS.checkAssertions = true;
+            // FEATURE: This should be enabled at the parser level - there shouldn't even be an assert bytecode
+            /*else if (args[startargs].equals("-a")) JS.checkAssertions = true;*/
             else if (args[startargs].equals("-l")) {
                 startargs++;
                 StringTokenizer opts = new StringTokenizer(args[startargs], ",");
@@ -68,7 +69,7 @@ public class Main {
             startargs++;
         }
 
-        Platform.forceLoad();
+        org.ibex.plat.Platform.forceLoad();
         if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
 
         initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
@@ -93,7 +94,7 @@ public class Main {
         final Ibex ibex = new Ibex(rr);
 
         org.ibex.graphics.Surface.scarImage =
-            Picture.load((Stream)Main.builtin.get("org/ibex/core/builtin/scar.png"),
+            Picture.load(Main.builtin.get(JS.S("org/ibex/core/builtin/scar.png")),
                          new Task() { public void perform() throws JSExn, UnknownHostException {
                              if (Log.on) Log.info(Main.class, "invoking initial template");
                              ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);