diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-16 04:16:54 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-16 04:16:54 +0000 |
| commit | cf72b3af7a2c3fef9a14f77be0c5612e4aaad390 (patch) | |
| tree | 62cdac72d14e1cc7f91e0f2082d9bfeca1e692cf /gcc/java/verify.c | |
| parent | 067307575caf2148f498edcbb482c0821c15f68a (diff) | |
| download | gcc-cf72b3af7a2c3fef9a14f77be0c5612e4aaad390.tar.gz | |
* verify.c (verify_jvm_instructions): Better error msgs for dup.
(type_stack_dup): Remove no-longer neded error check.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40529 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/verify.c')
| -rw-r--r-- | gcc/java/verify.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gcc/java/verify.c b/gcc/java/verify.c index 5ac1d057e5c..bb10b447c95 100644 --- a/gcc/java/verify.c +++ b/gcc/java/verify.c @@ -294,8 +294,6 @@ type_stack_dup (size, offset) { tree type[4]; int index; - if (size + offset > stack_pointer) - error ("stack underflow - dup* operation"); for (index = 0; index < size + offset; index++) { type[index] = stack_type_map[stack_pointer - 1]; @@ -923,12 +921,18 @@ verify_jvm_instructions (jcf, byte_ops, length) case OPCODE_new: PUSH_TYPE (get_class_constant (jcf, IMMEDIATE_u2)); break; - case OPCODE_dup: type_stack_dup (1, 0); break; - case OPCODE_dup_x1: type_stack_dup (1, 1); break; - case OPCODE_dup_x2: type_stack_dup (1, 2); break; - case OPCODE_dup2: type_stack_dup (2, 0); break; - case OPCODE_dup2_x1: type_stack_dup (2, 1); break; - case OPCODE_dup2_x2: type_stack_dup (2, 2); break; + case OPCODE_dup: wide = 1; index = 0; goto dup; + case OPCODE_dup_x1: wide = 1; index = 1; goto dup; + case OPCODE_dup_x2: wide = 1; index = 2; goto dup; + case OPCODE_dup2: wide = 2; index = 0; goto dup; + case OPCODE_dup2_x1: wide = 2; index = 1; goto dup; + 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_pop2: index = 2; goto pop; pop: |