aboutsummaryrefslogtreecommitdiff
path: root/libjava/verify.cc
AgeCommit message (Collapse)AuthorFilesLines
2002-01-24verify.cc (is_assignable_from_slow): If source is an interface, we must also ↵Per Bothner1-1/+3
check the superclass. * verify.cc (is_assignable_from_slow): If source is an interface, we must also check the superclass. From-SVN: r49189
2001-12-10resolve.cc (_Jv_PrepareClass): Verify method here...Tom Tromey1-28/+83
* resolve.cc (_Jv_PrepareClass): Verify method here... * defineclass.cc (handleMethodsEnd): ... not here. * verify.cc (_Jv_BytecodeVerifier::initialize_stack): New method. (_Jv_BytecodeVerifier::verify_instructions_0) [op_return]: Ensure there are no uninitialized objects. (_Jv_BytecodeVerifier::state::this_type): New field. (_Jv_BytecodeVerifier::state::state): Initialize this_type. (_Jv_BytecodeVerifier::state::copy): Copy this_type. (_Jv_BytecodeVerifier::state::merge): Merge this_type. (_Jv_BytecodeVerifier::state::check_no_uninitialized_objects): Handle this_type. (_Jv_BytecodeVerifier::state::check_this_initialized): New method. (_Jv_BytecodeVerifier::state::set_initialized): Handle this_type. (_Jv_BytecodeVerifier::state::set_this_type): New method. (_Jv_BytecodeVerifier::verify_instructions_0) [op_putfield]: Allow assignment to fields of `this' before another initializer is run. From-SVN: r47826
2001-12-09verify.cc (_Jv_BytecodeVerifier::is_assignable_from_slow): Handle case of ↵Tom Tromey1-6/+8
array whose component type is not prepared. * verify.cc (_Jv_BytecodeVerifier::is_assignable_from_slow): Handle case of array whose component type is not prepared. From-SVN: r47799
2001-12-07verify.cc (_Jv_BytecodeVerifier::branch_prepass): Set start_PC earlier, for ↵Tom Tromey1-3/+8
error handling. * verify.cc (_Jv_BytecodeVerifier::branch_prepass): Set start_PC earlier, for error handling. (_Jv_BytecodeVerifier::note_branch_target): Fixed branch target check. From-SVN: r47769
2001-12-07verify.cc (_Jv_BytecodeVerifier::FLAG_JSR_TARGET): Removed.Tom Tromey1-2/+0
* verify.cc (_Jv_BytecodeVerifier::FLAG_JSR_TARGET): Removed. (_Jv_BytecodeVerifier::note_branch_target): Likewise. From-SVN: r47745
2001-12-06verify.cc (_Jv_BytecodeVerifier::type_val): Added unused_by_subroutine_type.Tom Tromey1-19/+182
* verify.cc (_Jv_BytecodeVerifier::type_val): Added unused_by_subroutine_type. (_Jv_BytecodeVerifier::type::merge): Handle unused_by_subroutine_type. (_Jv_BytecodeVerifier::state::state): Added `ret_semantics' argument. (_Jv_BytecodeVerifier::state::copy): Likewise. (_Jv_BytecodeVerifier::push_jump_merge): Pass `ret_semantics' to state constructor. (_Jv_BytecodeVerifier::state::is_unmerged_ret_state): New method. (_Jv_BytecodeVerifier::pop_jump): Don't accept a jump which is from an unmerged ret. (_Jv_BytecodeVerifier::verify_instructions_0): Don't let an unmerged ret state skip verification in the fall-through case. (debug_print): New function. (_Jv_BytecodeVerifier::type::print): New method. (_Jv_BytecodeVerifier::state::print): New method. (_Jv_BytecodeVerifier::push_jump_merge): Print state. (_Jv_BytecodeVerifier::verify_instructions_0): Likewise. (_Jv_BytecodeVerifier::get_variable): Don't call note_variable. (_Jv_BytecodeVerifier::_Jv_BytecodeVerifier): Print debug information. From-SVN: r47734
2001-12-04verify.cc (_Jv_BytecodeVerifier::linked_utf8): New structure.Tom Tromey1-4/+45
* verify.cc (_Jv_BytecodeVerifier::linked_utf8): New structure. (_Jv_BytecodeVerifier::utf8_list): New field. (_Jv_BytecodeVerifier::_Jv_BytecodeVerifier): Initialize it. (_Jv_BytecodeVerifier::~_Jv_BytecodeVerifier): Free it. (_Jv_BytecodeVerifier::make_utf8_const): New method. (_Jv_BytecodeVerifier::get_one_type): Use it. (_Jv_BytecodeVerifier::type::merge): When using local semantics, if the destination type is already unsuitable then we didn't change. From-SVN: r47634
2001-12-04defineclass.cc (read_one_method_attribute): `end_pc' for an exception can be ↵Tom Tromey1-33/+55
equal to code length. * defineclass.cc (read_one_method_attribute): `end_pc' for an exception can be equal to code length. * verify.cc (_Jv_BytecodeVerifier::verify_instructions_0): Removed `start_PC' from error invocation where it didn't make sense, and updated error message. Use `copy' to copy a state. Only try to merge current state with saved state when we've fallen through from the previous instruction. (_Jv_BytecodeVerifier::pop_ref_or_return): New method. (_Jv_BytecodeVerifier::verify_instructions_0) [op_astore_0]: Use pop_ref_or_return. (_Jv_BytecodeVerifier::verify_instructions_0) [op_astore]: Likewise. (_Jv_BytecodeVerifier::push_jump_merge): Pass max_locals, not max_stack, to merge. (_Jv_BytecodeVerifier::verify_instructions_0): Likewise. (_Jv_BytecodeVerifier::push_jump_merge): Merge from new state into state at branch target, not vice versa. (_Jv_BytecodeVerifier::branch_prepass): Allow end of exception to be equal to code length. Removed redundant test to see if exception start is after exception end. (_Jv_BytecodeVerifier::verify_instructions_0): Type of argument to `finally' is Throwable. From-SVN: r47623
2001-12-04defineclass.cc (handleMethodsEnd): Invoke verifier here...Tom Tromey1-2/+2
* defineclass.cc (handleMethodsEnd): Invoke verifier here... (handleCodeAttribute): ... not here. * verify.cc (_Jv_BytecodeVerifier::state::state): Use `copy', not structure assignment. From-SVN: r47591
2001-11-25verify.cc (_Jv_BytecodeVerifier::branch_prepass): Use java_opcode as type ↵Tom Tromey1-8/+8
for switch. * verify.cc (_Jv_BytecodeVerifier::branch_prepass): Use java_opcode as type for switch. [op_wide]: Likewise. (_Jv_BytecodeVerifier::verify_instructions_0): Likewise. [op_invokevirtual]: Likewise. * include/java-insns.h (java_opcode): Give enum a name. From-SVN: r47330
2001-11-20verify.cc (_Jv_BytecodeVerifier::branch_prepass): Uses two operand bytes, ↵Tom Tromey1-6/+6
not one. * verify.cc (_Jv_BytecodeVerifier::branch_prepass) [op_iinc]: Uses two operand bytes, not one. [op_arraylength]: Has no operands in bytecode. (_Jv_BytecodeVerifier::push_jump): Fixed call to check_no_uninitialized_objects. (_Jv_BytecodeVerifier::push_exception_jump): Likewise. (_Jv_BytecodeVerifier::handle_ret_insn): Likewise. (_Jv_BytecodeVerifier::handle_jsr_insn): Likewise. From-SVN: r47202
2001-11-20verify.cc (_Jv_BytecodeVerifier::require_array_type): Special case for ↵Tom Tromey1-3/+13
boolean arrays. * verify.cc (_Jv_BytecodeVerifier::require_array_type): Special case for boolean arrays. * verify.cc (_Jv_BytecodeVerifier::compute_jump): Put PC into error message. From-SVN: r47190
2001-11-19verify.cc (_Jv_BytecodeVerifier::verify_instructions_0): Shift argument is ↵Tom Tromey1-3/+6
an int, not a long. * verify.cc (_Jv_BytecodeVerifier::verify_instructions_0) [op_lshl, op_lshr, op_lushr]: Shift argument is an int, not a long. From-SVN: r47177
2001-11-19verify.cc (type::to_array): New method.Tom Tromey1-1/+18
* verify.cc (type::to_array): New method. (_Jv_BytecodeVerifier::verify_instructions_0) [op_anewarray]: Construct new array type. From-SVN: r47165
2001-11-19verify.cc (_Jv_BytecodeVerifier::branch_prepass): Skip a short, not a byte.Tom Tromey1-2/+2
* verify.cc (_Jv_BytecodeVerifier::branch_prepass) [op_sipush]: Skip a short, not a byte. [op_newarray]: Skip a byte, not a short. From-SVN: r47163
2001-11-19verify.cc (_Jv_BytecodeVerifier::get_type_val_for_signature): Added `B' case.Tom Tromey1-0/+3
* verify.cc (_Jv_BytecodeVerifier::get_type_val_for_signature): Added `B' case. From-SVN: r47162
2001-11-19verify.cc (_Jv_BytecodeVerifier::get_ushort): Use `jint' for temporary values.Tom Tromey1-10/+10
* 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
2001-11-19verify.cc (_Jv_BytecodeVerifier::pop_type): Put PC into error message.Tom Tromey1-12/+16
* verify.cc (_Jv_BytecodeVerifier::pop_type): Put PC into error message. (_Jv_BytecodeVerifier::pop64): Likewise. (_Jv_BytecodeVerifier::pop32): Likewise. (_Jv_BytecodeVerifier::pop_raw): Likewise. (_Jv_BytecodeVerifier::pop_type): Promote the match type. (type::set_initialized): Only modify uninitialized types. (type::set_uninitialized): Fix shadowing bug. Simplify code. From-SVN: r47158
2001-11-18verify.cc: Include StringBuffer.h.Tom Tromey1-41/+80
* verify.cc: Include StringBuffer.h. (verify_fail): Added pc argument. Use StringBuffer to construct exception message. (_Jv_BytecodeVerifier::verify_instructions_0): Put PC into error message. (_Jv_BytecodeVerifier::check_return_type): Likewise. (_Jv_BytecodeVerifier::handle_field_or_method): Likewise. (_Jv_BytecodeVerifier::check_constant): Likewise. (_Jv_BytecodeVerifier::check_class_constant): Likewise. (_Jv_BytecodeVerifier::check_pool_index): Likewise. (_Jv_BytecodeVerifier::get_variable): Likewise. (_Jv_BytecodeVerifier::branch_prepass): Likewise. Also, correctly check exception handler endpoint. (_Jv_BytecodeVerifier::verify_instructions_0): Correctly handle wide arguments to current method. (_Jv_BytecodeVerifier::check_wide_constant): New method. (_Jv_BytecodeVerifier::verify_instructions_0) [op_ldc2_w]: Use it. From-SVN: r47155
2001-11-16verify.cc (_Jv_BytecodeVerifier::check_field_constant): Handle case where ↵Tom Tromey1-1/+3
field has primitive type. * verify.cc (_Jv_BytecodeVerifier::check_field_constant): Handle case where field has primitive type. From-SVN: r47112
2001-11-16verify.cc (_Jv_BytecodeVerifier::is_assignable_from_slow): New method.Tom Tromey1-8/+56
* verify.cc (_Jv_BytecodeVerifier::is_assignable_from_slow): New method. (type::compatible): Use it. (type::merge): Likewise. (type::promote): Return a `type&'. (get_one_type): Promote return value. From-SVN: r47097
2001-11-16verify.cc (type::compatible): Use _Jv_IsAssignableFrom.Tom Tromey1-2/+6
* verify.cc (type::compatible): Use _Jv_IsAssignableFrom. (type::merge): Likewise. From-SVN: r47077
2001-11-15verify.cc (class _Jv_BytecodeVerifier): Fixed logic.Tom Tromey1-18/+70
* verify.cc (class _Jv_BytecodeVerifier) [op_dup2]: Fixed logic. [op_dup_x2]: Likewise. [op_dup2_x1]: Likewise. [op_dup2_x2]: Likewise. (branch_prepass): Added `op_newarray' case. Updated unrecognized instruction error. (verify_instructions_0): Updated unrecognized instruction error. From-SVN: r47033
2001-11-09* verify.cc: Wrap in #ifdef INTERPRETER...#endif.Jeff Sturm1-0/+4
From-SVN: r46882
2001-11-07* verify.cc (skip_padding): Fail if padding byte is nonzero.Tom Tromey1-1/+2
From-SVN: r46830
2001-11-05Class.h (Class): Made _Jv_BytecodeVerifier a friend.Tom Tromey1-0/+2436
* java/lang/Class.h (Class): Made _Jv_BytecodeVerifier a friend. * Makefile.in: Rebuilt. * Makefile.am (libgcj_la_SOURCES): Added verify.cc. * verify.cc: New file. * include/java-interp.h (_Jv_count_arguments): Declare. (_Jv_VerifyMethod): Likewise. (class _Jv_InterpMethod): Made _Jv_BytecodeVerifier a friend. (class _Jv_InterpException): Likewise. * resolve.cc (_Jv_count_arguments): Renamed from count_arguments. No longer static. Updated callers. * defineclass.cc (int_bits_to_float): Removed. (long_bits_to_double): Likewise. (prepare_pool_entry): Updated. (handleCodeAttribute): Verify method (commented out for now). From-SVN: r46796
generated by cgit v1.1 at 2025-06-05 16:48:50 +0000