From 9832dc03cb0155a0ecc8f3811b7e12295fbd5f19 Mon Sep 17 00:00:00 2001
From: kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 31 Aug 2006 22:37:48 +0000
Subject: [PATCH] * include/jvmti.h: Update from Classpath to get
latest fixes and improvements.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116610 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/classpath/ChangeLog.gcj | 5 +++++
libjava/classpath/include/jvmti.h | 26 +++++++++++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index adac6b7f02bf..ee73bdb8ef75 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2006-08-31 Keith Seitz <keiths@redhat.com>
+
+ * include/jvmti.h: Update from Classpath to get latest fixes and
+ improvements.
+
2006-08-29 Gary Benson <gbenson@redhat.com>
* java/net/SocketPermission.java
diff --git a/libjava/classpath/include/jvmti.h b/libjava/classpath/include/jvmti.h
index 23419f92074e..b26f7932e54a 100644
--- a/libjava/classpath/include/jvmti.h
+++ b/libjava/classpath/include/jvmti.h
@@ -45,6 +45,8 @@ exception statement from your version. */
#define _CLASSPATH_JVMTI_H
#include <jni.h>
+#include "jvmti_md.h"
+
/* The VM might define JVMTI base types */
#ifndef _CLASSPATH_VM_JVMTI_TYPES_DEFINED
@@ -79,7 +81,7 @@ typedef struct _jvmtiAddrLocationMap jvmtiAddrLocationMap;
#ifdef __cplusplus
typedef struct _Jv_JVMTIEnv jvmtiEnv;
#else
-typedef const struct _Jv_jvmtiEnv jvmtiEnv;
+typedef const struct _Jv_jvmtiEnv *jvmtiEnv;
#endif
/*
@@ -140,7 +142,7 @@ typedef enum
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70,
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71,
JVMTI_ERROR_MUST_POSSESS_CAPABILITY = 99,
- JVMTI_ERROR_ILLEGAL_ARGUMENT = 103,
+ JVMTI_ERROR_ILLEGAL_ARGUMENT = 103
} jvmtiError;
/*
@@ -283,7 +285,7 @@ typedef enum
JVMTI_EVENT_EXCEPTION_CATCH = 59,
JVMTI_EVENT_SINGLE_STEP = 60,
JVMTI_EVENT_FRAME_POP = 61,
- JVMTI_EVENT_BERAKPOINT = 62,
+ JVMTI_EVENT_BREAKPOINT = 62,
JVMTI_EVENT_FIELD_ACCESS = 63,
JVMTI_EVENT_FIELD_MODIFICATION = 64,
JVMTI_EVENT_METHOD_ENTRY = 65,
@@ -658,7 +660,8 @@ struct _Jv_jvmtiEnv
jthread thread);
jvmtiError (JNICALL *StopThread) (jvmtiEnv *env,
- jthread thread);
+ jthread thread,
+ jobject exception);
jvmtiError (JNICALL *InterruptThread) (jvmtiEnv *env,
jthread thread);
@@ -790,7 +793,8 @@ struct _Jv_jvmtiEnv
jrawMonitorID monitor);
jvmtiError (JNICALL *RawMonitorWait) (jvmtiEnv *env,
- jrawMonitorID monitor);
+ jrawMonitorID monitor,
+ jlong millis);
jvmtiError (JNICALL *RawMonitorNotify) (jvmtiEnv *env,
jrawMonitorID monitor);
@@ -844,7 +848,7 @@ struct _Jv_jvmtiEnv
jvmtiError (JNICALL *GetSourceFileName) (jvmtiEnv *env,
jclass klass,
- char *source_name_ptr);
+ char **source_name_ptr);
jvmtiError (JNICALL *GetClassModifiers) (jvmtiEnv *env,
jclass klass,
@@ -1249,8 +1253,8 @@ class _Jv_JVMTIEnv
jvmtiError ResumeThread (jthread thread)
{ return p->ResumeThread (this, thread); }
- jvmtiError StopThread (jthread thread)
- { return p->StopThread (this, thread); }
+ jvmtiError StopThread (jthread thread, jobject exception)
+ { return p->StopThread (this, thread, exception); }
jvmtiError InterruptThread (jthread thread)
{ return p->InterruptThread (this, thread); }
@@ -1360,8 +1364,8 @@ class _Jv_JVMTIEnv
jvmtiError RawMonitorExit (jrawMonitorID monitor)
{ return p->RawMonitorExit (this, monitor); }
- jvmtiError RawMonitorWait (jrawMonitorID monitor)
- { return p->RawMonitorWait (this, monitor); }
+ jvmtiError RawMonitorWait (jrawMonitorID monitor, jlong millis)
+ { return p->RawMonitorWait (this, monitor, millis); }
jvmtiError RawMonitorNotify (jrawMonitorID monitor)
{ return p->RawMonitorNotify (this, monitor); }
@@ -1400,7 +1404,7 @@ class _Jv_JVMTIEnv
jvmtiError GetClassStatus (jclass klass, jint *status_ptr)
{ return p->GetClassStatus (this, klass, status_ptr); }
- jvmtiError GetSourceFileName (jclass klass, char *source_name_ptr)
+ jvmtiError GetSourceFileName (jclass klass, char **source_name_ptr)
{ return p->GetSourceFileName (this, klass, source_name_ptr); }
jvmtiError GetClassModifiers (jclass klass, jint *modifiers_ptr)
--
GitLab