OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2007-09-17 16:30:46 +00:00 committed by Tom Tromey
parent a08a5751bb
commit be661bcec2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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

8
libjava/defineclass.cc
View File

@ -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 ();