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 'master' into compiler

Browse Source
This commit is contained in:
Joel Dice 2008-04-17 14:52:23 -06:00
commit 4d5a57671a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtin.cpp
View File

@ -713,6 +713,8 @@ Java_java_lang_Thread_interrupt(Thread* t, jclass, jlong peer)
extern "C" JNIEXPORT jobject JNICALL extern "C" JNIEXPORT jobject JNICALL
Java_java_lang_Thread_getTrace(Thread* t, jclass, jlong peer) Java_java_lang_Thread_getTrace(Thread* t, jclass, jlong peer)
{ {
ENTER(t, Thread::ActiveState);
if (reinterpret_cast<Thread*>(peer) == t) { if (reinterpret_cast<Thread*>(peer) == t) {
return makeLocalReference(t, makeTrace(t)); return makeLocalReference(t, makeTrace(t));
} else { } else {

6
src/common.h
View File

@ -29,16 +29,18 @@
#ifdef __i386__ #ifdef __i386__
# define LD "d" # define LD "d"
# define LX "x"
# define LLD "lld"
#ifdef __APPLE__ #ifdef __APPLE__
# define ULD "lu" # define ULD "lu"
#else #else
# define ULD "u" # define ULD "u"
#endif #endif
# define LLD "lld"
#elif defined __x86_64__ #elif defined __x86_64__
# define LD "ld" # define LD "ld"
# define ULD "lu" # define LX "lx"
# define LLD "ld" # define LLD "ld"
# define ULD "lu"
#else #else
# error "Unsupported architecture" # error "Unsupported architecture"
#endif #endif

2
src/compile.cpp
View File

@ -123,7 +123,7 @@ compareIpToMethodBounds(Thread* t, intptr_t ip, object method)
(&singletonValue(t, methodCompiled(t, method), 0)); (&singletonValue(t, methodCompiled(t, method), 0));
if (DebugMethodTree) { if (DebugMethodTree) {
fprintf(stderr, "find 0x%lx in (0x%lx,0x%lx)\n", ip, start, fprintf(stderr, "find 0x%"LX" in (0x%"LX",0x%"LX")\n", ip, start,
start + (singletonCount(t, methodCompiled(t, method)) start + (singletonCount(t, methodCompiled(t, method))
* BytesPerWord)); * BytesPerWord));
} }