This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: recognize 1.6 bytecode
- From: Tom Tromey <tromey at redhat dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Mon, 17 Sep 2007 10:07:48 -0600
- Subject: Patch: FYI: recognize 1.6 bytecode
- Reply-to: tromey at redhat dot com
I'm checking this in.
Even though we don't implement the new verification technique, I don't
think there is any reason to reject 1.6 bytecode.
Tom
ChangeLog:
2007-09-17 Tom Tromey <tromey@redhat.com>
* defineclass.cc (MAJOR_1_6): New define.
(MINOR_1_6): Likewise.
(_Jv_ClassReader::parse): Handle 1.6 bytecode.
Index: defineclass.cc
===================================================================
--- defineclass.cc (revision 128478)
+++ defineclass.cc (working copy)
@@ -359,6 +359,8 @@
#define MINOR_1_4 0
#define MAJOR_1_5 49
#define MINOR_1_5 0
+#define MAJOR_1_6 50
+#define MINOR_1_6 0
void
_Jv_ClassReader::parse ()
@@ -369,10 +371,10 @@
int minor_version = read2u ();
int major_version = read2u ();
- if (major_version < MAJOR_1_1 || major_version > MAJOR_1_5
- || (major_version == MAJOR_1_5 && minor_version > MINOR_1_5))
+ if (major_version < MAJOR_1_1 || major_version > MAJOR_1_6
+ || (major_version == MAJOR_1_6 && minor_version > MINOR_1_6))
throw_class_format_error ("unrecognized class file version");
- is_15 = (major_version == MAJOR_1_5);
+ is_15 = (major_version >= MAJOR_1_5);
pool_count = read2u ();