ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-09 14:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'wip' of oss.readytalk.com:/var/local/git/avian into wip

Browse Source
This commit is contained in:
jet 2009-11-05 11:16:58 -07:00
commit 2f54eb5e55
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.txt
View File

@ -376,7 +376,7 @@ EOF
Step 5: Run ProGuard with stage1 as input and stage2 as output. Step 5: Run ProGuard with stage1 as input and stage2 as output.
$ java -jar ../../proguard4.3/lib/proguard.jar \ $ java -jar ../../proguard4.4/lib/proguard.jar \
-injars stage1 -outjars stage2 @../vm.pro @hello.pro -injars stage1 -outjars stage2 @../vm.pro @hello.pro
(note: pass -dontusemixedcaseclassnames to ProGuard when building on (note: pass -dontusemixedcaseclassnames to ProGuard when building on

2
src/compiler.cpp
View File

@ -1008,7 +1008,7 @@ deadWord(Context* c, Value* v)
Value* nextWord = v->nextWord; Value* nextWord = v->nextWord;
assert(c, nextWord != v); assert(c, nextWord != v);
for (SiteIterator it(c, v); it.hasMore();) { for (SiteIterator it(c, v, true, false); it.hasMore();) {
Site* s = it.next(); Site* s = it.next();
if (s->registerSize(c) > BytesPerWord) { if (s->registerSize(c) > BytesPerWord) {

14
src/jnienv.cpp
View File

@ -41,6 +41,19 @@ AttachCurrentThread(Machine* m, Thread** t, void*)
return 0; return 0;
} }
jint JNICALL
AttachCurrentThreadAsDaemon(Machine* m, Thread** t, void* parameters)
{
*t = static_cast<Thread*>(m->localThread->get());
if (*t == 0) {
AttachCurrentThread(m, t, parameters);
ENTER(*t, Thread::ActiveState);
setDaemon(*t, (*t)->javaThread, true);
}
return 0;
}
jint JNICALL jint JNICALL
DetachCurrentThread(Machine* m) DetachCurrentThread(Machine* m)
{ {
@ -1902,6 +1915,7 @@ populateJNITables(JavaVMVTable* vmTable, JNIEnvVTable* envTable)
vmTable->DestroyJavaVM = DestroyJavaVM; vmTable->DestroyJavaVM = DestroyJavaVM;
vmTable->AttachCurrentThread = AttachCurrentThread; vmTable->AttachCurrentThread = AttachCurrentThread;
vmTable->AttachCurrentThreadAsDaemon = AttachCurrentThreadAsDaemon;
vmTable->DetachCurrentThread = DetachCurrentThread; vmTable->DetachCurrentThread = DetachCurrentThread;
vmTable->GetEnv = GetEnv; vmTable->GetEnv = GetEnv;