defineclass.cc (MAJOR_1_6): New define.

	* defineclass.cc (MAJOR_1_6): New define.
	(MINOR_1_6): Likewise.
	(_Jv_ClassReader::parse): Handle 1.6 bytecode.

From-SVN: r128551

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 53c1b54d84f75a3f62d007ff47ecebe3b9effa75..5cc87d9200e3aea0d1b064478f7b94b44f28220e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2007-09-12  David Daney  <ddaney@avtrex.com>
 
        * configure.host: Enable interpreter for mips64.  Enable hash

diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 2024fb6440dd8ba88fd1b2b6eeaff2d0e85d6749..3416c4680714826555f5980d6d6ea9818b056a66 100644 (file)
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -359,6 +359,8 @@ _Jv_DefineClass (jclass klass, jbyteArray data, jint offset, jint length,
 #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 @@ _Jv_ClassReader::parse ()
 
   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 ();