[kaffe] CVS kaffe (guilhem): More fixlet for getField & ConstSlot.

[Kaffe CVS]

PatchSet 5613 
Date: 2005/03/26 19:11:04
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
More fixlet for getField & ConstSlot.

        * kaffe/kaffevm/lookup.c
        (getField): Update cname with the class name contained in the pool
        if getClass fails.

        * kaffe/kaffevm/constants.h: ConstSlot should be uintp as most of
        constants are pointers.

Members: 
	ChangeLog:1.3785->1.3786 
	kaffe/kaffevm/constants.h:1.8->1.9 
	kaffe/kaffevm/lookup.c:1.44->1.45 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3785 kaffe/ChangeLog:1.3786
--- kaffe/ChangeLog:1.3785	Sat Mar 26 18:46:31 2005
+++ kaffe/ChangeLog	Sat Mar 26 19:11:04 2005
@@ -1,6 +1,15 @@
 2005-03-26  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/lookup.c
+	(getField): Update cname with the class name contained in the pool
+	if getClass fails.
+
+	* kaffe/kaffevm/constants.h: ConstSlot should be uintp as most of
+	constants are pointers.
+
+2005-03-26  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/lookup.c
 	(getField): Use the resolved class name to get the name.
 
 	Reported by:  Daniel Bonniot  <Daniel.Bonniot at inria.fr>
Index: kaffe/kaffe/kaffevm/constants.h
diff -u kaffe/kaffe/kaffevm/constants.h:1.8 kaffe/kaffe/kaffevm/constants.h:1.9
--- kaffe/kaffe/kaffevm/constants.h:1.8	Mon Nov  3 05:29:31 2003
+++ kaffe/kaffe/kaffevm/constants.h	Sat Mar 26 19:11:07 2005
@@ -39,7 +39,7 @@
 
 #define WORD2UTF(WORD) ((Utf8Const*) (WORD))
 
-typedef jword ConstSlot;
+typedef uintp ConstSlot;
 
 typedef struct _constants {
 	u4		size;
Index: kaffe/kaffe/kaffevm/lookup.c
diff -u kaffe/kaffe/kaffevm/lookup.c:1.44 kaffe/kaffe/kaffevm/lookup.c:1.45
--- kaffe/kaffe/kaffevm/lookup.c:1.44	Sat Mar 26 18:46:34 2005
+++ kaffe/kaffe/kaffevm/lookup.c	Sat Mar 26 19:11:07 2005
@@ -270,6 +270,7 @@
 
 	class = getClass(ci, this, einfo);
 	if (class == NULL) {
+		ret->cname = WORD2UTF(pool->data[ci]);
 		return (false);
 	}