[kaffe] libraries/clib/native/Field.c

[Jukka Santala]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

---559023410-1254324197-1020773591=:809
Content-Type: TEXT/PLAIN; charset=US-ASCII

static
void*
//getFieldAddress(Hjava_lang_reflect_Field* this, struct
Hjava_lang_Object* obj)
getFieldAddress(struct Hjava_lang_Object* obj, Hjava_lang_reflect_Field*
this)
{

I could not yet determine why exactly (not being able to run with debugger
does that to you), but getFieldAddress() in Field.c for some reason gets
the incoming parameters to it reversed. Since it's called by 

jint
Java_java_lang_reflect_Field_getInt0(struct Hjava_lang_reflect_Field *
this, struct Hjava_lang_Object* obj) 
{
        return (*(jint*)getFieldAddress(this, obj));
}

I don't immediately see why this should happen, but it does seem to
happen. Swapping the parameters aroudn as above seems to solve the
problem, but it's perhaps a good diea to figure out what's going on. It
seems the swapping-around only works for static fields; could it be the VM
is trying to pass the JNI environment or similiar first in the stack
bumping the rest of the addresses?

Attached a regression-test with some of the most basic Field tricks. The
variety of alternatives with different combinations to test is ofcourse
infinite, but I believe these are the ones Kaffe right now has most
potential trouble with. The expected results are from JDK 1.4, and I
notice Kaffe doesn't do as detailed exception reporting, so either the
expected outputs or exception reporting needs to be adjusted. Completely
untested remain inheritance, interfaces and reflection access control.

 -Jukka Santala

---559023410-1254324197-1020773591=:809
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="GetField.java"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.SOL.4.10.10205071513110.809@morphine.tml.hut.fi>
Content-Description: 
Content-Disposition: attachment; filename="GetField.java"

aW1wb3J0IGphdmEubGFuZy5yZWZsZWN0LkZpZWxkOw0KDQpjbGFzcyBTb21l
RmllbGRzIHsNCglwdWJsaWMgaW50IFNPTUUgPSAxMDsNCglwcm90ZWN0ZWQg
aW50IFBTT01FID0gMjA7DQp9DQoNCmNsYXNzIEdldEZpZWxkIHsNCglwdWJs
aWMgaW50IFRFU1QgPSAxMDsNCglwdWJsaWMgc3RhdGljIGludCBTVEVTVCA9
IDIwOw0KCXByaXZhdGUgc3RhdGljIGludCBQU1RFU1QgPSAzMDsNCglwdWJs
aWMgc3RhdGljIHZvaWQgbWFpbihTdHJpbmcgYXJnc1tdKSB7DQoJCUZpZWxk
IGZsZDsNCgkJQ2xhc3MgY2xzID0gR2V0RmllbGQuY2xhc3M7DQoJCXRyeSB7
DQoJCQlmbGQgPSBjbHMuZ2V0RmllbGQoIlRFU1QiKTsNCgkJCVN5c3RlbS5v
dXQucHJpbnRsbigicHVibGljOiAiK2ZsZC5nZXRJbnQoY2xzKSk7DQoJCX0g
Y2F0Y2ggKEV4Y2VwdGlvbiBlKSB7DQoJCQlTeXN0ZW0ub3V0LnByaW50bG4o
ZSk7DQoJCX0NCg0KCQl0cnkgew0KCQkJZmxkID0gY2xzLmdldEZpZWxkKCJT
VEVTVCIpOw0KCQkJU3lzdGVtLm91dC5wcmludGxuKCJwdWJsaWMgc3RhdGlj
OiAiK2ZsZC5nZXRJbnQoY2xzKSk7DQoJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBl
KSB7DQoJCQlTeXN0ZW0ub3V0LnByaW50bG4oZSk7DQoJCX0NCg0KCQl0cnkg
ew0KCQkJZmxkID0gY2xzLmdldEZpZWxkKCJQU1RFU1QiKTsNCgkJCVN5c3Rl
bS5vdXQucHJpbnRsbigicHJpdmF0ZTogIitmbGQuZ2V0SW50KGNscykpOw0K
CQl9IGNhdGNoIChFeGNlcHRpb24gZSkgew0KCQkJU3lzdGVtLm91dC5wcmlu
dGxuKGUpOw0KCQl9DQoNCgkJdHJ5IHsNCgkJCWZsZCA9IGNscy5nZXRGaWVs
ZCgiVEVTVCIpOw0KCQkJU3lzdGVtLm91dC5wcmludGxuKCJwdWJsaWMgZnJv
bSBudWxsOiAiK2ZsZC5nZXRJbnQobnVsbCkpOw0KCQl9IGNhdGNoIChFeGNl
cHRpb24gZSkgew0KCQkJU3lzdGVtLm91dC5wcmludGxuKGUpOw0KCQl9DQoN
CgkJdHJ5IHsNCgkJCWZsZCA9IGNscy5nZXRGaWVsZCgiU1RFU1QiKTsNCgkJ
CVN5c3RlbS5vdXQucHJpbnRsbigicHVibGljIHN0YXRpYyBmcm9tIG51bGw6
ICIrZmxkLmdldEludChudWxsKSk7DQoJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBl
KSB7DQoJCQlTeXN0ZW0ub3V0LnByaW50bG4oZSk7DQoJCX0NCg0KCQlTb21l
RmllbGRzIHNGaWVsZHMgPSBuZXcgU29tZUZpZWxkcygpOw0KCQljbHMgPSBT
b21lRmllbGRzLmNsYXNzOw0KCQl0cnkgew0KCQkJZmxkID0gY2xzLmdldEZp
ZWxkKCJTT01FIik7DQoJCQlTeXN0ZW0ub3V0LnByaW50bG4oIlNvbWVGaWVs
ZHMgcHVibGljOiAiK2ZsZC5nZXRJbnQoc0ZpZWxkcykpOw0KCQl9IGNhdGNo
IChFeGNlcHRpb24gZSkgew0KCQkJU3lzdGVtLm91dC5wcmludGxuKGUpOw0K
CQl9DQoNCgkJdHJ5IHsNCgkJCWZsZCA9IGNscy5nZXRGaWVsZCgiUFNPTUUi
KTsNCgkJCVN5c3RlbS5vdXQucHJpbnRsbigiU29tZUZpZWxkcyBwcm90ZWN0
ZWQ6ICIrZmxkLmdldEludChzRmllbGRzKSk7DQoJCX0gY2F0Y2ggKEV4Y2Vw
dGlvbiBlKSB7DQoJCQlTeXN0ZW0ub3V0LnByaW50bG4oZSk7DQoJCX0NCgl9
DQp9DQoNCi8qIEV4cGVjdGVkIE91dHB1dDoNCmphdmEubGFuZy5JbGxlZ2Fs
QXJndW1lbnRFeGNlcHRpb24NCnB1YmxpYyBzdGF0aWM6IDIwDQpqYXZhLmxh
bmcuTm9TdWNoRmllbGRFeGNlcHRpb246IFBTVEVTVA0KamF2YS5sYW5nLk51
bGxQb2ludGVyRXhjZXB0aW9uDQpwdWJsaWMgc3RhdGljIGZyb20gbnVsbDog
MjANClNvbWVGaWVsZHMgcHVibGljOiAxMA0KamF2YS5sYW5nLk5vU3VjaEZp
ZWxkRXhjZXB0aW9uOiBQU09NRQ0KKi8NCg==
---559023410-1254324197-1020773591=:809--