Mercurial > hg > truffle
comparison src/cpu/zero/vm/frame_zero.cpp @ 6926:a3e2f723f2a5
8000780: make Zero build and run with JDK8
Reviewed-by: coleenp, dholmes, twisti
Contributed-by: Roman Kennke <rkennke@redhat.com>
author | twisti |
---|---|
date | Mon, 29 Oct 2012 11:08:48 -0700 |
parents | da91efe96a93 |
children | c566b81b3323 |
comparison
equal
deleted
inserted
replaced
6915:a516debe2cee | 6926:a3e2f723f2a5 |
---|---|
349 int buflen) const { | 349 int buflen) const { |
350 // Fixed part | 350 // Fixed part |
351 switch (offset) { | 351 switch (offset) { |
352 case pc_off: | 352 case pc_off: |
353 strncpy(fieldbuf, "pc", buflen); | 353 strncpy(fieldbuf, "pc", buflen); |
354 if (method()->is_oop()) { | 354 if (method()->is_method()) { |
355 nmethod *code = method()->code(); | 355 nmethod *code = method()->code(); |
356 if (code && code->pc_desc_at(pc())) { | 356 if (code && code->pc_desc_at(pc())) { |
357 SimpleScopeDesc ssd(code, pc()); | 357 SimpleScopeDesc ssd(code, pc()); |
358 snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)", | 358 snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)", |
359 (intptr_t) pc(), ssd.bci()); | 359 (intptr_t) pc(), ssd.bci()); |
365 strncpy(fieldbuf, "unextended_sp", buflen); | 365 strncpy(fieldbuf, "unextended_sp", buflen); |
366 return; | 366 return; |
367 | 367 |
368 case method_off: | 368 case method_off: |
369 strncpy(fieldbuf, "method", buflen); | 369 strncpy(fieldbuf, "method", buflen); |
370 if (method()->is_oop()) { | 370 if (method()->is_method()) { |
371 method()->name_and_sig_as_C_string(valuebuf, buflen); | 371 method()->name_and_sig_as_C_string(valuebuf, buflen); |
372 } | 372 } |
373 return; | 373 return; |
374 | 374 |
375 case oop_tmp_off: | 375 case oop_tmp_off: |
376 strncpy(fieldbuf, "oop_tmp", buflen); | 376 strncpy(fieldbuf, "oop_tmp", buflen); |
377 return; | 377 return; |
378 } | 378 } |
379 | 379 |
380 // Variable part | 380 // Variable part |
381 if (method()->is_oop()) { | 381 if (method()->is_method()) { |
382 identify_vp_word(frame_index, addr_of_word(offset), | 382 identify_vp_word(frame_index, addr_of_word(offset), |
383 addr_of_word(header_words + 1), | 383 addr_of_word(header_words + 1), |
384 unextended_sp() + method()->max_stack(), | 384 unextended_sp() + method()->max_stack(), |
385 fieldbuf, buflen); | 385 fieldbuf, buflen); |
386 } | 386 } |
428 | 428 |
429 intptr_t *frame::initial_deoptimization_info() { | 429 intptr_t *frame::initial_deoptimization_info() { |
430 // unused... but returns fp() to minimize changes introduced by 7087445 | 430 // unused... but returns fp() to minimize changes introduced by 7087445 |
431 return fp(); | 431 return fp(); |
432 } | 432 } |
433 |