comparison src/share/tools/hsdis/hsdis.c @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents abec000618bf
children 89152779163c
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
1 /* 1 /*
2 * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
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 /* On PowerPC we get warnings, if we pass empty options */ 310 app_data->insn_options);
311 (caller_options == NULL) ? NULL : app_data->insn_options);
312 311
313 /* Finish linking together the various callback blocks. */ 312 /* Finish linking together the various callback blocks. */
314 app_data->dinfo.application_data = (void*) app_data; 313 app_data->dinfo.application_data = (void*) app_data;
315 app_data->dfn = disassembler(native_bfd); 314 app_data->dfn = disassembler(native_bfd);
316 app_data->dinfo.print_address_func = hsdis_print_address_func; 315 app_data->dinfo.print_address_func = hsdis_print_address_func;
458 res = "sparc:v8plusb"; 457 res = "sparc:v8plusb";
459 #endif 458 #endif
460 #ifdef LIBARCH_sparcv9 459 #ifdef LIBARCH_sparcv9
461 res = "sparc:v9b"; 460 res = "sparc:v9b";
462 #endif 461 #endif
463 #ifdef LIBARCH_ppc64
464 res = "powerpc:common64";
465 #endif
466 if (res == NULL) 462 if (res == NULL)
467 res = "architecture not set in Makefile!"; 463 res = "architecture not set in Makefile!";
468 return res; 464 return res;
469 } 465 }
470 466