Mercurial > hg > truffle
comparison src/share/vm/classfile/javaClasses.cpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
author | never |
---|---|
date | Sun, 25 Sep 2011 16:03:29 -0700 |
parents | 8ed53447f690 |
children | e5928e7dab26 |
comparison
equal
deleted
inserted
replaced
3959:eda6988c0d81 | 3960:f08d439fab8c |
---|---|
55 #ifdef TARGET_OS_FAMILY_solaris | 55 #ifdef TARGET_OS_FAMILY_solaris |
56 # include "thread_solaris.inline.hpp" | 56 # include "thread_solaris.inline.hpp" |
57 #endif | 57 #endif |
58 #ifdef TARGET_OS_FAMILY_windows | 58 #ifdef TARGET_OS_FAMILY_windows |
59 # include "thread_windows.inline.hpp" | 59 # include "thread_windows.inline.hpp" |
60 #endif | |
61 #ifdef TARGET_OS_FAMILY_bsd | |
62 # include "thread_bsd.inline.hpp" | |
60 #endif | 63 #endif |
61 | 64 |
62 #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ | 65 #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ |
63 klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); | 66 klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); |
64 | 67 |
1143 // Neither soucename and linenumber | 1146 // Neither soucename and linenumber |
1144 sprintf(buf + (int)strlen(buf), "(Unknown Source)"); | 1147 sprintf(buf + (int)strlen(buf), "(Unknown Source)"); |
1145 } | 1148 } |
1146 nmethod* nm = method->code(); | 1149 nmethod* nm = method->code(); |
1147 if (WizardMode && nm != NULL) { | 1150 if (WizardMode && nm != NULL) { |
1148 sprintf(buf + (int)strlen(buf), "(nmethod " PTR_FORMAT ")", (intptr_t)nm); | 1151 sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm); |
1149 } | 1152 } |
1150 } | 1153 } |
1151 | 1154 |
1152 return buf; | 1155 return buf; |
1153 } | 1156 } |