|
From: <sv...@va...> - 2015-08-09 16:27:52
|
Author: florian
Date: Sun Aug 9 17:27:44 2015
New Revision: 15514
Log:
Fix a few function declarations.
Modified:
trunk/coregrind/m_debuginfo/debuginfo.c
trunk/include/pub_tool_debuginfo.h
Modified: trunk/coregrind/m_debuginfo/debuginfo.c
==============================================================================
--- trunk/coregrind/m_debuginfo/debuginfo.c (original)
+++ trunk/coregrind/m_debuginfo/debuginfo.c Sun Aug 9 17:27:44 2015
@@ -3666,8 +3666,8 @@
XArray itself.
*/
Bool VG_(get_data_description)(
- /*MOD*/ void* /* really, XArray* of HChar */ dname1v,
- /*MOD*/ void* /* really, XArray* of HChar */ dname2v,
+ /*MOD*/ XArray* /* of HChar */ dname1,
+ /*MOD*/ XArray* /* of HChar */ dname2,
Addr data_addr
)
{
@@ -3681,9 +3681,6 @@
DebugInfo* di;
Word j;
- XArray* dname1 = (XArray*)dname1v;
- XArray* dname2 = (XArray*)dname2v;
-
if (0) VG_(printf)("get_data_description: dataaddr %#lx\n", data_addr);
/* First, see if data_addr is (or is part of) a global variable.
Loop over the DebugInfos we have. Check data_addr against the
@@ -3978,8 +3975,8 @@
point. If 'arrays_only' is True, only array-typed blocks are
returned; otherwise blocks of all types are returned. */
-void* /* really, XArray* of StackBlock */
- VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only )
+XArray* /* of StackBlock */
+VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only )
{
/* This is a derivation of consider_vars_in_frame() above. */
Word i;
@@ -4092,9 +4089,8 @@
array-typed blocks are returned; otherwise blocks of all types are
returned. */
-void* /* really, XArray* of GlobalBlock */
- VG_(di_get_global_blocks_from_dihandle) ( ULong di_handle,
- Bool arrays_only )
+XArray* /* of GlobalBlock */
+VG_(di_get_global_blocks_from_dihandle) ( ULong di_handle, Bool arrays_only )
{
/* This is a derivation of consider_vars_in_frame() above. */
Modified: trunk/include/pub_tool_debuginfo.h
==============================================================================
--- trunk/include/pub_tool_debuginfo.h (original)
+++ trunk/include/pub_tool_debuginfo.h Sun Aug 9 17:27:44 2015
@@ -32,6 +32,7 @@
#define __PUB_TOOL_DEBUGINFO_H
#include "pub_tool_basics.h" // VG_ macro
+#include "pub_tool_xarray.h" // XArray
/*====================================================================*/
/*=== Obtaining debug information ===*/
@@ -113,8 +114,8 @@
XArray itself.
*/
Bool VG_(get_data_description)(
- /*MOD*/ void* /* really, XArray* of HChar */ dname1v,
- /*MOD*/ void* /* really, XArray* of HChar */ dname2v,
+ /*MOD*/ XArray* /* of HChar */ dname1v,
+ /*MOD*/ XArray* /* of HChar */ dname2v,
Addr data_addr
);
@@ -178,8 +179,8 @@
}
StackBlock;
-extern void* /* really, XArray* of StackBlock */
- VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only );
+extern XArray* /* of StackBlock */
+VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only );
/* Get an array of GlobalBlock which describe the global blocks owned
@@ -199,7 +200,7 @@
}
GlobalBlock;
-extern void* /* really, XArray* of GlobalBlock */
+extern XArray* /* of GlobalBlock */
VG_(di_get_global_blocks_from_dihandle) ( ULong di_handle,
Bool arrays_only );
|