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/util/Platform.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
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)
build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm
@mkdir -p build/java/org/ibex/util
@echo -e "\n\033[1mtranslating .mips -> .class: $<\033[0m"
- java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
- org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
+ java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/classgen/build \
+ org.ibex.nestedvm.Compiler org.ibex.util.MIPSApps $< -outfile $@
build/Java2/ibex.jar: compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
@echo -e "\n\033[1marchiving .class -> .jar: build/Java2/ibex.jar\033[0m"
($(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)
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 $@ \