comparison src/share/tools/hsdis/hsdis.h @ 6933:3d701c802d01

8000489: older builds of hsdis don't work anymore after 6879063 Summary: The old function not defined properly, need a definition for export in dll. Also changes made to let new jvm work with old hsdis. Reviewed-by: jrose, sspitsyn, kmo Contributed-by: yumin.qi@oracle.com
author minqi
date Fri, 02 Nov 2012 13:30:47 -0700
parents 5a98bf7d847b
children
comparison
equal deleted inserted replaced
6931:ca8168203393 6933:3d701c802d01
45 45
46 A tag format is one of three basic forms: "tag", "/tag", "tag/", 46 A tag format is one of three basic forms: "tag", "/tag", "tag/",
47 where tag is a simple identifier, signifying (as in XML) a element start, 47 where tag is a simple identifier, signifying (as in XML) a element start,
48 element end, and standalone element. (To render as XML, add angle brackets.) 48 element end, and standalone element. (To render as XML, add angle brackets.)
49 */ 49 */
50 #ifndef SHARED_TOOLS_HSDIS_H
51 #define SHARED_TOOLS_HSDIS_H
52
50 extern 53 extern
51 #ifdef DLL_EXPORT 54 #ifdef DLL_EXPORT
52 DLL_EXPORT 55 DLL_EXPORT
53 #endif 56 #endif
54 void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va, 57 void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va,
55 unsigned char* buffer, uintptr_t length, 58 unsigned char* buffer, uintptr_t length,
56 void* (*event_callback)(void*, const char*, void*), 59 void* (*event_callback)(void*, const char*, void*),
57 void* event_stream, 60 void* event_stream,
58 int (*printf_callback)(void*, const char*, ...), 61 int (*printf_callback)(void*, const char*, ...),
59 void* printf_stream, 62 void* printf_stream,
60 const char* options); 63 const char* options,
64 int newline /* bool value for nice new line */);
65
66 /* This is the compatability interface for older versions of hotspot */
67 extern
68 #ifdef DLL_ENTRY
69 DLL_ENTRY
70 #endif
71 void* decode_instructions(void* start_pv, void* end_pv,
72 void* (*event_callback)(void*, const char*, void*),
73 void* event_stream,
74 int (*printf_callback)(void*, const char*, ...),
75 void* printf_stream,
76 const char* options);
61 77
62 /* convenience typedefs */ 78 /* convenience typedefs */
63 79
64 typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*); 80 typedef void* (*decode_instructions_event_callback_ftype) (void*, const char*, void*);
65 typedef int (*decode_instructions_printf_callback_ftype) (void*, const char*, ...); 81 typedef int (*decode_instructions_printf_callback_ftype) (void*, const char*, ...);
66 typedef void* (*decode_instructions_ftype) (uintptr_t start_va, uintptr_t end_va, 82 typedef void* (*decode_func_vtype) (uintptr_t start_va, uintptr_t end_va,
67 unsigned char* buffer, uintptr_t length, 83 unsigned char* buffer, uintptr_t length,
68 decode_instructions_event_callback_ftype event_callback, 84 decode_instructions_event_callback_ftype event_callback,
69 void* event_stream, 85 void* event_stream,
70 decode_instructions_printf_callback_ftype printf_callback, 86 decode_instructions_printf_callback_ftype printf_callback,
71 void* printf_stream, 87 void* printf_stream,
72 const char* options); 88 const char* options,
89 int newline);
90 typedef void* (*decode_func_stype) (void* start_pv, void* end_pv,
91 decode_instructions_event_callback_ftype event_callback,
92 void* event_stream,
93 decode_instructions_printf_callback_ftype printf_callback,
94 void* printf_stream,
95 const char* options);
96 #endif /* SHARED_TOOLS_HSDIS_H */