[kaffe] [RFC] A few fixes
Gwenole Beauchesne
gbeauchesne@mandrakesoft.com
Sun, 2 Jun 2002 09:23:54 +0200
Hi,
Though they don't fix my problem, that should not hurt.
Index: kaffe/kaffeh/support.c
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffeh/support.c,v
retrieving revision 1.25
diff -u -r1.25 support.c
--- kaffe/kaffeh/support.c 29 May 2002 22:58:43 -0000 1.25
+++ kaffe/kaffeh/support.c 2 Jun 2002 07:10:41 -0000
@@ -370,8 +370,8 @@
* Store enough info for the field attribute "ConstantValue"
handler (setFieldValue)
* to print the field name/signature/access.
*/
- f->name = (void*)((u4)name_index);
- f->type = (void*)((u4)signature_index);
+ f->name = (void*)((uintp)(u4)name_index);
+ f->type = (void*)((uintp)(u4)signature_index);
f->accflags = access_flags;
f->bsize = 0; /* not used by kaffeh */
f->info.idx = 0; /* not used by kaffeh */
@@ -450,8 +450,8 @@
assert(f);
/* Pull saved info out of field (see addField()) */
- name_index = (u2)(u4)(f->name);
- signature_index = (u2)(u4)(f->type);
+ name_index = (u2)(u4)(uintp)(f->name);
+ signature_index = (u2)(u4)(uintp)(f->type);
access_flags = f->accflags;
if (include != 0) {
Index: kaffe/kaffevm/exception.h
===================================================================
RCS file: /cvs/kaffe/kaffe/kaffe/kaffevm/exception.h,v
retrieving revision 1.18
diff -u -r1.18 exception.h
--- kaffe/kaffevm/exception.h 29 May 2002 19:46:24 -0000 1.18
+++ kaffe/kaffevm/exception.h 2 Jun 2002 07:10:41 -0000
@@ -40,7 +40,7 @@
struct _vmException* prev;
JTHREAD_DECLARE_JMPBUF (jbuf);
struct _methods* meth;
- u4 pc;
+ uintp pc;
struct Hjava_lang_Object* mobj;
} vmException;