From e1b871ecc12b6c2a7b62a64ffbbd0714ab8d5c56 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Thu, 24 May 2007 20:40:47 +0000 Subject: java-interp.h (_Jv_InterpFrame::get_pc): Only deduct one when pc_ptr is non-NULL. * 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 --- libjava/prims.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libjava/prims.cc') diff --git a/libjava/prims.cc b/libjava/prims.cc index c2ecaf1..706ab4b 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -1,6 +1,6 @@ // prims.cc - Code for core of runtime environment. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation This file is part of libgcj. @@ -1522,6 +1522,9 @@ parse_init_args (JvVMInitArgs* vm_args) { return -1; } + + // Mark JVMTI active + JVMTI::enabled = true; } continue; @@ -1564,6 +1567,8 @@ parse_init_args (JvVMInitArgs* vm_args) return -1; } + // Mark JVMTI active + JVMTI::enabled = true; continue; } else if (vm_args->ignoreUnrecognized) -- cgit v1.1