X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=README;h=7447813469b8fd6d8e2579a2e113e90cfc39cb89;hb=7880e4c4ade5aae671934555eac512704f390d82;hp=deb448b9853be425e8957257467627d9fd6293a1;hpb=f35445729371789b3d496f426d7f87542f8e1a45;p=org.ibex.core.git diff --git a/README b/README index deb448b..7447813 100644 --- a/README +++ b/README @@ -104,6 +104,10 @@ To build, make sure your $JAVA_HOME points to jdk1.2 or later, and type ./ant -Dplat= +If you're using jdk1.2 or jdk1.3 to compile, you should remove +src/org/xwt/plat/Java14.java, since it can only be compiled with +jdk1.4+. + The name of any class in org.xwt.plat is a valid ; here is a list as of 20-Mar-2002: @@ -127,7 +131,17 @@ The following targets do not require that you specify a platform: ______________________________________________________________________________ -Building a compiler +Building + +- If you only want to build the JVM version of XWT, delete these two + files: + + xwt/src/org/xwt/plat/Win32.java + xwt/src/org/xwt/plat/GCJ.java + + This will allow XWT to build correctly *without* gcc 3.1. Otherwise, + you must compile and install gcc 3.1. + - The Win32 native version of XWT can ONLY be built with the very latest pre-release of GCC 3.1. You can follow the steps below to @@ -139,6 +153,11 @@ Building a compiler without it, however, since it puts additional strain on the gcc cvs server. + There are also three patches at the end of this file which can be + applied to the branch -- the first fixes a bug related to + GetFullPathName, the second disables Win32 file locking (so you can + view XWT's log files while it is running), and the third makes + Throwable.printStackTrace() work. # create an install area export CLASSPATH= @@ -185,3 +204,285 @@ Building a compiler make sudo make install +- The Linux native version is still experimental. You should configure + your compiler with: + + ../gcc/configure \ + --prefix=$PREFIX \ + --enable-languages=c,c++,java \ + --disable-nls \ + --enable-libgcj \ + --enable-threads=posix \ + --enable-hash-synchronization \ + --enable-static \ + --disable-interpreter + + +______________________________________________________________________________ +GetFullPathName patch + +Index: natFileWin32.cc +=================================================================== +RCS file: /cvs/gcc/gcc/libjava/java/io/natFileWin32.cc,v +retrieving revision 1.9.2.1 +diff -u -r1.9.2.1 natFileWin32.cc +--- natFileWin32.cc 16 Apr 2002 15:35:20 -0000 1.9.2.1 ++++ natFileWin32.cc 14 May 2002 01:57:39 -0000 +@@ -106,7 +106,7 @@ + LPTSTR unused; + char buf2[MAX_PATH]; + if(!GetFullPathName(buf, MAX_PATH, buf2, &unused)) +- throw new IOException (JvNewStringLatin1 ("GetFullPathName failed")); ++ return NULL; + + // FIXME: what encoding to assume for file names? This affects many + // calls. + + +______________________________________________________________________________ +File Locking Patch + +Index: java/io/natFileDescriptorWin32.cc +=================================================================== +RCS file: /cvs/gcc/gcc/libjava/java/io/natFileDescriptorWin32.cc,v +retrieving revision 1.5.2.2 +diff -u -r1.5.2.2 natFileDescriptorWin32.cc +--- java/io/natFileDescriptorWin32.cc 10 Mar 2002 03:34:59 -0000 1.5.2.2 ++++ java/io/natFileDescriptorWin32.cc 27 Apr 2002 08:40:40 -0000 +@@ -112,7 +112,7 @@ + create = CREATE_ALWAYS; + } + +- handle = CreateFile(buf, access, share, NULL, create, 0, NULL); ++ handle = CreateFile(buf, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create, 0, NULL); + + if (handle == INVALID_HANDLE_VALUE) + { + + + +______________________________________________________________________________ +Throwable.printStackTrace() patch + +Index: Class.h +=================================================================== +RCS file: /cvs/gcc/gcc/libjava/java/lang/Class.h,v +retrieving revision 1.43 +diff -u -r1.43 Class.h +--- Class.h 21 Dec 2001 19:47:50 -0000 1.43 ++++ Class.h 24 Apr 2002 03:06:14 -0000 +@@ -308,6 +308,7 @@ + friend void _Jv_LayoutVTableMethods (jclass klass); + friend void _Jv_SetVTableEntries (jclass, _Jv_VTable *); + friend void _Jv_MakeVTable (jclass); ++ friend JArray* _Jv_GetAllMethods(); + + // Return array class corresponding to element type KLASS, creating it if + // necessary. +Index: ClassLoader.java +=================================================================== +RCS file: /cvs/gcc/gcc/libjava/java/lang/ClassLoader.java,v +retrieving revision 1.16 +diff -u -r1.16 ClassLoader.java +--- ClassLoader.java 7 Dec 2001 23:34:12 -0000 1.16 ++++ ClassLoader.java 24 Apr 2002 03:06:14 -0000 +@@ -577,4 +577,8 @@ + // Default to returning null. Derived classes implement this. + return null; + } ++ ++ static native java.lang.reflect.Method[] getAllMethods(); ++ static native long[] getAllMethodAddrs(); ++ + } +Index: Throwable.java +=================================================================== +RCS file: /cvs/gcc/gcc/libjava/java/lang/Throwable.java,v +retrieving revision 1.10 +diff -u -r1.10 Throwable.java +--- Throwable.java 24 Feb 2001 03:52:49 -0000 1.10 ++++ Throwable.java 24 Apr 2002 03:06:14 -0000 +@@ -123,21 +123,64 @@ + printStackTrace (writer); + } + ++ private native static long longFromStackTraceBytes(byte[] stackTrace, int i); ++ + public void printStackTrace (PrintWriter wr) + { +- try +- { +- CPlusPlusDemangler cPlusPlusFilter = new CPlusPlusDemangler (wr); +- PrintWriter writer = new PrintWriter (cPlusPlusFilter); +- printRawStackTrace (writer); +- writer.close (); +- if (cPlusPlusFilter.written == 0) // The demangler has failed... +- printRawStackTrace (wr); ++ try ++ { ++ CPlusPlusDemangler cPlusPlusFilter = new CPlusPlusDemangler (wr); ++ PrintWriter writer = new PrintWriter (cPlusPlusFilter); ++ printRawStackTrace (writer); ++ writer.close (); ++ if (cPlusPlusFilter.written > 0) return; ++ } ++ catch (Exception e1) ++ { ++ } ++ ++ wr.println(toString()); ++ if (stackTrace == null) { ++ wr.flush(); ++ return; + } +- catch (Exception e1) +- { +- printRawStackTrace (wr); ++ ++ long[] allAddrs = ClassLoader.getAllMethodAddrs(); ++ java.lang.reflect.Method[] meths = ClassLoader.getAllMethods(); ++ ++ // FIXME: assumes little endian ++ for(int i=0; i + #include + #include ++#include ++ ++#include ++#include + + // FIXME: remove these. + #define CloneableClass java::lang::Cloneable::class$ +@@ -347,6 +351,50 @@ + static jclass loaded_classes[HASH_LEN]; + + // This is the root of a linked list of classes ++ ++JArray* ++java::lang::ClassLoader::getAllMethods() ++{ ++ return _Jv_GetAllMethods(); ++} ++ ++JArray* ++java::lang::ClassLoader::getAllMethodAddrs() ++{ ++ JArray* arr = _Jv_GetAllMethods(); ++ java::lang::reflect::Method** el = (java::lang::reflect::Method**)elements(arr); ++ JArray* ret = JvNewLongArray(arr->length); ++ jlong* retel = (jlong*)elements(ret); ++ for(int i=0; ilength; i++) ++ retel[i] = (jlong)((unsigned int)(_Jv_FromReflectedMethod (el[i])->ncode)); ++ return ret; ++} ++ ++JArray* ++_Jv_GetAllMethods() ++{ ++ int numMethods = 0; ++ ++ for(int i=0; inext) ++ numMethods += c->getDeclaredMethods()->length; ++ ++ JArray* ret = ++ (JArray*) ++ JvNewObjectArray(numMethods, &java::lang::reflect::Method::class$, NULL); ++ ++ java::lang::reflect::Method** el = (java::lang::reflect::Method**)elements(ret); ++ ++ for(int i=0; inext) { ++ JArray* methods = c->getDeclaredMethods(); ++ jint len = methods->length; ++ java::lang::reflect::Method** meths = (java::lang::reflect::Method**)elements(methods); ++ for(int j=0; j + + #include ++#include + + #ifdef HAVE_EXECINFO_H + #include +@@ -102,3 +103,18 @@ + #endif /* HAVE_BACKTRACE */ + wr->flush (); + } ++ ++// Returns the i^th call address in the stackTrace member, or 0 if i ++// is beyond the end of the trace. This has to be done in C++ because ++// the addresses in stackTrace are the same width as the platform's ++// pointers (which is unknown to Java code), and stackTrace is a ++// byte[] using the platform's endianness (which is unknown to Java ++// code). ++jlong ++java::lang::Throwable::longFromStackTraceBytes(jbyteArray stackArr, jint i) ++{ ++ if (i * sizeof(void*) > stackArr->length) return 0; ++ unsigned int* stack = (unsigned int*)elements(stackArr); ++ return (jlong)stack[i]; ++} ++ + + + + +