1.1 --- a/src/share/tools/hsdis/hsdis.h Fri Nov 02 07:44:11 2012 -0700
1.2 +++ b/src/share/tools/hsdis/hsdis.h Fri Nov 02 13:30:47 2012 -0700
1.3 @@ -47,6 +47,9 @@
1.4 where tag is a simple identifier, signifying (as in XML) a element start,
1.5 element end, and standalone element. (To render as XML, add angle brackets.)
1.6 */
1.7 +#ifndef SHARED_TOOLS_HSDIS_H
1.8 +#define SHARED_TOOLS_HSDIS_H
1.9 +
1.10 extern
1.11 #ifdef DLL_EXPORT
1.12 DLL_EXPORT
1.13 @@ -57,16 +60,37 @@
1.14 void* event_stream,
1.15 int (*printf_callback)(void*, const char*, ...),
1.16 void* printf_stream,
1.17 - const char* options);
1.18 + const char* options,
1.19 + int newline /* bool value for nice new line */);
1.20 +
1.21 +/* This is the compatability interface for older versions of hotspot */
1.22 +extern
1.23 +#ifdef DLL_ENTRY
1.24 + DLL_ENTRY
1.25 +#endif
1.26 +void* decode_instructions(void* start_pv, void* end_pv,
1.27 + void* (*event_callback)(void*, const char*, void*),
1.28 + void* event_stream,
1.29 + int (*printf_callback)(void*, const char*, ...),
1.30 + void* printf_stream,
1.31 + const char* options);
1.32
1.33 /* convenience typedefs */
1.34
1.35 typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*);
1.36 typedef int (*decode_instructions_printf_callback_ftype) (void*, const char*, ...);
1.37 -typedef void* (*decode_instructions_ftype) (uintptr_t start_va, uintptr_t end_va,
1.38 - unsigned char* buffer, uintptr_t length,
1.39 - decode_instructions_event_callback_ftype event_callback,
1.40 - void* event_stream,
1.41 - decode_instructions_printf_callback_ftype printf_callback,
1.42 - void* printf_stream,
1.43 - const char* options);
1.44 +typedef void* (*decode_func_vtype) (uintptr_t start_va, uintptr_t end_va,
1.45 + unsigned char* buffer, uintptr_t length,
1.46 + decode_instructions_event_callback_ftype event_callback,
1.47 + void* event_stream,
1.48 + decode_instructions_printf_callback_ftype printf_callback,
1.49 + void* printf_stream,
1.50 + const char* options,
1.51 + int newline);
1.52 +typedef void* (*decode_func_stype) (void* start_pv, void* end_pv,
1.53 + decode_instructions_event_callback_ftype event_callback,
1.54 + void* event_stream,
1.55 + decode_instructions_printf_callback_ftype printf_callback,
1.56 + void* printf_stream,
1.57 + const char* options);
1.58 +#endif /* SHARED_TOOLS_HSDIS_H */
