FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

java-interp.h (_Jv_InterpFrame::get_pc): Only deduct one when pc_ptr is non-NULL.

Browse source 
* include/java-interp.h (_Jv_InterpFrame::get_pc): Only deduct
        one when pc_ptr is non-NULL.

        * prims.cc (parse_init_args): Enable JVMTI with agentlib
        and agentpath options.

        * testsuite/lib/libjava.exp (exec_gij): Add new addl_flags
        parameter.
        * testsuite/libjava.jvmti/jvmti-interp.exp (gij_jvmti_test_one):
        Pass '-agentlib:dummyagent' when executing gij.
        (gij_jvmti_run): Build dummy JVMTI agent before running tests,
        and remove it when finished.
        * testsuite/libjava.jvmti/dummyagent.c: New file.

From-SVN: r125040
This commit is contained in:
Keith Seitz 2007-05-24 20:40:47 +00:00 • committed by Keith Seitz
parent ef9cc8efb4
commit e1b871ecc1
6 changed files with 53 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/testsuite/lib/libjava.exp
View file

@ -1,4 +1,4 @@
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation
proc load_gcc_lib { filename } {
global srcdir
@ -494,7 +494,7 @@ proc gcj_invoke {program expectFile ld_library_additions} {
}
}
proc exec_gij {jarfile expectFile ld_library_additions} {
proc exec_gij {jarfile expectFile {ld_library_additions {}} {addl_flags {}}} {
global env
global libjava_ld_library_path
global ld_library_path
@ -512,9 +512,9 @@ proc exec_gij {jarfile expectFile ld_library_additions} {
set gij [libjava_find_gij]
set classname [file rootname [file tail $jarfile]]
puts "LD_LIBRARY_PATH=. $gij -cp $jarfile $classname"
puts "LD_LIBRARY_PATH=. $gij -cp $jarfile $addl_flags $classname"
set result [libjava_load $gij "-cp $jarfile $classname"]
set result [libjava_load $gij "-cp $jarfile $addl_flags $classname"]
set status [lindex $result 0]
set output [lindex $result 1]