java_sources := $(patsubst src/%.java, build/java/%.java, $(java_src_sources))
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
build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
$(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)
+$(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.net/src,.download_org.ibex.net)
+$(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.net/src,.download_org.ibex.net)
$(call link_upstream,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src)
-build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/util/Preprocessor.class
+build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/tool/Preprocessor.class
@echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m"
- mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@
+ mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.tool.Preprocessor < $< > $@
$(call link_upstream,%.java,src)
$(call link_upstream,%.cc,src)
### Java Class Files ##############################################################################
-build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java
+build/class/org/ibex/tool/Preprocessor.class: .download_org.ibex.tool .download_org.ibex.util
@mkdir -p build/class/gnu/regexp build/class/org/ibex/util
- $(javac) $< src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
+ $(javac) src/org/ibex/tool/Preprocessor.java src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
compile: .compile
.compile: $(java_sources)
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"