[kaffe] picky patch

[gonzo]

  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.

--Boundary_(ID_7C8solpj0NiYLckV72mw0A)
Content-type: TEXT/PLAIN; charset=US-ASCII

Hi all.

in code-analyze.[ch], the methods are currently entitles "verifyMethod",
"verifyBasicBlock", "tidyVerifyMethod", etc., and these are called from
intrp/machine.c, jit/machine.c, and jit3/machine.c to perform code
analysis before compilation (from intrp i think they are actually expected
to verify the soundness of the bytecode, which will be totally unecessary
once a full link-time verifier is added).  the methods that are called for
actual link-time verification are verify2 and verify3 in verify.c.

to avoid confusing the compiler, in my working copy of kaffe i've renamed
the methods in code-analyze.[ch] analyzeMethod, analyzeBasicBlock, etc.,
and every time i upgrade to a newer version of CVS i have to patch the
names.

so, if anyone has the heart to check in this patch that simply renames the
methods in question (to more appropriate names, IMHO), it would make my
life easier and make the method names a little more meaningful :)


cheers,
~rob

--Boundary_(ID_7C8solpj0NiYLckV72mw0A)
Content-id: <Pine.OSF.4.10.10302041226260.394326@calliope.williams.edu>
Content-type: TEXT/PLAIN; charset=US-ASCII; name="code-analyze_patch.diff"
Content-transfer-encoding: BASE64
Content-disposition: attachment; filename="code-analyze_patch.diff"
Content-description:

LS0tIGthZmZlL2thZmZldm0vY29kZS1hbmFseXNlLk9SSUcuaAkyMDAzLTAy
LTA0IDExOjI0OjA5LjAwMDAwMDAwMCAtMDUwMA0KKysrIGthZmZlL2thZmZl
dm0vY29kZS1hbmFseXNlLmgJMjAwMy0wMi0wNCAxMToyNDo0OS4wMDAwMDAw
MDAgLTA1MDANCkBAIC0xNjEsNyArMTYxLDcgQEANCiAJCUZSQU1FKHBjKSA9
IEFMTE9DRlJBTUUoKTsJCQlcDQogCQlpZiAoIUZSQU1FKHBjKSkgewkJCQlc
DQogCQkJbWV0aC0+YWNjZmxhZ3MgJj0gfkFDQ19WRVJJRklFRDsJXA0KLQkJ
CXRpZHlWZXJpZnlNZXRob2QoJmNvZGVJbmZvKTsJCVwNCisJCQl0aWR5QW5h
bHl6ZU1ldGhvZCgmY29kZUluZm8pOwkJXA0KIAkJCXBvc3RPdXRPZk1lbW9y
eShlaW5mbyk7CQkJXA0KIAkJCXJldHVybiBmYWxzZTsJCQkJXA0KIAkJfQkJ
CQkJCVwNCkBAIC0yNTIsOCArMjUyLDggQEANCiAJCQkJCUxDTChMKS51c2Vk
ID0gMQ0KIA0KIHN0cnVjdCBfbWV0aG9kczsNCi1ib29sIHZlcmlmeU1ldGhv
ZChzdHJ1Y3QgX21ldGhvZHMqLCBjb2RlaW5mbyoqLCBlcnJvckluZm8qKTsN
Ci12b2lkIHRpZHlWZXJpZnlNZXRob2QoY29kZWluZm8qKik7DQorYm9vbCBh
bmFseXplTWV0aG9kKHN0cnVjdCBfbWV0aG9kcyosIGNvZGVpbmZvKiosIGVy
cm9ySW5mbyopOw0KK3ZvaWQgdGlkeUFuYWx5emVNZXRob2QoY29kZWluZm8q
Kik7DQogDQogZXh0ZXJuIGNvbnN0IHVpbnQ4IGluc25MZW5bXTsNCiANCi0t
LSBrYWZmZS9rYWZmZXZtL2NvZGUtYW5hbHlzZS5PUklHLmMJMjAwMy0wMi0w
MyAyMjozNDo1MC4wMDAwMDAwMDAgLTA1MDANCisrKyBrYWZmZS9rYWZmZXZt
L2NvZGUtYW5hbHlzZS5jCTIwMDMtMDItMDQgMTE6MjE6NDAuMDAwMDAwMDAw
IC0wNTAwDQpAQCAtNTMsMTIgKzUzLDEyIEBADQogfTsNCiANCiBzdGF0aWMg
dm9pZCBtZXJnZUZyYW1lKGNvZGVpbmZvKiwgaW50LCBpbnQsIGZyYW1lRWxl
bWVudCosIE1ldGhvZCopOw0KLXN0YXRpYyBib29sIHZlcmlmeUJhc2ljQmxv
Y2soY29kZWluZm8qLCBNZXRob2QqLCBpbnQzMiwgZXJyb3JJbmZvKik7DQor
c3RhdGljIGJvb2wgYW5hbHl6ZUJhc2ljQmxvY2soY29kZWluZm8qLCBNZXRo
b2QqLCBpbnQzMiwgZXJyb3JJbmZvKik7DQogc3RhdGljIHZvaWQgdXBkYXRl
TG9jYWxzKGNvZGVpbmZvKiwgaW50MzIsIGZyYW1lRWxlbWVudCopOw0KLXN0
YXRpYyBib29sIHZlcmlmeUNhdGNoQ2xhdXNlKGpleGNlcHRpb25FbnRyeSos
IEhqYXZhX2xhbmdfQ2xhc3MqLCBlcnJvckluZm8qKTsNCitzdGF0aWMgYm9v
bCBhbmFseXplQ2F0Y2hDbGF1c2UoamV4Y2VwdGlvbkVudHJ5KiwgSGphdmFf
bGFuZ19DbGFzcyosIGVycm9ySW5mbyopOw0KIA0KIGJvb2wNCi12ZXJpZnlN
ZXRob2QoTWV0aG9kKiBtZXRoLCBjb2RlaW5mbyAqKnBjb2RlaW5mbywgZXJy
b3JJbmZvICplaW5mbykNCithbmFseXplTWV0aG9kKE1ldGhvZCogbWV0aCwg
Y29kZWluZm8gKipwY29kZWluZm8sIGVycm9ySW5mbyAqZWluZm8pDQogew0K
IAlpbnQzMiBwYzsNCiAJaW50MzIgdGFicGM7DQpAQCAtMjY4LDcgKzI2OCw3
IEBADQogCQkJZW50cnkgPSAmKG1ldGgtPmV4Y2VwdGlvbl90YWJsZS0+ZW50
cnlbbGNsXSk7DQogCQkJDQogCQkJLyogVmVyaWZ5IGNhdGNoIGNsYXVzZSBl
eGNlcHRpb24gaGFzIHZhbGlkIHR5cGUuICovDQotCQkJc3VjYyA9IHZlcmlm
eUNhdGNoQ2xhdXNlKGVudHJ5LCBtZXRoLT5jbGFzcywgZWluZm8pOw0KKwkJ
CXN1Y2MgPSBhbmFseXplQ2F0Y2hDbGF1c2UoZW50cnksIG1ldGgtPmNsYXNz
LCBlaW5mbyk7DQogCQkJaWYgKHN1Y2MgPT0gZmFsc2UpIHsNCiAJCQkJcmV0
dXJuIGZhbHNlOw0KIAkJCX0NCkBAIC0zNDAsMTEgKzM0MCwxMSBAQA0KIAkJ
Zm9yIChiY3VyciA9IGJoZWFkOyBiY3VyciAhPSBOVUxMOyBiY3VyciA9IGJj
dXJyLT5uZXh0QkIpIHsNCiAJCQlwYyA9IGJjdXJyIC0gY29kZUluZm8tPnBl
clBDOw0KIAkJCWlmIChJU19ORUVEVkVSSUZZKHBjKSkgew0KLQkJCQlmYWls
ZWQgPSB2ZXJpZnlCYXNpY0Jsb2NrKGNvZGVJbmZvLCBtZXRoLCANCisJCQkJ
ZmFpbGVkID0gYW5hbHl6ZUJhc2ljQmxvY2soY29kZUluZm8sIG1ldGgsIA0K
IAkJCQkJCQkgICAgcGMsIGVpbmZvKTsNCiANCiAJCQkJaWYgKGZhaWxlZCkg
ew0KLQkJCQkJdGlkeVZlcmlmeU1ldGhvZChwY29kZWluZm8pOw0KKwkJCQkJ
dGlkeUFuYWx5emVNZXRob2QocGNvZGVpbmZvKTsNCiAJCQkJCXJldHVybiAo
ZmFsc2UpOw0KIAkJCQl9DQogCQkJCXJlcnVuID0gdHJ1ZTsNCkBAIC0zNjgs
NyArMzY4LDcgQEANCiANCiBzdGF0aWMNCiBib29sDQotdmVyaWZ5QmFzaWNC
bG9jayhjb2RlaW5mbyogY29kZUluZm8sIE1ldGhvZCogbWV0aCwgaW50MzIg
cGMsIGVycm9ySW5mbyAqZWluZm8pDQorYW5hbHl6ZUJhc2ljQmxvY2soY29k
ZWluZm8qIGNvZGVJbmZvLCBNZXRob2QqIG1ldGgsIGludDMyIHBjLCBlcnJv
ckluZm8gKmVpbmZvKQ0KIHsNCiAJaW50MzIgdGFicGM7DQogCWludDMyIGlk
eDsNCkBAIC0yMDM1LDcgKzIwMzUsNyBAQA0KICAqIFRpZHkgdXAgYWZ0ZXIg
dmVyZmljYXRpb24gZGF0YSBoYXMgYmVlbiBmaW5pc2hlZCB3aXRoLg0KICAq
Lw0KIHZvaWQNCi10aWR5VmVyaWZ5TWV0aG9kKGNvZGVpbmZvKiogY29kZUlu
Zm8pDQordGlkeUFuYWx5emVNZXRob2QoY29kZWluZm8qKiBjb2RlSW5mbykN
CiB7DQogCWludCBwYzsNCiANCkBAIC0yMTAwLDcgKzIxMDAsNyBAQA0KICAq
IChlLmcuIGEgc3RhY2sgb3ZlcmZsb3cpLg0KICAqLw0KIHN0YXRpYyBib29s
DQotdmVyaWZ5Q2F0Y2hDbGF1c2UoamV4Y2VwdGlvbkVudHJ5KiBlcHRyLCBI
amF2YV9sYW5nX0NsYXNzKiBjbGFzcywgZXJyb3JJbmZvICplaW5mbykNCith
bmFseXplQ2F0Y2hDbGF1c2UoamV4Y2VwdGlvbkVudHJ5KiBlcHRyLCBIamF2
YV9sYW5nX0NsYXNzKiBjbGFzcywgZXJyb3JJbmZvICplaW5mbykNCiB7DQog
CWlmKCBlcHRyLT5jYXRjaF9pZHggPT0gMCApIHsNCiAJCS8qIEEgZmluYWxs
eSBjbGF1c2UuLi4gKi8NCi0tLSBrYWZmZS9rYWZmZXZtL2ludHJwL21hY2hp
bmUuT1JJRy5jCTIwMDMtMDItMDQgMTE6NDA6NDcuMDAwMDAwMDAwIC0wNTAw
DQorKysga2FmZmUva2FmZmV2bS9pbnRycC9tYWNoaW5lLmMJMjAwMy0wMi0w
NCAxMTo0MToxNi4wMDAwMDAwMDAgLTA1MDANCkBAIC0xNDEsMTEgKzE0MSwx
MSBAQA0KIAkJcmV0dXJuOw0KIAl9DQogDQotCS8qIFZlcmlmeSBtZXRob2Qg
aWYgcmVxdWlyZWQgKi8NCisJLyogQW5hbHl6ZSBtZXRob2QgaWYgcmVxdWly
ZWQgKi8NCiAJaWYgKChtZXRoYWNjZmxhZ3MgJiBBQ0NfVkVSSUZJRUQpID09
IDApIHsNCiAJCWNvZGVpbmZvKiBjb2RlSW5mbzsNCi0JCWJvb2wgc3VjY2Vz
cyA9IHZlcmlmeU1ldGhvZChtZXRoLCAmY29kZUluZm8sICZlaW5mbyk7DQot
CQl0aWR5VmVyaWZ5TWV0aG9kKCZjb2RlSW5mbyk7DQorCQlib29sIHN1Y2Nl
c3MgPSBhbmFseXplTWV0aG9kKG1ldGgsICZjb2RlSW5mbywgJmVpbmZvKTsN
CisJCXRpZHlBbmFseXplTWV0aG9kKCZjb2RlSW5mbyk7DQogCQlpZiAoc3Vj
Y2VzcyA9PSBmYWxzZSkgew0KIAkJCXRocm93RXJyb3IoJmVpbmZvKTsNCiAJ
CX0NCi0tLSBrYWZmZS9rYWZmZXZtL2ppdC9tYWNoaW5lLk9SSUcuYwkyMDAz
LTAyLTA0IDExOjQxOjUwLjAwMDAwMDAwMCAtMDUwMA0KKysrIGthZmZlL2th
ZmZldm0vaml0L21hY2hpbmUuYwkyMDAzLTAyLTA0IDExOjQyOjAyLjAwMDAw
MDAwMCAtMDUwMA0KQEAgLTI0MSw3ICsyNDEsNyBAQA0KIAl9DQogDQogCS8q
IFNjYW4gdGhlIGNvZGUgYW5kIGRldGVybWluZSB0aGUgYmFzaWMgYmxvY2tz
ICovDQotCXN1Y2Nlc3MgPSB2ZXJpZnlNZXRob2QobWV0aCwgJmNvZGVJbmZv
LCBlaW5mbyk7DQorCXN1Y2Nlc3MgPSBhbmFseXplTWV0aG9kKG1ldGgsICZj
b2RlSW5mbywgZWluZm8pOw0KIAlpZiAoc3VjY2VzcyA9PSBmYWxzZSkgew0K
IAkJZ290byBkb25lMzsNCiAJfQ0KQEAgLTM5NSw3ICszOTUsNyBAQA0KIAlp
bnN0YWxsTWV0aG9kQ29kZShjb2RlSW5mbywgbWV0aCwgJm5jb2RlKTsNCiAN
CiBkb25lOg0KLQl0aWR5VmVyaWZ5TWV0aG9kKCZjb2RlSW5mbyk7DQorCXRp
ZHlBbmFseXplTWV0aG9kKCZjb2RlSW5mbyk7DQogDQogREJHKEpJVCwNCiAJ
ZHByaW50ZigiVHJhbnNsYXRlZCAlcy4lcyVzICglcykgJXBcbiIsIG1ldGgt
PmNsYXNzLT5uYW1lLT5kYXRhLCANCi0tLSBrYWZmZS9rYWZmZXZtL2ppdDMv
bWFjaGluZS5PUklHLmMJMjAwMy0wMi0wNCAxMTo0MjoxOC4wMDAwMDAwMDAg
LTA1MDANCisrKyBrYWZmZS9rYWZmZXZtL2ppdDMvbWFjaGluZS5jCTIwMDMt
MDItMDQgMTE6NDI6MjkuMDAwMDAwMDAwIC0wNTAwDQpAQCAtMTYxLDcgKzE2
MSw3IEBADQogCX0NCiANCiAJLyogU2NhbiB0aGUgY29kZSBhbmQgZGV0ZXJt
aW5lIHRoZSBiYXNpYyBibG9ja3MgKi8NCi0Jc3VjY2VzcyA9IHZlcmlmeU1l
dGhvZCh4bWV0aCwgJm15Y29kZUluZm8sIGVpbmZvKTsNCisJc3VjY2VzcyA9
IGFuYWx5emVNZXRob2QoeG1ldGgsICZteWNvZGVJbmZvLCBlaW5mbyk7DQog
CWlmIChzdWNjZXNzID09IGZhbHNlKSB7DQogCQlnb3RvIGRvbmUzOw0KIAl9
DQpAQCAtMzYwLDcgKzM2MCw3IEBADQogCWluc3RhbGxNZXRob2RDb2RlKDAs
IHhtZXRoLCAmbmNvZGUpOw0KIA0KIGRvbmU6Ow0KLQl0aWR5VmVyaWZ5TWV0
aG9kKCZjb2RlSW5mbyk7DQorCXRpZHlBbmFseXplTWV0aG9kKCZjb2RlSW5m
byk7DQogDQogCXJlaW52b2tlID0gZmFsc2U7DQogDQo=

--Boundary_(ID_7C8solpj0NiYLckV72mw0A)--