comparison src/share/vm/runtime/deoptimization.cpp @ 12269:da051ce490eb

Merge
author adlertz
date Thu, 19 Sep 2013 18:01:39 +0200
parents 01b268b3080a
children 190899198332
comparison
equal deleted inserted replaced
12253:179cd89fb279 12269:da051ce490eb
1749 int Deoptimization::trap_state_set_recompiled(int trap_state, bool z) { 1749 int Deoptimization::trap_state_set_recompiled(int trap_state, bool z) {
1750 if (z) return trap_state | DS_RECOMPILE_BIT; 1750 if (z) return trap_state | DS_RECOMPILE_BIT;
1751 else return trap_state & ~DS_RECOMPILE_BIT; 1751 else return trap_state & ~DS_RECOMPILE_BIT;
1752 } 1752 }
1753 //---------------------------format_trap_state--------------------------------- 1753 //---------------------------format_trap_state---------------------------------
1754 // This is used for debugging and diagnostics, including hotspot.log output. 1754 // This is used for debugging and diagnostics, including LogFile output.
1755 const char* Deoptimization::format_trap_state(char* buf, size_t buflen, 1755 const char* Deoptimization::format_trap_state(char* buf, size_t buflen,
1756 int trap_state) { 1756 int trap_state) {
1757 DeoptReason reason = trap_state_reason(trap_state); 1757 DeoptReason reason = trap_state_reason(trap_state);
1758 bool recomp_flag = trap_state_is_recompiled(trap_state); 1758 bool recomp_flag = trap_state_is_recompiled(trap_state);
1759 // Re-encode the state from its decoded components. 1759 // Re-encode the state from its decoded components.
1826 static char buf[20]; 1826 static char buf[20];
1827 sprintf(buf, "action%d", action); 1827 sprintf(buf, "action%d", action);
1828 return buf; 1828 return buf;
1829 } 1829 }
1830 1830
1831 // This is used for debugging and diagnostics, including hotspot.log output. 1831 // This is used for debugging and diagnostics, including LogFile output.
1832 const char* Deoptimization::format_trap_request(char* buf, size_t buflen, 1832 const char* Deoptimization::format_trap_request(char* buf, size_t buflen,
1833 int trap_request) { 1833 int trap_request) {
1834 jint unloaded_class_index = trap_request_index(trap_request); 1834 jint unloaded_class_index = trap_request_index(trap_request);
1835 const char* reason = trap_reason_name(trap_request_reason(trap_request)); 1835 const char* reason = trap_reason_name(trap_request_reason(trap_request));
1836 const char* action = trap_action_name(trap_request_action(trap_request)); 1836 const char* action = trap_action_name(trap_request_action(trap_request));