ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 12:28:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix native method lookup for fast calling convention on Windows

Browse Source
This commit is contained in:
Joel Dice 2009-05-31 14:41:07 -06:00
parent 01f302d4b5
commit ace985b390
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/process.cpp
View File

@ -149,7 +149,7 @@ resolveNativeMethod(Thread* t, const char* undecorated, const char* decorated)
void*
resolveNativeMethod(Thread* t, object method, const char* prefix,
unsigned prefixLength)
unsigned prefixLength, int footprint UNUSED)
{
unsigned undecoratedSize = prefixLength + jniNameLength(t, method, false);
char undecorated[undecoratedSize + 1 + 6]; // extra 6 is for code below
@ -166,9 +166,11 @@ resolveNativeMethod(Thread* t, object method, const char* prefix,
#ifdef __MINGW32__
// on windows, we also try the _%s@%d and %s@%d variants
unsigned footprint = methodParameterFootprint(t, method) + 1;
if (methodFlags(t, method) & ACC_STATIC) {
++ footprint;
if (footprint == -1) {
footprint = methodParameterFootprint(t, method) + 1;
if (methodFlags(t, method) & ACC_STATIC) {
++ footprint;
}
}
*undecorated = '_';
@ -201,12 +203,12 @@ namespace vm {
void*
resolveNativeMethod(Thread* t, object method)
{
void* p = ::resolveNativeMethod(t, method, "Java_", 5);
void* p = ::resolveNativeMethod(t, method, "Java_", 5, -1);
if (p) {
return p;
}
p = ::resolveNativeMethod(t, method, "Avian_", 6);
p = ::resolveNativeMethod(t, method, "Avian_", 6, 3);
if (p) {
methodVmFlags(t, method) |= FastNative;
return p;