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

verify.c (verify_jvm_instructions): Better error msgs for dup.

Browse Source 
* verify.c (verify_jvm_instructions):  Better error msgs for dup.
	(type_stack_dup):  Remove no-longer neded error check.

From-SVN: r40529
This commit is contained in:
Per Bothner 2001-03-15 20:16:54 -08:00 committed by Per Bothner
parent 3b3a1054d9
commit 19f8e04bff
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-13 Per Bothner <per@bothner.com>
* verify.c (verify_jvm_instructions): Better error msgs for dup.
(type_stack_dup): Remove no-longer neded error check.
2001-03-15 Bryce McKinlay <bryce@albatross.co.nz> 2001-03-15 Bryce McKinlay <bryce@albatross.co.nz>
* mangle.c (mangle_record_type): Rename 'from_pointer' argument * mangle.c (mangle_record_type): Rename 'from_pointer' argument

20
gcc/java/verify.c
View File

@ -294,8 +294,6 @@ type_stack_dup (size, offset)
{ {
tree type[4]; tree type[4];
int index; int index;
if (size + offset > stack_pointer)
error ("stack underflow - dup* operation");
for (index = 0; index < size + offset; index++) for (index = 0; index < size + offset; index++)
{ {
type[index] = stack_type_map[stack_pointer - 1]; type[index] = stack_type_map[stack_pointer - 1];
@ -923,12 +921,18 @@ verify_jvm_instructions (jcf, byte_ops, length)
case OPCODE_new: case OPCODE_new:
PUSH_TYPE (get_class_constant (jcf, IMMEDIATE_u2)); PUSH_TYPE (get_class_constant (jcf, IMMEDIATE_u2));
break; break;
case OPCODE_dup: type_stack_dup (1, 0); break; case OPCODE_dup: wide = 1; index = 0; goto dup;
case OPCODE_dup_x1: type_stack_dup (1, 1); break; case OPCODE_dup_x1: wide = 1; index = 1; goto dup;
case OPCODE_dup_x2: type_stack_dup (1, 2); break; case OPCODE_dup_x2: wide = 1; index = 2; goto dup;
case OPCODE_dup2: type_stack_dup (2, 0); break; case OPCODE_dup2: wide = 2; index = 0; goto dup;
case OPCODE_dup2_x1: type_stack_dup (2, 1); break; case OPCODE_dup2_x1: wide = 2; index = 1; goto dup;
case OPCODE_dup2_x2: type_stack_dup (2, 2); break; case OPCODE_dup2_x2: wide = 2; index = 2; goto dup;
dup:
if (wide + index > stack_pointer)
VERIFICATION_ERROR ("stack underflow - dup* operation");
type_stack_dup (wide, index);
wide = 0;
break;
case OPCODE_pop: index = 1; goto pop; case OPCODE_pop: index = 1; goto pop;
case OPCODE_pop2: index = 2; goto pop; case OPCODE_pop2: index = 2; goto pop;
pop: pop: