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

verify.cc (_Jv_BytecodeVerifier::get_ushort): Use `jint' for temporary values.

Browse Source 
* verify.cc (_Jv_BytecodeVerifier::get_ushort): Use `jint' for
	temporary values.
	(_Jv_BytecodeVerifier::get_short): Likewise.
	(_Jv_BytecodeVerifier::get_int): Likewise.
	(_Jv_BytecodeVerifier::check_return_type): Reverse ordering of
	`compatible' call.

From-SVN: r47161
This commit is contained in:
Tom Tromey 2001-11-19 01:04:15 +00:00 committed by Tom Tromey
parent e7b35eec24
commit 590077b070
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,5 +1,12 @@
2001-11-18 Tom Tromey <tromey@redhat.com>
* verify.cc (_Jv_BytecodeVerifier::get_ushort): Use `jint' for
temporary values.
(_Jv_BytecodeVerifier::get_short): Likewise.
(_Jv_BytecodeVerifier::get_int): Likewise.
(_Jv_BytecodeVerifier::check_return_type): Reverse ordering of
`compatible' call.
* verify.cc (_Jv_BytecodeVerifier::pop_type): Put PC into error
message.
(_Jv_BytecodeVerifier::pop64): Likewise.

20
libjava/verify.cc
View File

@ -946,25 +946,25 @@ private:
jint get_ushort ()
{
jbyte b1 = get_byte ();
jbyte b2 = get_byte ();
jint b1 = get_byte ();
jint b2 = get_byte ();
return (jint) ((b1 << 8) | b2) & 0xffff;
}
jint get_short ()
{
jbyte b1 = get_byte ();
jbyte b2 = get_byte ();
jint b1 = get_byte ();
jint b2 = get_byte ();
jshort s = (b1 << 8) | b2;
return (jint) s;
}
jint get_int ()
{
jbyte b1 = get_byte ();
jbyte b2 = get_byte ();
jbyte b3 = get_byte ();
jbyte b4 = get_byte ();
jint b1 = get_byte ();
jint b2 = get_byte ();
jint b3 = get_byte ();
jint b4 = get_byte ();
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
}
@ -1644,10 +1644,10 @@ private:
return get_one_type (p);
}
void check_return_type (type expected)
void check_return_type (type onstack)
{
type rt = compute_return_type (current_method->self->signature);
if (! expected.compatible (rt))
if (! rt.compatible (onstack))
verify_fail ("incompatible return type", start_PC);
}