[kaffe] CVS kaffe (robilad): moved classes from gnu.bytecode to gnu.bytecodecvssnap to fix Nice bootstrap
Kaffe CVS
cvs-commits at kaffe.org
Tue Sep 20 18:47:33 PDT 2005
PatchSet 6924
Date: 2005/09/21 01:42:06
Author: robilad
Branch: HEAD
Tag: (none)
Log:
moved classes from gnu.bytecode to gnu.bytecodecvssnap to fix Nice bootstrap
Members:
ChangeLog:1.4446->1.4447
libraries/javalib/Makefile.am:1.394->1.395
libraries/javalib/Makefile.am.in:1.48->1.49
libraries/javalib/Makefile.in:1.486->1.487
libraries/javalib/all.files:1.164->1.165
libraries/javalib/gnu/bytecode/Access.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ArrayClassLoader.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ArrayType.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/AttrContainer.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Attribute.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ClassFileInput.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/ClassType.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/ClassTypeWriter.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CodeAttr.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/ConstantPool.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ConstantValueAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolClass.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolEntry.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolFloat.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolNameAndType.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolRef.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolString.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolUtf8.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolValue1.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/CpoolValue2.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ExceptionsAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Field.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Filter.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/IfState.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/InnerClassesAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Label.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/LineNumbersAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/LocalVarsAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Location.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Method.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/MiscAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ObjectType.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/PrimType.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Scope.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/SourceDebugExtAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/SourceFileAttr.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/SwitchState.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/TryState.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Type.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/VarEnumerator.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/Variable.java:1.2->1.3(DEAD)
libraries/javalib/gnu/bytecode/ZipArchive.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/ZipLoader.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/dump.java:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecode/package.html:1.1->1.2(DEAD)
libraries/javalib/gnu/bytecodecvssnap/Access.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ArrayClassLoader.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ArrayType.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/AttrContainer.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Attribute.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ClassFileInput.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ClassType.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ClassTypeWriter.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CodeAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ConstantPool.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ConstantValueAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolClass.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolEntry.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolFloat.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolNameAndType.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolRef.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolString.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolUtf8.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolValue1.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/CpoolValue2.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ExceptionsAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Field.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Filter.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/IfState.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/InnerClassesAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Label.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/LineNumbersAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/LocalVarsAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Location.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Method.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/MiscAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ObjectType.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/PrimType.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Scope.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/SourceDebugExtAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/SourceFileAttr.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/SwitchState.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/TryState.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Type.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/VarEnumerator.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/Variable.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ZipArchive.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/ZipLoader.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/dump.java:INITIAL->1.1
libraries/javalib/gnu/bytecodecvssnap/package.html:INITIAL->1.1
libraries/javalib/gnu/classpath/tools/javap/GnuByteCodeJavap.java:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4446 kaffe/ChangeLog:1.4447
--- kaffe/ChangeLog:1.4446 Tue Sep 20 23:07:23 2005
+++ kaffe/ChangeLog Wed Sep 21 01:42:06 2005
@@ -1,5 +1,115 @@
2005-09-20 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/Makefile.am.in: Replaced gnu/bytecode usage
+ by gnu/bytecodecvssnap.
+
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/all.files:
+ Regenerated.
+
+ * libraries/javalib/gnu/bytecode/Access.java,
+ libraries/javalib/gnu/bytecode/ArrayClassLoader.java,
+ libraries/javalib/gnu/bytecode/ArrayType.java,
+ libraries/javalib/gnu/bytecode/AttrContainer.java,
+ libraries/javalib/gnu/bytecode/Attribute.java,
+ libraries/javalib/gnu/bytecode/ClassFileInput.java,
+ libraries/javalib/gnu/bytecode/ClassType.java,
+ libraries/javalib/gnu/bytecode/ClassTypeWriter.java,
+ libraries/javalib/gnu/bytecode/CodeAttr.java,
+ libraries/javalib/gnu/bytecode/ConstantPool.java,
+ libraries/javalib/gnu/bytecode/ConstantValueAttr.java,
+ libraries/javalib/gnu/bytecode/CpoolClass.java,
+ libraries/javalib/gnu/bytecode/CpoolEntry.java,
+ libraries/javalib/gnu/bytecode/CpoolFloat.java,
+ libraries/javalib/gnu/bytecode/CpoolNameAndType.java,
+ libraries/javalib/gnu/bytecode/CpoolRef.java,
+ libraries/javalib/gnu/bytecode/CpoolString.java,
+ libraries/javalib/gnu/bytecode/CpoolUtf8.java,
+ libraries/javalib/gnu/bytecode/CpoolValue1.java,
+ libraries/javalib/gnu/bytecode/CpoolValue2.java,
+ libraries/javalib/gnu/bytecode/ExceptionsAttr.java,
+ libraries/javalib/gnu/bytecode/Field.java,
+ libraries/javalib/gnu/bytecode/Filter.java,
+ libraries/javalib/gnu/bytecode/IfState.java,
+ libraries/javalib/gnu/bytecode/InnerClassesAttr.java,
+ libraries/javalib/gnu/bytecode/Label.java,
+ libraries/javalib/gnu/bytecode/LineNumbersAttr.java,
+ libraries/javalib/gnu/bytecode/LocalVarsAttr.java,
+ libraries/javalib/gnu/bytecode/Location.java,
+ libraries/javalib/gnu/bytecode/Method.java,
+ libraries/javalib/gnu/bytecode/MiscAttr.java,
+ libraries/javalib/gnu/bytecode/ObjectType.java,
+ libraries/javalib/gnu/bytecode/PrimType.java,
+ libraries/javalib/gnu/bytecode/Scope.java,
+ libraries/javalib/gnu/bytecode/SourceDebugExtAttr.java,
+ libraries/javalib/gnu/bytecode/SourceFileAttr.java,
+ libraries/javalib/gnu/bytecode/SwitchState.java,
+ libraries/javalib/gnu/bytecode/TryState.java,
+ libraries/javalib/gnu/bytecode/Type.java,
+ libraries/javalib/gnu/bytecode/VarEnumerator.java,
+ libraries/javalib/gnu/bytecode/Variable.java,
+ libraries/javalib/gnu/bytecode/ZipArchive.java,
+ libraries/javalib/gnu/bytecode/ZipLoader.java,
+ libraries/javalib/gnu/bytecode/dump.java,
+ libraries/javalib/gnu/bytecode/package.html:
+ Moved over to libraries/javalib/gnu/bytecodecvs.
+
+ * libraries/javalib/gnu/bytecodecvssnap/Access.java,
+ libraries/javalib/gnu/bytecodecvssnap/ArrayClassLoader.java,
+ libraries/javalib/gnu/bytecodecvssnap/ArrayType.java,
+ libraries/javalib/gnu/bytecodecvssnap/AttrContainer.java,
+ libraries/javalib/gnu/bytecodecvssnap/Attribute.java,
+ libraries/javalib/gnu/bytecodecvssnap/ClassFileInput.java,
+ libraries/javalib/gnu/bytecodecvssnap/ClassType.java,
+ libraries/javalib/gnu/bytecodecvssnap/ClassTypeWriter.java,
+ libraries/javalib/gnu/bytecodecvssnap/CodeAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/ConstantPool.java,
+ libraries/javalib/gnu/bytecodecvssnap/ConstantValueAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolClass.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolEntry.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolFloat.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolNameAndType.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolRef.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolString.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolUtf8.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolValue1.java,
+ libraries/javalib/gnu/bytecodecvssnap/CpoolValue2.java,
+ libraries/javalib/gnu/bytecodecvssnap/ExceptionsAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/Field.java,
+ libraries/javalib/gnu/bytecodecvssnap/Filter.java,
+ libraries/javalib/gnu/bytecodecvssnap/IfState.java,
+ libraries/javalib/gnu/bytecodecvssnap/InnerClassesAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/Label.java,
+ libraries/javalib/gnu/bytecodecvssnap/LineNumbersAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/LocalVarsAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/Location.java,
+ libraries/javalib/gnu/bytecodecvssnap/Method.java,
+ libraries/javalib/gnu/bytecodecvssnap/MiscAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/ObjectType.java,
+ libraries/javalib/gnu/bytecodecvssnap/PrimType.java,
+ libraries/javalib/gnu/bytecodecvssnap/Scope.java,
+ libraries/javalib/gnu/bytecodecvssnap/SourceDebugExtAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/SourceFileAttr.java,
+ libraries/javalib/gnu/bytecodecvssnap/SwitchState.java,
+ libraries/javalib/gnu/bytecodecvssnap/TryState.java,
+ libraries/javalib/gnu/bytecodecvssnap/Type.java,
+ libraries/javalib/gnu/bytecodecvssnap/VarEnumerator.java,
+ libraries/javalib/gnu/bytecodecvssnap/Variable.java,
+ libraries/javalib/gnu/bytecodecvssnap/ZipArchive.java,
+ libraries/javalib/gnu/bytecodecvssnap/ZipLoader.java,
+ libraries/javalib/gnu/bytecodecvssnap/dump.java,
+ libraries/javalib/gnu/bytecodecvssnap/package.html:
+ Moved over here from gnu.bytecode to avoid conflicts with code
+ using gnu.bytecode, like Nice.
+
+ Reported by: Daniel Bonniot <Daniel.Bonniot at inria.fr>
+
+ * libraries/javalib/gnu/classpath/tools/javap/GnuByteCodeJavap.java:
+ Import classes from gnu.bytecodecvssnap rather than from gnu.bytecode.
+
+2005-09-20 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/gnu/bytecode/ClassFileInput.java,
libraries/javalib/gnu/bytecode/ClassType.java,
libraries/javalib/gnu/bytecode/CodeAttr.java,
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.394 kaffe/libraries/javalib/Makefile.am:1.395
--- kaffe/libraries/javalib/Makefile.am:1.394 Fri Sep 16 22:25:16 2005
+++ kaffe/libraries/javalib/Makefile.am Wed Sep 21 01:42:09 2005
@@ -63,7 +63,7 @@
$(gnu_CORBA_Interceptor_SRCS) \
$(gnu_CORBA_NamingService_SRCS) \
$(gnu_CORBA_Poa_SRCS) \
- $(gnu_bytecode_SRCS) \
+ $(gnu_bytecodecvssnap_SRCS) \
$(gnu_classpath_SRCS) \
$(gnu_classpath_debug_SRCS) \
$(gnu_classpath_jdwp_SRCS) \
@@ -562,51 +562,51 @@
gnu/CORBA/Poa/policySets.java \
gnu/CORBA/Poa/servantDelegate.java \
gnu/CORBA/Poa/vPolicy.java
-gnu_bytecode_SRCS = \
- gnu/bytecode/Access.java \
- gnu/bytecode/ArrayClassLoader.java \
- gnu/bytecode/ArrayType.java \
- gnu/bytecode/AttrContainer.java \
- gnu/bytecode/Attribute.java \
- gnu/bytecode/ClassFileInput.java \
- gnu/bytecode/ClassType.java \
- gnu/bytecode/ClassTypeWriter.java \
- gnu/bytecode/CodeAttr.java \
- gnu/bytecode/ConstantPool.java \
- gnu/bytecode/ConstantValueAttr.java \
- gnu/bytecode/CpoolClass.java \
- gnu/bytecode/CpoolEntry.java \
- gnu/bytecode/CpoolFloat.java \
- gnu/bytecode/CpoolNameAndType.java \
- gnu/bytecode/CpoolRef.java \
- gnu/bytecode/CpoolString.java \
- gnu/bytecode/CpoolUtf8.java \
- gnu/bytecode/CpoolValue1.java \
- gnu/bytecode/CpoolValue2.java \
- gnu/bytecode/ExceptionsAttr.java \
- gnu/bytecode/Field.java \
- gnu/bytecode/Filter.java \
- gnu/bytecode/IfState.java \
- gnu/bytecode/InnerClassesAttr.java \
- gnu/bytecode/Label.java \
- gnu/bytecode/LineNumbersAttr.java \
- gnu/bytecode/LocalVarsAttr.java \
- gnu/bytecode/Location.java \
- gnu/bytecode/Method.java \
- gnu/bytecode/MiscAttr.java \
- gnu/bytecode/ObjectType.java \
- gnu/bytecode/PrimType.java \
- gnu/bytecode/Scope.java \
- gnu/bytecode/SourceDebugExtAttr.java \
- gnu/bytecode/SourceFileAttr.java \
- gnu/bytecode/SwitchState.java \
- gnu/bytecode/TryState.java \
- gnu/bytecode/Type.java \
- gnu/bytecode/VarEnumerator.java \
- gnu/bytecode/Variable.java \
- gnu/bytecode/ZipArchive.java \
- gnu/bytecode/ZipLoader.java \
- gnu/bytecode/dump.java
+gnu_bytecodecvssnap_SRCS = \
+ gnu/bytecodecvssnap/Access.java \
+ gnu/bytecodecvssnap/ArrayClassLoader.java \
+ gnu/bytecodecvssnap/ArrayType.java \
+ gnu/bytecodecvssnap/AttrContainer.java \
+ gnu/bytecodecvssnap/Attribute.java \
+ gnu/bytecodecvssnap/ClassFileInput.java \
+ gnu/bytecodecvssnap/ClassType.java \
+ gnu/bytecodecvssnap/ClassTypeWriter.java \
+ gnu/bytecodecvssnap/CodeAttr.java \
+ gnu/bytecodecvssnap/ConstantPool.java \
+ gnu/bytecodecvssnap/ConstantValueAttr.java \
+ gnu/bytecodecvssnap/CpoolClass.java \
+ gnu/bytecodecvssnap/CpoolEntry.java \
+ gnu/bytecodecvssnap/CpoolFloat.java \
+ gnu/bytecodecvssnap/CpoolNameAndType.java \
+ gnu/bytecodecvssnap/CpoolRef.java \
+ gnu/bytecodecvssnap/CpoolString.java \
+ gnu/bytecodecvssnap/CpoolUtf8.java \
+ gnu/bytecodecvssnap/CpoolValue1.java \
+ gnu/bytecodecvssnap/CpoolValue2.java \
+ gnu/bytecodecvssnap/ExceptionsAttr.java \
+ gnu/bytecodecvssnap/Field.java \
+ gnu/bytecodecvssnap/Filter.java \
+ gnu/bytecodecvssnap/IfState.java \
+ gnu/bytecodecvssnap/InnerClassesAttr.java \
+ gnu/bytecodecvssnap/Label.java \
+ gnu/bytecodecvssnap/LineNumbersAttr.java \
+ gnu/bytecodecvssnap/LocalVarsAttr.java \
+ gnu/bytecodecvssnap/Location.java \
+ gnu/bytecodecvssnap/Method.java \
+ gnu/bytecodecvssnap/MiscAttr.java \
+ gnu/bytecodecvssnap/ObjectType.java \
+ gnu/bytecodecvssnap/PrimType.java \
+ gnu/bytecodecvssnap/Scope.java \
+ gnu/bytecodecvssnap/SourceDebugExtAttr.java \
+ gnu/bytecodecvssnap/SourceFileAttr.java \
+ gnu/bytecodecvssnap/SwitchState.java \
+ gnu/bytecodecvssnap/TryState.java \
+ gnu/bytecodecvssnap/Type.java \
+ gnu/bytecodecvssnap/VarEnumerator.java \
+ gnu/bytecodecvssnap/Variable.java \
+ gnu/bytecodecvssnap/ZipArchive.java \
+ gnu/bytecodecvssnap/ZipLoader.java \
+ gnu/bytecodecvssnap/dump.java
gnu_classpath_SRCS = \
gnu/classpath/ByteArray.java \
gnu/classpath/Pointer.java \
@@ -5943,12 +5943,12 @@
.PHONY: compile-classes classes
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/ gnu/classpath/tools/rmi/rmic/)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecodecvssnap/*.class -x gnu/classpath/tools/ gnu/classpath/tools/rmi/rmic/)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_icons))
-JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools org/objectweb)
+JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecodecvssnap gnu/classpath/tools org/objectweb)
.PHONY: jar-classes
if USE_PRECOMPILED_RT_JAR
@@ -5956,13 +5956,13 @@
rt.jar: $(PATH_TO_RT_JAR)
cp $< $@
-compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS)
+compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecodecvssnap_SRCS) $(gnu_classpath_tools_javap_SRCS)
rm -rf $(LIBDIR)
mkdir $(LIBDIR)
- $(SHELL) $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
+ $(SHELL) $(rebuildLib) $(gnu_bytecodecvssnap_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
echo timestamp > $(LIBDIR)/stamp
-tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecodecvssnap_SRCS)
rm -f tools.jar
$(JAR_CMD_TOOLS)
mv $@.new $@
@@ -5989,7 +5989,7 @@
$(JAR_CMD6)
mv $@.new $@
-# Put gnu.bytecode into tools.jar to avoid problems
+# Put gnu.bytecodecvssnap into tools.jar to avoid problems
# with applications using their own version of it.
tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
rm -f tools.jar
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.48 kaffe/libraries/javalib/Makefile.am.in:1.49
--- kaffe/libraries/javalib/Makefile.am.in:1.48 Fri Sep 16 19:17:51 2005
+++ kaffe/libraries/javalib/Makefile.am.in Wed Sep 21 01:42:10 2005
@@ -370,12 +370,12 @@
.PHONY: compile-classes classes
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/ gnu/classpath/tools/rmi/rmic/)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecodecvssnap/*.class -x gnu/classpath/tools/ gnu/classpath/tools/rmi/rmic/)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_icons))
-JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools org/objectweb)
+JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecodecvssnap gnu/classpath/tools org/objectweb)
.PHONY: jar-classes
if USE_PRECOMPILED_RT_JAR
@@ -383,13 +383,13 @@
rt.jar: $(PATH_TO_RT_JAR)
cp $< $@
-compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS)
+compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecodecvssnap_SRCS) $(gnu_classpath_tools_javap_SRCS)
rm -rf $(LIBDIR)
mkdir $(LIBDIR)
- $(SHELL) $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
+ $(SHELL) $(rebuildLib) $(gnu_bytecodecvssnap_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
echo timestamp > $(LIBDIR)/stamp
-tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecodecvssnap_SRCS)
rm -f tools.jar
$(JAR_CMD_TOOLS)
mv $@.new $@
@@ -416,7 +416,7 @@
$(JAR_CMD6)
mv $@.new $@
-# Put gnu.bytecode into tools.jar to avoid problems
+# Put gnu.bytecodecvssnap into tools.jar to avoid problems
# with applications using their own version of it.
tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
rm -f tools.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.486 kaffe/libraries/javalib/Makefile.in:1.487
--- kaffe/libraries/javalib/Makefile.in:1.486 Sat Sep 17 21:38:30 2005
+++ kaffe/libraries/javalib/Makefile.in Wed Sep 21 01:42:12 2005
@@ -422,7 +422,7 @@
$(gnu_CORBA_Interceptor_SRCS) \
$(gnu_CORBA_NamingService_SRCS) \
$(gnu_CORBA_Poa_SRCS) \
- $(gnu_bytecode_SRCS) \
+ $(gnu_bytecodecvssnap_SRCS) \
$(gnu_classpath_SRCS) \
$(gnu_classpath_debug_SRCS) \
$(gnu_classpath_jdwp_SRCS) \
@@ -932,51 +932,51 @@
gnu/CORBA/Poa/servantDelegate.java \
gnu/CORBA/Poa/vPolicy.java
-gnu_bytecode_SRCS = \
- gnu/bytecode/Access.java \
- gnu/bytecode/ArrayClassLoader.java \
- gnu/bytecode/ArrayType.java \
- gnu/bytecode/AttrContainer.java \
- gnu/bytecode/Attribute.java \
- gnu/bytecode/ClassFileInput.java \
- gnu/bytecode/ClassType.java \
- gnu/bytecode/ClassTypeWriter.java \
- gnu/bytecode/CodeAttr.java \
- gnu/bytecode/ConstantPool.java \
- gnu/bytecode/ConstantValueAttr.java \
- gnu/bytecode/CpoolClass.java \
- gnu/bytecode/CpoolEntry.java \
- gnu/bytecode/CpoolFloat.java \
- gnu/bytecode/CpoolNameAndType.java \
- gnu/bytecode/CpoolRef.java \
- gnu/bytecode/CpoolString.java \
- gnu/bytecode/CpoolUtf8.java \
- gnu/bytecode/CpoolValue1.java \
- gnu/bytecode/CpoolValue2.java \
- gnu/bytecode/ExceptionsAttr.java \
- gnu/bytecode/Field.java \
- gnu/bytecode/Filter.java \
- gnu/bytecode/IfState.java \
- gnu/bytecode/InnerClassesAttr.java \
- gnu/bytecode/Label.java \
- gnu/bytecode/LineNumbersAttr.java \
- gnu/bytecode/LocalVarsAttr.java \
- gnu/bytecode/Location.java \
- gnu/bytecode/Method.java \
- gnu/bytecode/MiscAttr.java \
- gnu/bytecode/ObjectType.java \
- gnu/bytecode/PrimType.java \
- gnu/bytecode/Scope.java \
- gnu/bytecode/SourceDebugExtAttr.java \
- gnu/bytecode/SourceFileAttr.java \
- gnu/bytecode/SwitchState.java \
- gnu/bytecode/TryState.java \
- gnu/bytecode/Type.java \
- gnu/bytecode/VarEnumerator.java \
- gnu/bytecode/Variable.java \
- gnu/bytecode/ZipArchive.java \
- gnu/bytecode/ZipLoader.java \
- gnu/bytecode/dump.java
+gnu_bytecodecvssnap_SRCS = \
+ gnu/bytecodecvssnap/Access.java \
+ gnu/bytecodecvssnap/ArrayClassLoader.java \
+ gnu/bytecodecvssnap/ArrayType.java \
+ gnu/bytecodecvssnap/AttrContainer.java \
+ gnu/bytecodecvssnap/Attribute.java \
+ gnu/bytecodecvssnap/ClassFileInput.java \
+ gnu/bytecodecvssnap/ClassType.java \
+ gnu/bytecodecvssnap/ClassTypeWriter.java \
+ gnu/bytecodecvssnap/CodeAttr.java \
+ gnu/bytecodecvssnap/ConstantPool.java \
+ gnu/bytecodecvssnap/ConstantValueAttr.java \
+ gnu/bytecodecvssnap/CpoolClass.java \
+ gnu/bytecodecvssnap/CpoolEntry.java \
+ gnu/bytecodecvssnap/CpoolFloat.java \
+ gnu/bytecodecvssnap/CpoolNameAndType.java \
+ gnu/bytecodecvssnap/CpoolRef.java \
+ gnu/bytecodecvssnap/CpoolString.java \
+ gnu/bytecodecvssnap/CpoolUtf8.java \
+ gnu/bytecodecvssnap/CpoolValue1.java \
+ gnu/bytecodecvssnap/CpoolValue2.java \
+ gnu/bytecodecvssnap/ExceptionsAttr.java \
+ gnu/bytecodecvssnap/Field.java \
+ gnu/bytecodecvssnap/Filter.java \
+ gnu/bytecodecvssnap/IfState.java \
+ gnu/bytecodecvssnap/InnerClassesAttr.java \
+ gnu/bytecodecvssnap/Label.java \
+ gnu/bytecodecvssnap/LineNumbersAttr.java \
+ gnu/bytecodecvssnap/LocalVarsAttr.java \
+ gnu/bytecodecvssnap/Location.java \
+ gnu/bytecodecvssnap/Method.java \
+ gnu/bytecodecvssnap/MiscAttr.java \
+ gnu/bytecodecvssnap/ObjectType.java \
+ gnu/bytecodecvssnap/PrimType.java \
+ gnu/bytecodecvssnap/Scope.java \
+ gnu/bytecodecvssnap/SourceDebugExtAttr.java \
+ gnu/bytecodecvssnap/SourceFileAttr.java \
+ gnu/bytecodecvssnap/SwitchState.java \
+ gnu/bytecodecvssnap/TryState.java \
+ gnu/bytecodecvssnap/Type.java \
+ gnu/bytecodecvssnap/VarEnumerator.java \
+ gnu/bytecodecvssnap/Variable.java \
+ gnu/bytecodecvssnap/ZipArchive.java \
+ gnu/bytecodecvssnap/ZipLoader.java \
+ gnu/bytecodecvssnap/dump.java
gnu_classpath_SRCS = \
gnu/classpath/ByteArray.java \
@@ -6619,12 +6619,12 @@
LIBDIR = lib
rebuildLib = ./rebuildLib
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/ gnu/classpath/tools/rmi/rmic/)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecodecvssnap/*.class -x gnu/classpath/tools/ gnu/classpath/tools/rmi/rmic/)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_icons))
-JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools org/objectweb)
+JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecodecvssnap gnu/classpath/tools org/objectweb)
all: all-recursive
.SUFFIXES:
@@ -7000,13 +7000,13 @@
@USE_PRECOMPILED_RT_JAR_TRUE at rt.jar: $(PATH_TO_RT_JAR)
@USE_PRECOMPILED_RT_JAR_TRUE@ cp $< $@
- at USE_PRECOMPILED_RT_JAR_TRUE@compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS)
+ at USE_PRECOMPILED_RT_JAR_TRUE@compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecodecvssnap_SRCS) $(gnu_classpath_tools_javap_SRCS)
@USE_PRECOMPILED_RT_JAR_TRUE@ rm -rf $(LIBDIR)
@USE_PRECOMPILED_RT_JAR_TRUE@ mkdir $(LIBDIR)
- at USE_PRECOMPILED_RT_JAR_TRUE@ $(SHELL) $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
+ at USE_PRECOMPILED_RT_JAR_TRUE@ $(SHELL) $(rebuildLib) $(gnu_bytecodecvssnap_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
@USE_PRECOMPILED_RT_JAR_TRUE@ echo timestamp > $(LIBDIR)/stamp
- at USE_PRECOMPILED_RT_JAR_TRUE@tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+ at USE_PRECOMPILED_RT_JAR_TRUE@tools.jar: $(LIBDIR)/stamp $(gnu_bytecodecvssnap_SRCS)
@USE_PRECOMPILED_RT_JAR_TRUE@ rm -f tools.jar
@USE_PRECOMPILED_RT_JAR_TRUE@ $(JAR_CMD_TOOLS)
@USE_PRECOMPILED_RT_JAR_TRUE@ mv $@.new $@
@@ -7031,7 +7031,7 @@
@USE_PRECOMPILED_RT_JAR_FALSE@ $(JAR_CMD6)
@USE_PRECOMPILED_RT_JAR_FALSE@ mv $@.new $@
-# Put gnu.bytecode into tools.jar to avoid problems
+# Put gnu.bytecodecvssnap into tools.jar to avoid problems
# with applications using their own version of it.
@USE_PRECOMPILED_RT_JAR_FALSE at tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
@USE_PRECOMPILED_RT_JAR_FALSE@ rm -f tools.jar
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.164 kaffe/libraries/javalib/all.files:1.165
--- kaffe/libraries/javalib/all.files:1.164 Fri Sep 16 22:25:20 2005
+++ kaffe/libraries/javalib/all.files Wed Sep 21 01:42:13 2005
@@ -11,50 +11,50 @@
com/jcraft/jzlib/ZOutputStream.java
com/jcraft/jzlib/ZStreamException.java
com/jcraft/jzlib/ZStream.java
-gnu/bytecode/Access.java
-gnu/bytecode/ArrayClassLoader.java
-gnu/bytecode/ArrayType.java
-gnu/bytecode/AttrContainer.java
-gnu/bytecode/Attribute.java
-gnu/bytecode/ClassFileInput.java
-gnu/bytecode/ClassType.java
-gnu/bytecode/ClassTypeWriter.java
-gnu/bytecode/CodeAttr.java
-gnu/bytecode/ConstantPool.java
-gnu/bytecode/ConstantValueAttr.java
-gnu/bytecode/CpoolClass.java
-gnu/bytecode/CpoolEntry.java
-gnu/bytecode/CpoolFloat.java
-gnu/bytecode/CpoolNameAndType.java
-gnu/bytecode/CpoolRef.java
-gnu/bytecode/CpoolString.java
-gnu/bytecode/CpoolUtf8.java
-gnu/bytecode/CpoolValue1.java
-gnu/bytecode/CpoolValue2.java
-gnu/bytecode/dump.java
-gnu/bytecode/ExceptionsAttr.java
-gnu/bytecode/Field.java
-gnu/bytecode/Filter.java
-gnu/bytecode/IfState.java
-gnu/bytecode/InnerClassesAttr.java
-gnu/bytecode/Label.java
-gnu/bytecode/LineNumbersAttr.java
-gnu/bytecode/LocalVarsAttr.java
-gnu/bytecode/Location.java
-gnu/bytecode/Method.java
-gnu/bytecode/MiscAttr.java
-gnu/bytecode/ObjectType.java
-gnu/bytecode/PrimType.java
-gnu/bytecode/Scope.java
-gnu/bytecode/SourceDebugExtAttr.java
-gnu/bytecode/SourceFileAttr.java
-gnu/bytecode/SwitchState.java
-gnu/bytecode/TryState.java
-gnu/bytecode/Type.java
-gnu/bytecode/VarEnumerator.java
-gnu/bytecode/Variable.java
-gnu/bytecode/ZipArchive.java
-gnu/bytecode/ZipLoader.java
+gnu/bytecodecvssnap/Access.java
+gnu/bytecodecvssnap/ArrayClassLoader.java
+gnu/bytecodecvssnap/ArrayType.java
+gnu/bytecodecvssnap/AttrContainer.java
+gnu/bytecodecvssnap/Attribute.java
+gnu/bytecodecvssnap/ClassFileInput.java
+gnu/bytecodecvssnap/ClassType.java
+gnu/bytecodecvssnap/ClassTypeWriter.java
+gnu/bytecodecvssnap/CodeAttr.java
+gnu/bytecodecvssnap/ConstantPool.java
+gnu/bytecodecvssnap/ConstantValueAttr.java
+gnu/bytecodecvssnap/CpoolClass.java
+gnu/bytecodecvssnap/CpoolEntry.java
+gnu/bytecodecvssnap/CpoolFloat.java
+gnu/bytecodecvssnap/CpoolNameAndType.java
+gnu/bytecodecvssnap/CpoolRef.java
+gnu/bytecodecvssnap/CpoolString.java
+gnu/bytecodecvssnap/CpoolUtf8.java
+gnu/bytecodecvssnap/CpoolValue1.java
+gnu/bytecodecvssnap/CpoolValue2.java
+gnu/bytecodecvssnap/dump.java
+gnu/bytecodecvssnap/ExceptionsAttr.java
+gnu/bytecodecvssnap/Field.java
+gnu/bytecodecvssnap/Filter.java
+gnu/bytecodecvssnap/IfState.java
+gnu/bytecodecvssnap/InnerClassesAttr.java
+gnu/bytecodecvssnap/Label.java
+gnu/bytecodecvssnap/LineNumbersAttr.java
+gnu/bytecodecvssnap/LocalVarsAttr.java
+gnu/bytecodecvssnap/Location.java
+gnu/bytecodecvssnap/Method.java
+gnu/bytecodecvssnap/MiscAttr.java
+gnu/bytecodecvssnap/ObjectType.java
+gnu/bytecodecvssnap/PrimType.java
+gnu/bytecodecvssnap/Scope.java
+gnu/bytecodecvssnap/SourceDebugExtAttr.java
+gnu/bytecodecvssnap/SourceFileAttr.java
+gnu/bytecodecvssnap/SwitchState.java
+gnu/bytecodecvssnap/TryState.java
+gnu/bytecodecvssnap/Type.java
+gnu/bytecodecvssnap/VarEnumerator.java
+gnu/bytecodecvssnap/Variable.java
+gnu/bytecodecvssnap/ZipArchive.java
+gnu/bytecodecvssnap/ZipLoader.java
gnu/classpath/ByteArray.java
gnu/classpath/debug/Component.java
gnu/classpath/debug/PreciseFilter.java
===================================================================
Checking out kaffe/libraries/javalib/gnu/bytecode/Access.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/bytecode/Attic/Access.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/gnu/bytecode/Access.java Wed Sep 21 01:47:33 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,82 +0,0 @@
-// Copyright (c) 1997 Per M.A. Bothner.
-// This is free software; for terms and warranty disclaimer see ./COPYING.
-
-package gnu.bytecode;
-
-/** Access flags. */
-/* When using JDK 1.1, replace this class by java.lang.reflec.Modifiers. */
-
-public class Access {
- static public final short PUBLIC = 0x0001;
- static public final short PRIVATE = 0x0002;
- static public final short PROTECTED = 0x0004;
- static public final short STATIC = 0x0008;
- static public final short FINAL = 0x0010;
- static public final short SUPER = 0x0020;
- static public final short SYNCHRONIZED= 0x0020;
- static public final short VOLATILE = 0x0040;
- static public final short BRIDGE = 0x0040;
- static public final short TRANSIENT = 0x0080;
- static public final short VARARGS = 0x0080;
- static public final short NATIVE = 0x0100;
- static public final short INTERFACE = 0x0200;
- static public final short ABSTRACT = 0x0400;
- static public final short STRICT = 0x0800;
- static public final short SYNTHETIC = 0x1000;
- static public final short ANNOTATION = 0x2000;
- static public final short ENUM = 0x4000;
- // unassigned 0x8000
-
- public static final short CLASS_MODIFIERS
- = (short)(PUBLIC|FINAL|SUPER|INTERFACE|ABSTRACT|SYNTHETIC|ANNOTATION|ENUM);
- public static final short FIELD_MODIFIERS
- = (short)(PUBLIC|PRIVATE|PROTECTED|STATIC|FINAL
- |VOLATILE|TRANSIENT|SYNTHETIC|ENUM);
- public static final short METHOD_MODIFIERS
- = (short)(PUBLIC|PRIVATE|PROTECTED|STATIC|FINAL|SYNCHRONIZED
- |BRIDGE|VARARGS|NATIVE|ABSTRACT|STRICT|SYNTHETIC);
-
- public static String toString(int flags)
- {
- return toString(flags, '\0');
- }
-
- /** Return a string naming the access bits in flags.
- * @param kind 'C' for a class, 'M' for a method, 'F' for a field.
- */
- public static String toString(int flags, char kind)
- {
- short mask
- = (kind == 'C' ? CLASS_MODIFIERS
- : kind == 'F' ? FIELD_MODIFIERS
- : kind == 'M' ? METHOD_MODIFIERS
- : (CLASS_MODIFIERS|FIELD_MODIFIERS|METHOD_MODIFIERS));
- short bad_flags = (short) (flags & ~mask);
- flags &= mask;
- StringBuffer buf = new StringBuffer();
- if ((flags & PUBLIC) != 0) buf.append(" public");
- if ((flags & PRIVATE) != 0) buf.append(" private");
- if ((flags & PROTECTED) != 0) buf.append(" protected");
- if ((flags & STATIC) != 0) buf.append(" static");
- if ((flags & FINAL) != 0) buf.append(" final");
- if ((flags & SYNCHRONIZED) != 0)
- buf.append(kind == 'C' ? " super" : " synchronized");
- if ((flags & VOLATILE) != 0)
- buf.append(kind == 'M' ? " bridge" : " volatile");
- if ((flags & TRANSIENT) != 0)
- buf.append(kind == 'M' ? " varargs" : " transient");
- if ((flags & NATIVE) != 0) buf.append(" native");
- if ((flags & INTERFACE) != 0) buf.append(" interface");
- if ((flags & ABSTRACT) != 0) buf.append(" abstract");
- if ((flags & STRICT) != 0) buf.append(" strict");
- if ((flags & ENUM) != 0) buf.append(" enum");
- if ((flags & SYNTHETIC) != 0) buf.append(" synthetic");
- if ((flags & ANNOTATION) != 0) buf.append(" annotation");
- if (bad_flags != 0)
- {
- buf.append(" unknown-flags:0x");
- buf.append(Integer.toHexString(bad_flags));
- }
- return buf.toString();
- }
-}
===================================================================
Checking out kaffe/libraries/javalib/gnu/bytecode/ArrayClassLoader.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/bytecode/Attic/ArrayClassLoader.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/gnu/bytecode/ArrayClassLoader.java Wed Sep 21 01:47:33 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,79 +0,0 @@
-package gnu.bytecode;
-import java.util.Hashtable;
-
-/** Load classes from a set of byte arrays.
- * @author Per Bothner
- */
-
-public class ArrayClassLoader extends ClassLoader
-{
- Hashtable map = new Hashtable(100);
-
- public ArrayClassLoader ()
- {
- }
-
- /** Load classes from the given byte arrays.
- By convention, the classes we manage are named "lambda"+<INTEGER>. */
- public ArrayClassLoader (byte[][] classBytes)
- {
- for (int i = classBytes.length; --i >= 0; )
- addClass("lambda" + i, classBytes[i]);
- }
-
- public ArrayClassLoader (String[] classNames, byte[][] classBytes)
- {
- for (int i = classBytes.length; --i >= 0; )
- addClass(classNames[i], classBytes[i]);
- }
-
- public void addClass(Class clas)
- {
- map.put(clas.getName(), clas);
- }
-
- public void addClass(String name, byte[] bytes)
- {
- map.put(name, bytes);
- }
-
- public void addClass (ClassType ctype)
- throws java.io.IOException
- {
- if ((ctype.flags & ClassType.EXISTING_CLASS) != 0)
- addClass(ctype. getReflectClass());
- else
- addClass(ctype.getName(), ctype.writeToArray());
- }
-
- public Class loadClass (String name, boolean resolve)
- throws ClassNotFoundException
- {
- Object r = map.get(name);
- Class clas;
- if (r == null)
- {
- clas = Class.forName(name);
- }
- else if (r instanceof byte[])
- {
- synchronized (this)
- {
- r = map.get(name);
- if (r instanceof byte[])
- {
- byte[] bytes = (byte[]) r;
- clas = defineClass (name, bytes, 0, bytes.length);
- map.put(name, clas);
- }
- else
- clas = (Class) r;
- }
- }
- else
- clas = (Class) r;
- if (resolve && clas != null)
- resolveClass (clas);
- return clas;
- }
-}
===================================================================
Checking out kaffe/libraries/javalib/gnu/bytecode/ArrayType.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/bytecode/Attic/ArrayType.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/gnu/bytecode/ArrayType.java Wed Sep 21 01:47:33 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,69 +0,0 @@
-// Copyright (c) 1997 Per M.A. Bothner.
-// This is free software; for terms and warranty disclaimer see ./COPYING.
-
-package gnu.bytecode;
-
-public class ArrayType extends ObjectType
-{
- public Type elements;
-
- public ArrayType (Type elements)
- {
- this(elements, elements.getName() + "[]");
- }
-
- ArrayType (Type elements, String name)
- {
- this_name = name;
- setSignature("[" + elements.getSignature());
- this.elements = elements;
- }
-
- public Type getImplementationType()
- {
- Type eltype = elements.getImplementationType();
- return elements == eltype ? this : make(eltype);
- }
-
- /** Name assumed to end with "[]". */
- static ArrayType make(String name)
- {
- Type elements = Type.getType(name.substring(0, name.length()-2));
- ArrayType array_type = elements.array_type;
- if (array_type == null)
- {
- array_type = new ArrayType(elements, name);
- elements.array_type = array_type;
- }
- return array_type;
- }
-
- /** Find or create an ArrayType for the specified element type. */
- public static ArrayType make(Type elements)
- {
- ArrayType array_type = elements.array_type;
- if (array_type == null)
- {
- array_type = new ArrayType(elements, elements.getName() + "[]");
- elements.array_type = array_type;
- }
- return array_type;
- }
-
- public Type getComponentType() { return elements; }
-
- public String getInternalName() { return getSignature(); }
-
- public int compare(Type other)
- {
- if (other == nullType)
- return 1;
- if (other instanceof ArrayType)
- return elements.compare(((ArrayType) other).elements);
- else if (other.getName().equals("java.lang.Object")
- || other == tostring_type)
- return -1;
- else
- return -3;
- }
-}
===================================================================
Checking out kaffe/libraries/javalib/gnu/bytecode/AttrContainer.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/bytecode/Attic/AttrContainer.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/gnu/bytecode/AttrContainer.java Wed Sep 21 01:47:33 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,15 +0,0 @@
-// Copyright (c) 1997 Per M.A. Bothner.
-// This is free software; for terms and warranty disclaimer see ./COPYING.
-
-package gnu.bytecode;
-
-/** An interface for objects that (may) contain Attribute objects. */
-
-public interface AttrContainer
-{
- /** Get the (first) Attribute of this container. */
- public Attribute getAttributes ();
-
- /** Set the (list of) Attributes of this container. */
- public void setAttributes (Attribute attribute);
-}
===================================================================
Checking out kaffe/libraries/javalib/gnu/bytecode/Attribute.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/bytecode/Attic/Attribute.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/gnu/bytecode/Attribute.java Wed Sep 21 01:47:33 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,163 +0,0 @@
-// Copyright (c) 1997 Per M.A. Bothner.
-// This is free software; for terms and warranty disclaimer see ./COPYING.
-
-package gnu.bytecode;
-import java.io.*;
-
-/**
- * Represents an Attribute of an AttrContainer.
- * <p>
- * Various sub-classses are used for standard attributes,
- * or you can use MiscAttr for a generic attribute.
- * @author Per Bothner
- */
-
-public abstract class Attribute
-{
- /** Every Attribute belongs to some AttrContainer object. */
- AttrContainer container;
- /** Return the Attribute container that contains this Attribute. */
- public final AttrContainer getContainer() { return container; }
- public final void setContainer(AttrContainer container)
- { this.container = container; }
-
- Attribute next;
- /** Get the next Attribute belonging to getContainer(). */
- public final Attribute getNext() { return next; }
- /** Set the next Attribute in the chain belonging to getContainer(). */
- public final void setNext(Attribute next) { this.next = next; }
-
- /** Add this to (the front of) of the specified attribute container. */
- public void addToFrontOf(AttrContainer container)
- {
- setContainer(container);
- setNext(container.getAttributes());
- container.setAttributes(this);
- }
-
- String name; // This is an interned string.
-
- // If > 0, the constant-pool index of name.
- // If -1, means attribute should be skipped on output.
- int name_index;
-
*** Patch too long, truncated ***
More information about the kaffe
mailing list