PatchSet 4508
Date: 2004/03/11 16:00:05
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Small fixes for JVMPI
2004-03-11 Jon Nall <[EMAIL PROTECTED]>
* kaffe/jvmpi/Makefile.am:
Fixed typo.
* kaffe/jvmpi/Makefile.in:
Regenerated.
* kaffe/jvmpi/jvmpi_kaffe.c:
Updated to new interfaces.
* kaffe/kaffevm/systems/unix-jthreads/jthread.c:
Fixed typo.
Members:
ChangeLog:1.2087->1.2088
kaffe/jvmpi/Makefile.am:1.5->1.6
kaffe/jvmpi/Makefile.in:1.23->1.24
kaffe/jvmpi/jvmpi_kaffe.c:1.3->1.4
kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.107->1.108
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2087 kaffe/ChangeLog:1.2088
--- kaffe/ChangeLog:1.2087 Thu Mar 11 15:33:16 2004
+++ kaffe/ChangeLog Thu Mar 11 16:00:05 2004
@@ -1,4 +1,18 @@
-2004-03-08 Dalibor Topic <[EMAIL PROTECTED]>
+2004-03-11 Jon Nall <[EMAIL PROTECTED]>
+
+ * kaffe/jvmpi/Makefile.am:
+ Fixed typo.
+
+ * kaffe/jvmpi/Makefile.in:
+ Regenerated.
+
+ * kaffe/jvmpi/jvmpi_kaffe.c:
+ Updated to new interfaces.
+
+ * kaffe/kaffevm/systems/unix-jthreads/jthread.c:
+ Fixed typo.
+
+2004-03-11 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath
Index: kaffe/kaffe/jvmpi/Makefile.am
diff -u kaffe/kaffe/jvmpi/Makefile.am:1.5 kaffe/kaffe/jvmpi/Makefile.am:1.6
--- kaffe/kaffe/jvmpi/Makefile.am:1.5 Thu Jan 15 02:29:29 2004
+++ kaffe/kaffe/jvmpi/Makefile.am Thu Mar 11 16:00:07 2004
@@ -5,7 +5,7 @@
libkaffejvmpi_la_LDFLAGS = \
-export-dynamic \
- -release $(PACKAGE_PERSION)
+ -release $(PACKAGE_VERSION)
libkaffejvmpi_la_DEPENDENCIES = \
$(LIBLTDL) \
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.23 kaffe/kaffe/jvmpi/Makefile.in:1.24
--- kaffe/kaffe/jvmpi/Makefile.in:1.23 Mon Mar 8 21:21:03 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Thu Mar 11 16:00:08 2004
@@ -315,7 +315,7 @@
lib_LTLIBRARIES = libkaffejvmpi.la
libkaffejvmpi_la_LDFLAGS = \
-export-dynamic \
- -release $(PACKAGE_PERSION)
+ -release $(PACKAGE_VERSION)
libkaffejvmpi_la_DEPENDENCIES = \
$(LIBLTDL) \
Index: kaffe/kaffe/jvmpi/jvmpi_kaffe.c
diff -u kaffe/kaffe/jvmpi/jvmpi_kaffe.c:1.3 kaffe/kaffe/jvmpi/jvmpi_kaffe.c:1.4
--- kaffe/kaffe/jvmpi/jvmpi_kaffe.c:1.3 Sat Oct 11 20:45:48 2003
+++ kaffe/kaffe/jvmpi/jvmpi_kaffe.c Thu Mar 11 16:00:08 2004
@@ -182,8 +182,8 @@
assert(tid != NULL);
ev->event_type = JVMPI_EVENT_THREAD_START;
- if( (name = stringCharArray2Java(unhand_char_array(tid->name),
- obj_length(tid->name))) != NULL )
+ if( (name = stringCharArray2Java(unhand_char_array(tid->name->value),
+ tid->name->count)) != NULL )
{
ev->u.thread_start.thread_name = stringJava2C(name);
}
@@ -571,14 +571,14 @@
cl = (struct Hjava_lang_Class *)arg;
jvmpi_methods = alloca(sizeof(JVMPI_Method) *
- cl->nmethods);
+ CLASS_NMETHODS(cl));
jvmpi_fields = alloca(sizeof(JVMPI_Field) *
- (cl->nsfields +
- cl->nfields));
+ (CLASS_NSFIELDS(cl) +
+ CLASS_NFIELDS(cl)));
ev.u.class_load.methods = jvmpi_methods;
ev.u.class_load.statics = &jvmpi_fields[0];
ev.u.class_load.instances =
- &jvmpi_fields[cl->nsfields];
+ &jvmpi_fields[CLASS_NSFIELDS(cl)];
jvmpiFillClassLoad(&ev, cl);
ev.event_type |= JVMPI_REQUESTED_EVENT;
jvmpiPostEvent(&ev);
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.107
kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.108
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.107 Sun Feb 1 22:14:54
2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c Thu Mar 11 16:00:08 2004
@@ -2602,7 +2602,7 @@
/*
* Check if thread is interrupted.
*/
-int jthread_is_intrerrupted(jthread_t jt)
+int jthread_is_interrupted(jthread_t jt)
{
return (jt->flags & THREAD_FLAGS_INTERRUPTED);
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
