projects / org.ibex.core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
upgraded nestedvm
[org.ibex.core.git] / Makefile
diff --git a/Makefile b/Makefile
index 5e390cf..3ca4a8f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#############################################################################
+############################################################################# 
 #
 # The Ibex Makefile
 #
@@ -18,11 +18,11 @@ target := $(target_$(platform))
 
 all:         Java2 Linux Win32 Darwin Solaris
 
-clean:      ; rm -rf build
+clean:      ; rm -rf build; rm .preprocessor
 dist-clean:
        rm -rf .jikes .configure* .install* build .compile .build*
        find upstream -name config.cache -exec rm {} \;
-       test -e upstream/mips && make -C upstream/mips clean
+       test -e upstream/nestedvm && make -C upstream/nestedvm clean
 
 libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
 libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
@@ -84,7 +84,7 @@ include Makefile.upstream
 #              xargs --replace make -s superclass_org.ibex.plat.{}
 
 plat_classes_AWT     := org.ibex.plat.AWT
-plat_classes_Java2   := org.ibex.plat.Java2 $(plat_classes_AWT)
+plat_classes_Java2   := org.ibex.plat.Java2 org.ibex.plat.JVM $(plat_classes_AWT)
 plat_classes_GCJ     := org.ibex.plat.GCJ
 plat_classes_Win32   := org.ibex.plat.Win32 $(plat_classes_GCJ)
 plat_classes_POSIX   := org.ibex.plat.POSIX $(plat_classes_GCJ)
@@ -97,37 +97,26 @@ plat_java_src_sources     := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_c
 java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/)
 java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
+
+# FIXME ugly
 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/Compiler.java
+java_sources              += build/java/org/xwt/mips/ClassFileCompiler.java
 java_sources              += build/java/org/xwt/mips/ELF.java
-java_sources              += build/java/org/xwt/mips/Interpreter.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/UnixRuntime.java
-java_sources              += build/java/org/xwt/mips/Errno.java
-java_sources              += build/java/org/xwt/mips/Syscalls.java
-java_sources              += build/java/org/xwt/mips/Unistd.java
+java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
 
 java_classes              := $(java_sources:build/java/%.java=build/class/%.class)
 java_classes              += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class
 
-build/java/org/xwt/mips/util/%:
-       @test -e .install_mips2java || make .install_mips2java
-       @echo linking $@
-       @mkdir -p $(@D)
-       @cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
-
-build/java/org/xwt/mips/%:
-       @test -e .install_mips2java || make .install_mips2java
-       @echo linking $@
-       @mkdir -p $(@D)
-       @test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \
-               ln -sf ../../../../../upstream/mips/build/org/xwt/mips/$*); true
-       @test -e upstream/mips/org/xwt/mips/$* && (cd $(@D); \
-               ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
+build/java/org/xwt/mips/%: .install_nestedvm
+       mkdir -p build/java/org/xwt/mips
+       cd build/java/org/xwt/mips; ln -sf ../../../../../upstream/nestedvm/src/org/xwt/mips/* .
+       cd build/java/org/xwt/mips; ln -sf ../../../../../upstream/nestedvm/build/org/xwt/mips/*.java .
 
 
 ### Java Source Files ##############################################################################
@@ -154,17 +143,14 @@ build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $
 
 ### Java Class Files ##############################################################################
 
-build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
+build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .install_nestedvm .jikes
        mkdir -p build/java/org/ibex/translators
-       @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
-       (echo -e 'package org.ibex.translators;\n';                           \
-        java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
-        | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/ibex/translators/MIPSApps.java
-       @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-       ./.jikes -g:none build/java/org/ibex/translators/MIPSApps.java
+       @echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
+       java -Xint -cp upstream/nestedvm/build:upstream/nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
+               org.xwt.mips.ClassFileCompiler org.ibex.translators.MIPSApps $< -outfile $@
 
 compile: .compile
-.compile: .install_mips2java .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
+.compile: .download_nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
 
 ifeq ($(platform),Java2)
 build/class/%.class: build/java/%.java .preprocessor .jikes
@@ -183,9 +169,7 @@ build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/transl
        mkdir -p build/Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/Java2/.manifest
        cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
-       cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest \
-               `find . \! -type d` \
-               $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
+       cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest `find . -name \*.class -or -name \*.jar`
 
 
 ### Headers ##################################################################################
@@ -320,7 +304,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
                echo "};") > .builtin.c
        $(gcc) -c .builtin.c -o build/$(platform)/builtin.o
 
-build/mips/%.c.o: src/%.c .download_libmspack-20030726
+build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_nestedvm
        make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
        make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
        mkdir -p $(@D)
@@ -368,7 +352,7 @@ dist: compile
        echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-       @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
+       @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
        @(echo "To: patches@xwt.org";\
         SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
         echo "Subject: $$SUB";\
@@ -376,3 +360,12 @@ propose-patch:
         cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
        @rm .darcspatch 
 
+commit: propose-patch
+       darcs push --and-apply xwt@xwt.org:/var/www/org/ibex/core/
+
+doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.class doc/%.xml
+       cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex
+       cd $(@D); pdflatex `basename $*`.tex
+       open doc/$*.pdf
+
+
Unnamed repository; edit this file to name it for gitweb.