Mercurial > hg > truffle
comparison src/share/vm/utilities/vmError.cpp @ 628:7bb995fbd3c0
Merge
author | trims |
---|---|
date | Thu, 12 Mar 2009 18:16:36 -0700 |
parents | 0fbdb4381b99 dbbe28fc66b5 |
children | 354d3184f6b2 |
comparison
equal
deleted
inserted
replaced
580:ce2272390558 | 628:7bb995fbd3c0 |
---|---|
304 size_t len = strlen(file); | 304 size_t len = strlen(file); |
305 size_t buflen = sizeof(buf); | 305 size_t buflen = sizeof(buf); |
306 | 306 |
307 strncpy(buf, file, buflen); | 307 strncpy(buf, file, buflen); |
308 if (len + 10 < buflen) { | 308 if (len + 10 < buflen) { |
309 sprintf(buf + len, ":" SIZE_FORMAT, _lineno); | 309 sprintf(buf + len, ":%d", _lineno); |
310 } | 310 } |
311 st->print(" (%s)", buf); | 311 st->print(" (%s)", buf); |
312 } else { | 312 } else { |
313 st->print(" (0x%x)", _id); | 313 st->print(" (0x%x)", _id); |
314 } | 314 } |
418 frame fr = _context ? os::fetch_frame_from_context(_context) | 418 frame fr = _context ? os::fetch_frame_from_context(_context) |
419 : os::current_frame(); | 419 : os::current_frame(); |
420 | 420 |
421 if (fr.sp()) { | 421 if (fr.sp()) { |
422 st->print(", sp=" PTR_FORMAT, fr.sp()); | 422 st->print(", sp=" PTR_FORMAT, fr.sp()); |
423 st->print(", free space=%dk", | 423 st->print(", free space=%" INTPTR_FORMAT "k", |
424 ((intptr_t)fr.sp() - (intptr_t)stack_bottom) >> 10); | 424 ((intptr_t)fr.sp() - (intptr_t)stack_bottom) >> 10); |
425 } | 425 } |
426 | 426 |
427 st->cr(); | 427 st->cr(); |
428 } | 428 } |