From ab47671aab80c10b57b74c8eb7e240b79e352b99 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 16 Feb 2004 12:02:41 +0000 Subject: [PATCH] finally got pruning sorta working darcs-hash:20040216120241-5007d-3d70c6db0a2bff39f8f7bb7949cfb6e6b90a5813.gz --- Makefile | 113 +++++++++++++++++------- Makefile.upstream | 16 +--- jode.conf | 16 ++-- src/edu/stanford/ejalbert/BrowserLauncher.java | 6 ++ src/org/ibex/plat/GCJ.java | 21 +++-- src/org/ibex/plat/Linux.java | 2 + src/org/ibex/util/Preprocessor.java | 17 +++- 7 files changed, 129 insertions(+), 62 deletions(-) diff --git a/Makefile b/Makefile index 2e9572d..cb554f0 100644 --- a/Makefile +++ b/Makefile @@ -31,17 +31,6 @@ Solaris: ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 Win32: ; make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)" -foo: .compile - rm -rf build/class/* - make oldcompile - make .install_jode-1.1.1_java target=java - cd build; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/Object.class - java -cp upstream/java-getopt-1.0.9:upstream/jode-1.1.1/build-java jode.obfuscator.Main jode.conf - cd out; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/ - cd build/class; tar cf - org/ | tar -C ../../out -xvf - - cd out ; rm -rf gnu/java/awt gnu/java/beans gnu/java/rmi java/rmi java/beans java/awt java/sql - for A in `find out -name \*.class`; do cd `dirname $$A`; $(shell pwd)/$(gcj) -c `basename $$A` -fCLASSPATH=$(shell pwd)/out; cd $(shell pwd); done - darwin_libdir := upstream/install/powerpc-apple-darwin/lib darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib @@ -78,7 +67,7 @@ gcj: .install_gcc-3.3_$(target) include Makefile.upstream -java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor)) +java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat/AWT | grep -v plat/Java2)) java_sources += build/java/org/xwt/mips/Errno.java java_sources += build/java/org/xwt/mips/Unistd.java java_sources += build/java/org/xwt/mips/Syscalls.java @@ -95,6 +84,7 @@ build/java/org/xwt/mips/util/%: @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 $@ @@ -125,20 +115,38 @@ build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $ 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'`/$< $@ -build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java .jikes +gnu_regexp_jfiles := $(patsubst src/%.java, build/java/%.java, $(shell find src/gnu/regexp -name \*.java)) +gnu_regexp := $(patsubst src/%.java, build/class/%.class, $(shell find src/gnu/regexp -name \*.java)) + +build/class/gnu/regexp/%.class: build/java/gnu/regexp/%.java $(gnu_regexp_jfiles) .jikes @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p build/class/org/ibex/util/ ./.jikes $< +build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java $(gnu_regexp) .jikes + @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" + mkdir -p build/class/org/ibex/util/ + ./.jikes src/org/ibex/util/Vec.java + ./.jikes $< + +build/class/%.class: build/java/%.java $(java_sources) .jikes + @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" + mkdir -p $(@D) + ./.jikes $< + oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -source 1.2 -d build/class `find build/java/ -name \*.java` -compile: .compile -.compile: $(java_sources) .jikes .install_mips2java - @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" - @rm -f $(java_sources:build/java/%.java=build/class/%.class) - mkdir -p build/class - echo @./.jikes $(java_sources) - @./.jikes $(java_sources) - touch .compile + +compile: .jikes .install_mips2java + @make -s $(java_sources:build/java/%.java=build/class/%.class) +.compile: compile + +#.compile: $(java_sources) .jikes .install_mips2java +# @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" +# @rm -f $(java_sources:build/java/%.java=build/class/%.class) +# mkdir -p build/class +# cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done +# @./.jikes -Xlint:deprecation $(java_sources) +# touch .compile build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class @echo -e "\n\033[1marchiving .class -> .jar: build/JVM/ibex.jar\033[0m" @@ -167,15 +175,10 @@ build/h/%.h: build/class/%.class .compile build/$(platform)/org/ibex/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@; build/$(platform)/org/ibex/plat/AWT.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@; -build/$(platform)/org/ibex/translators/MIPSApps.java.o: build/class/org/ibex/translators/MIPSApps.class - @echo -e "\n\033[1mcompiling .class -> .o: $<\033[0m" - mkdir -p `dirname $@` - $(gcj) -Os -c $< -o $@ - -build/$(platform)/%.java.o: build/java/%.java +build/$(platform)/%.java.o: build/class/%.class @echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m" mkdir -p `dirname $@` - $(gcj) -c $< -o $@ + $(gcj) -fCLASSPATH=build/class -c $< -o $@ # FIXME detect subclasses of X11 build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) @@ -197,10 +200,58 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) -build/$(platform)/$(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o +# note: binaries appear in a different order in the dependency line vs the link line +build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" - mkdir -p build/$(platform) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib -Lupstream/install/lib $^ $(link_flags) + make $(java_sources) + rm -rf build/pruned; mkdir -p build/pruned + javac -classpath lib/bcel-5.1.jar:build/class -d build/class src/org/ibex/util/BytecodePruner.java + rm -f build/$(platform)/ibex.jar + cd build/class; \ + fastjar cf ../$(platform)/ibex.jar \ + `find . -name \*.class | grep -v ibex/plat/` \ + org/ibex/plat/$(platform)*.class \ + org/ibex/plat/X11*.class \ + org/ibex/plat/GCJ*.class \ + org/ibex/plat/POSIX*.class + java -cp lib/bcel-5.1.jar:build/class org.ibex.util.BytecodePruner \ + build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar -o build/pruned +# rm -rf out/java/awt +# rm -f out/java/lang/*.* +# rm -f out/java/lang/reflect/* +# mkdir -p out/java/lang/ref +# mkdir -p out/java/lang/reflect +# cp upstream/gcc-3.3/src/libjava/java/lang/*.java out/java/lang/ +# cp upstream/gcc-3.3/src/libjava/java/lang/ref/*.java out/java/lang/ref/ +# cp upstream/gcc-3.3/src/libjava/java/lang/reflect/*.java out/java/lang/reflect/ + rm -rf build/pruned/org/ibex/js/*; cp build/java/org/ibex/js/* build/pruned/org/ibex/js/ + rm build/pruned/java/lang/System.class + cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/ + cd build/pruned; \ + for A in `find . -name \*.class -or -name \*.java`; do \ + echo compiling $$A....; \ + ../../upstream/install/bin/$(target)-gcj -w -c -fCLASSPATH=../../build/class $$A && \ + (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \ + done + rm -f build/$(platform)/ibex.a + cd upstream/gcc-3.3/build-$(target)/$(target)/libjava; \ + $(shell pwd)/upstream/install/$(target)/bin/ar cq \ + $(shell pwd)/build/$(platform)/ibex.a \ + `find . -name nat\*.o` \ + `find . -name \*.o -not -name '*[A-Z]*'` \ + $(shell pwd)/build/$(platform)/org/ibex/plat/$(platform).cc.o \ + `find $(shell pwd)/build/$(platform) -name \*.o` + PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \ + --main=org.ibex.plat.$(platform) \ + -Lupstream/install/$(target)/lib \ + -Lupstream/install/lib \ + build/$(platform)/ibex.a \ + upstream/jpeg-6b/build-$(target)/libjpeg.a \ + $(link_flags) \ + upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \ + -lz -ldl -lffi \ + -o $@ + ### Builtin Resources ############################################################################## diff --git a/Makefile.upstream b/Makefile.upstream index be8f405..45d1592 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -16,9 +16,8 @@ url_jpeg-6b := http://www.ijg.org/files/jpegsrc.v6b.tar.gz url_jikes-1.18 := http://dist.ibex.org/jikes-1.18.tgz url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz url_vera-1.10 := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz -url_jode-1.1.1 := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz -url_java-getopt-1.0.9 := ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.9.tar.gz url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz +url_bcel-5.1 := http://apache.130th.net/jakarta/bcel/binaries/bcel-5.1.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -79,16 +78,6 @@ configure_gcc-3.3_sparc-sun-solaris2.7 += --enable-threads=posix --disable-hash configure_WindowMaker-0.80.2_$(target) += --prefix=$(shell pwd)/upstream/install/$(target) configure_WindowMaker-0.80.2_$(target) += --host=i686-pc-linux-gnu --x-libraries=$(shell pwd)/upstream/install/$(target)/lib -.install_jode-1.1.1_java: .download_java-getopt-1.0.9 - -configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac -ifeq ($(shell uname),Darwin) -environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar -else -environment_jode-1.1.1_java := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar -endif -environment_jode-1.1.1_java += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/ - #environment_gcc-3.3_i686-pc-linux-gnu += CFLAGS="-Wl,-ldl" # libjpeg's configury doesn't obey --target @@ -227,7 +216,8 @@ endif @echo -e "\n\033[1mdetecting your jikes installation...\033[0m" echo "#!/bin/sh" > .jikes ifeq ($(shell javac -version 2>&1 | head -n 1),javac 1.5.0-beta) - echo -n 'PATH=upstream/install/bin:$$PATH javac -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src' >> .jikes + echo 'PATH=upstream/install/bin:$$PATH $(shell pwd)/upstream/install/bin/i686-pc-linux-gnu-gcj -fCLASSPATH=lib/bcel-5.1.jar:lib/libgcj-minimal.jar:build/class -Ibuild/java/ -Iupstream/mips -Iupstream/mips/build -d build/class/ -C $$@' >> .jikes +# echo -n 'PATH=upstream/install/bin:$$PATH javac -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src' >> .jikes else echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src ' >> .jikes (type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target= diff --git a/jode.conf b/jode.conf index 6823841..86575cf 100644 --- a/jode.conf +++ b/jode.conf @@ -13,12 +13,16 @@ load = new WildCard { value = "org.ibex.*" }, preserve = new WildCard { value = "org.ibex.Main" }, new WildCard { value = "org.ibex.plat.Linux" }, -new WildCard { value="java.lang" }, -new WildCard { value="gnu.gcj.protocol" }, -new WildCard { value="java.net.URLConnection" }, -new WildCard { value="java.net.JarURLConnection" }, -new WildCard { value="java.net.HttpURLConection" }, -new WildCard { value="java.security.Policy" } + new WildCard { value="java.lang" }, + new WildCard { value="gnu.gcj.protocol" }, + new WildCard { value="java.net.URLConnection" }, + new WildCard { value="gnu.gcj.protocol.file.Connection" }, + new WildCard { value="gnu.gcj.protocol.http.Connection" }, + new WildCard { value="gnu.gcj.protocol.jar.Connection" }, + new WildCard { value="gnu.gcj.protocol.core.Connection" }, + new WildCard { value="java.net.JarURLConnection" }, + new WildCard { value="java.net.HttpURLConection" }, + new WildCard { value="java.security.Policy" } # new MultiIdentifierMatcher { # and = new WildCard { value = "org.myorg.publiclib.*" }, # new ModifierMatcher { access = "PUBLIC" } diff --git a/src/edu/stanford/ejalbert/BrowserLauncher.java b/src/edu/stanford/ejalbert/BrowserLauncher.java index 14fd1ad..afb9453 100644 --- a/src/edu/stanford/ejalbert/BrowserLauncher.java +++ b/src/edu/stanford/ejalbert/BrowserLauncher.java @@ -576,8 +576,14 @@ public class BrowserLauncher { * Methods required for Mac OS X. The presence of native methods does not cause * any problems on other platforms. */ + /* private native static int ICStart(int[] instance, int signature); private native static int ICStop(int[] instance); private native static int ICLaunchURL(int instance, byte[] hint, byte[] data, int len, int[] selectionStart, int[] selectionEnd); + */ + private static int ICStart(int[] instance, int signature) { return 0; } + private static int ICStop(int[] instance) { return 0; } + private static int ICLaunchURL(int instance, byte[] hint, byte[] data, int len, + int[] selectionStart, int[] selectionEnd) { return 0; } } diff --git a/src/org/ibex/plat/GCJ.java b/src/org/ibex/plat/GCJ.java index 55fdb09..183c573 100644 --- a/src/org/ibex/plat/GCJ.java +++ b/src/org/ibex/plat/GCJ.java @@ -9,15 +9,18 @@ import java.io.*; public abstract class GCJ extends Platform { // static references to these classes ensure that the linker will include them - private static Class c1 = gnu.java.locale.Calendar.class; - private static Class c2 = java.util.GregorianCalendar.class; - private static Class c3 = gnu.gcj.convert.Input_ASCII.class; - private static Class c4 = gnu.gcj.convert.Input_UTF8.class; - private static Class c5 = gnu.gcj.convert.Input_8859_1.class; - private static Class c6 = gnu.java.locale.LocaleInformation.class; - private static Class c7 = gnu.gcj.convert.Output_ASCII.class; - private static Class c8 = gnu.java.locale.Calendar_en.class; - private static Class c9 = gnu.java.locale.Calendar_en_US.class; + public static Object c1 = new gnu.java.locale.Calendar(); + // public static Object[][] c1c = new gnu.java.locale.Calendar().getContents(); + public static Object c2 = new java.util.GregorianCalendar(); + public static Object c3n = new gnu.gcj.convert.Input_ASCII(); + public static Object c4 = new gnu.gcj.convert.Input_UTF8(); + public static Object c5 = new gnu.gcj.convert.Input_8859_1(); + public static Object c6 = new gnu.java.locale.LocaleInformation(); + public static Object c7 = new gnu.gcj.convert.Output_ASCII(); + public static Object c8 = new gnu.java.locale.Calendar_en(); + public static Object c9 = new gnu.java.locale.Calendar_en_US(); + public static Object c10 = new gnu.gcj.protocol.http.Handler(); + public static Object c11 = new gnu.gcj.protocol.jar.Handler(); protected native InputStream _getBuiltinInputStream(); diff --git a/src/org/ibex/plat/Linux.java b/src/org/ibex/plat/Linux.java index a802d07..9ece3af 100644 --- a/src/org/ibex/plat/Linux.java +++ b/src/org/ibex/plat/Linux.java @@ -3,6 +3,8 @@ package org.ibex.plat; /** Linux with an X11 display */ public class Linux extends X11 { + + public static void main(String[] args) throws Exception { org.ibex.Main.main(args); } private native void fixEnvironment(); public Linux() { diff --git a/src/org/ibex/util/Preprocessor.java b/src/org/ibex/util/Preprocessor.java index 875416d..5f202fa 100644 --- a/src/org/ibex/util/Preprocessor.java +++ b/src/org/ibex/util/Preprocessor.java @@ -7,6 +7,7 @@ package org.ibex.util; +import gnu.regexp.*; import java.util.*; import java.io.*; @@ -29,6 +30,16 @@ import java.io.*; */ public class Preprocessor { + public static String replaceAll(String source, String regexp, String replaceWith) { + try { + RE re = new RE(regexp, 0, RESyntax.RE_SYNTAX_PERL5); + return (String)re.substituteAll(source, replaceWith); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + public static void main(String[] args) throws Exception { BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(System.out)); @@ -191,7 +202,7 @@ PROCESS: if (key != null) { Hashtable hash = byLength[key.length()]; - hash.put(key, (String)hash.get(key) + processLine(trimmed, false).replaceAll("//[^\"]*$", "").trim() + "\n"); + hash.put(key, (String)hash.get(key) + replaceAll(processLine(trimmed, false), "//[^\"]*$", "").trim() + "\n"); } else { out.print(processLine(trimmed, false)); } @@ -319,11 +330,11 @@ PROCESS: String bound2 = null; if (unbound2 == null) { bound1 = args; - return expression.replaceAll(unbound1, bound1); + return replaceAll(expression, unbound1, bound1); } else { bound1 = args.substring(0, args.indexOf(',')); bound2 = args.substring(args.indexOf(',') + 1); - return (expression.replaceAll(unbound1, bound1).replaceAll(unbound2, bound2)); + return replaceAll(replaceAll(expression, unbound1, bound1), unbound2, bound2); } } } -- 1.7.10.4