Mercurial > hg > graal-jvmci-8
comparison src/share/tools/hsdis/hsdis.c @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c |
children | 3848113e3e6b |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
305 &buf.empty_bfd, &buf.empty_xvec); | 305 &buf.empty_bfd, &buf.empty_xvec); |
306 init_disassemble_info_from_bfd(&app_data->dinfo, | 306 init_disassemble_info_from_bfd(&app_data->dinfo, |
307 app_data->printf_stream, | 307 app_data->printf_stream, |
308 app_data->printf_callback, | 308 app_data->printf_callback, |
309 native_bfd, | 309 native_bfd, |
310 app_data->insn_options); | 310 /* On PowerPC we get warnings, if we pass empty options */ |
311 (caller_options == NULL) ? NULL : app_data->insn_options); | |
311 | 312 |
312 /* Finish linking together the various callback blocks. */ | 313 /* Finish linking together the various callback blocks. */ |
313 app_data->dinfo.application_data = (void*) app_data; | 314 app_data->dinfo.application_data = (void*) app_data; |
314 app_data->dfn = disassembler(native_bfd); | 315 app_data->dfn = disassembler(native_bfd); |
315 app_data->dinfo.print_address_func = hsdis_print_address_func; | 316 app_data->dinfo.print_address_func = hsdis_print_address_func; |
457 res = "sparc:v8plusb"; | 458 res = "sparc:v8plusb"; |
458 #endif | 459 #endif |
459 #ifdef LIBARCH_sparcv9 | 460 #ifdef LIBARCH_sparcv9 |
460 res = "sparc:v9b"; | 461 res = "sparc:v9b"; |
461 #endif | 462 #endif |
463 #ifdef LIBARCH_ppc64 | |
464 res = "powerpc:common64"; | |
465 #endif | |
462 if (res == NULL) | 466 if (res == NULL) |
463 res = "architecture not set in Makefile!"; | 467 res = "architecture not set in Makefile!"; |
464 return res; | 468 return res; |
465 } | 469 } |
466 | 470 |