X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FInterpreter.java;fp=src%2Forg%2Fxwt%2Fmips%2FInterpreter.java;h=cd82365e172eb44a5f6d4645c8ac92fea4ea1883;hp=f95df9292b067fc357f6014aec8540643201228f;hb=c2b2704764af1ade923ba8f15d517b87f9d16189;hpb=90f1aff73ed698ab5992fbd7eb53c1ba7329b1a5

diff --git a/src/org/xwt/mips/Interpreter.java b/src/org/ibex/nestedvm/Interpreter.java
similarity index 99%
rename from src/org/xwt/mips/Interpreter.java
rename to src/org/ibex/nestedvm/Interpreter.java
index f95df92..cd82365 100644
--- a/src/org/xwt/mips/Interpreter.java
+++ b/src/org/ibex/nestedvm/Interpreter.java
@@ -2,9 +2,9 @@
 // Based on org.xwt.imp.MIPS by Adam Megacz
 // Portions Copyright 2003 Adam Megacz
 
-package org.xwt.mips;
+package org.ibex.nestedvm;
 
-import org.xwt.mips.util.*;
+import org.ibex.nestedvm.util.*;
 import java.io.*;
 
 public class Interpreter extends UnixRuntime {
@@ -633,7 +633,7 @@ public class Interpreter extends UnixRuntime {
     }
     
     // Image loading function
-    private void loadImage(SeekableData data) throws IOException {
+    private void loadImage(Seekable data) throws IOException {
         if(state != UNINITIALIZED) throw new IllegalStateException("loadImage called on initialized runtime");
         
         ELF elf = new ELF(data);
@@ -710,12 +710,12 @@ public class Interpreter extends UnixRuntime {
     
     // This is package private for fork() which does all kinds of ugly things behind the scenes
     Interpreter() { super(4096,65536,true); }
-    public Interpreter(SeekableData data) throws IOException { this(); loadImage(data); }
+    public Interpreter(Seekable data) throws IOException { this(); loadImage(data); }
     public Interpreter(String filename) throws IOException {
-        this(new SeekableFile(filename,false));
+        this(new Seekable.File(filename,false));
         image = filename;
     }
-    public Interpreter(InputStream is) throws IOException { this(new SeekableInputStream(is)); }
+    public Interpreter(InputStream is) throws IOException { this(new Seekable.InputStream(is)); }
     
     // Debug functions
     // NOTE: This probably requires a jdk > 1.1, however, it is only used for debugging