X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=3e248f55298eb27d53920a099acf62845eb96a5e;hp=2c8b68aac816588afc7eaa0488ae8a95e1fd5a76;hb=e37e0d13890e41aeb233bf85db1a8e1a376b22e9;hpb=72330a2e158829db60c433778f52be2c8d646eb2

diff --git a/Makefile b/Makefile
index 2c8b68a..3e248f5 100644
--- a/Makefile
+++ b/Makefile
@@ -105,13 +105,10 @@ java_src_sources          := $(shell find src -name '*.java' | grep -v NanoGoat
 java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
 
-java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
-java_sources              += build/java/org/xwt/mips/util/SeekableData.java
-java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
-java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
-java_sources              += build/java/org/xwt/mips/Registers.java
-java_sources              += build/java/org/xwt/mips/Runtime.java
-java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
+java_sources              += build/java/org/ibex/nestedvm/util/Seekable.java
+java_sources              += build/java/org/ibex/nestedvm/Registers.java
+java_sources              += build/java/org/ibex/nestedvm/Runtime.java
+java_sources              += build/java/org/ibex/nestedvm/UsermodeConstants.java
 
 java_sources              += build/java/org/ibex/crypto/DER.java
 java_sources              += build/java/org/ibex/crypto/Digest.java
@@ -167,7 +164,7 @@ link_upstream  = build/java/$(1):: $(2)/$(1) $(3); \
                  mkdir -p $$(@D); ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
-$(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
+$(call link_upstream,org/ibex/nestedvm/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
 $(call link_upstream,org/ibex/crypto/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
 $(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
 $(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
@@ -248,7 +245,7 @@ ifneq ($(platform),Darwin)
 	($(nm) $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\
 		grep _ZN | c++filt --format java | grep " U " | sed 's_ * U __' | sed 's_(.*__' \
 		| java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar | tee nanogoat.log
-	mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/xwt/mips/* org/xwt/mips/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp
+	mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/ibex/nestedvm/* org/ibex/nestedvm/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp
 	mv build/$(platform)/ibex.jar.pruned $@
 endif
 ifeq ($(platform),Darwin)
@@ -387,8 +384,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/o
 	upstream/install/bin/mips-unknown-elf-gcc \
 		--static \
 		-march=mips1 \
-		-T upstream/org.ibex.nestedvm/src/org/xwt/mips/linker.ld \
-		-L upstream/org.ibex.nestedvm/build/org/xwt/mips/ \
+		-T upstream/org.ibex.nestedvm/src/org/ibex/nestedvm/linker.ld \
+		-L upstream/org.ibex.nestedvm/build/org/ibex/nestedvm/ \
 		-L upstream/freetype-2.1.4/src/objs \
 		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \