|
From: <sv...@va...> - 2005-06-23 01:03:26
|
Author: sewardj
Date: 2005-06-23 02:02:53 +0100 (Thu, 23 Jun 2005)
New Revision: 4000
Log:
For symbols which have C-level global scope but which we regard as
module-local, use the new ML_ prefix instead of VG_. This makes it
trivial to see which names are those exported from public module
interfaces: precisely those using VG_.
/* VG_ is for symbols exported from modules. ML_ (module-local) is
for symbols which are not intended to be visible outside modules,
but which cannot be declared as C 'static's since they need to be
visible across C files within a given module. It is a mistake for
a ML_ name to appear in a pub_core_*.h or pub_tool_*.h file.
Likewise it is a mistake for a VG_ name to appear in a priv_*.h
file.=20
*/
Modified:
trunk/coregrind/m_debuginfo/dwarf.c
trunk/coregrind/m_debuginfo/priv_symtab.h
trunk/coregrind/m_debuginfo/priv_symtypes.h
trunk/coregrind/m_debuginfo/stabs.c
trunk/coregrind/m_debuginfo/symtab.c
trunk/coregrind/m_debuginfo/symtypes.c
trunk/coregrind/m_scheduler/priv_sema.h
trunk/coregrind/m_scheduler/scheduler.c
trunk/coregrind/m_scheduler/sema.c
trunk/coregrind/m_syswrap/priv_syswrap-generic.h
trunk/coregrind/m_syswrap/priv_syswrap-linux.h
trunk/coregrind/m_syswrap/priv_syswrap-main.h
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/coregrind/m_syswrap/syswrap-main.c
trunk/coregrind/m_syswrap/syswrap-x86-linux.c
trunk/include/pub_tool_basics_asm.h
Modified: trunk/coregrind/m_debuginfo/dwarf.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_debuginfo/dwarf.c 2005-06-23 00:17:51 UTC (rev 3999=
)
+++ trunk/coregrind/m_debuginfo/dwarf.c 2005-06-23 01:02:53 UTC (rev 4000=
)
@@ -317,7 +317,7 @@
=20
if (state_machine_regs.is_stmt) {
if (state_machine_regs.last_address)
- VG_(addLineInfo) (
+ ML_(addLineInfo) (
si,=20
(Char*)index_WordArray(filenames,=20
state_machine_regs.last_file),=20
@@ -339,7 +339,7 @@
=20
case DW_LNE_define_file:
name =3D data;
- addto_WordArray( filenames, (Word)VG_(addStr)(si,name,-1) );
+ addto_WordArray( filenames, (Word)ML_(addStr)(si,name,-1) );
data +=3D VG_(strlen) ((char *) data) + 1;
read_leb128 (data, & bytes_read, 0);
data +=3D bytes_read;
@@ -420,9 +420,9 @@
addto_WordArray( &filenames, (Word)NULL );
=20
if (ui->compdir)
- addto_WordArray( &dirnames, (Word)VG_(addStr)(si, ui->compdir, -1)=
);
+ addto_WordArray( &dirnames, (Word)ML_(addStr)(si, ui->compdir, -1)=
);
else
- addto_WordArray( &dirnames, (Word)VG_(addStr)(si, ".", -1) );
+ addto_WordArray( &dirnames, (Word)ML_(addStr)(si, ".", -1) );
=20
addto_WordArray( &fnidx2dir, (Word)0 ); /* compilation dir */
=20
@@ -433,12 +433,12 @@
info.li_length =3D * ((UInt *)(external->li_length));
=20
if (info.li_length =3D=3D 0xffffffff) {
- VG_(symerr)("64-bit DWARF line info is not supported yet.");
+ ML_(symerr)("64-bit DWARF line info is not supported yet.");
goto out;
}
=20
if (info.li_length + sizeof (external->li_length) > noLargerThan) {
- VG_(symerr)("DWARF line info appears to be corrupt "
+ ML_(symerr)("DWARF line info appears to be corrupt "
"- the section is too small");
goto out;
}
@@ -446,7 +446,7 @@
/* Check its version number. */
info.li_version =3D * ((UShort *) (external->li_version));
if (info.li_version !=3D 2) {
- VG_(symerr)("Only DWARF version 2 line info "
+ ML_(symerr)("Only DWARF version 2 line info "
"is currently supported.");
goto out;
}
@@ -519,11 +519,11 @@
VG_(strcat)(buf, "/");
VG_(strcat)(buf, data);
vg_assert(VG_(strlen)(buf) < NBUF);
- addto_WordArray( &dirnames, (Word)VG_(addStr)(si,buf,-1) );
+ addto_WordArray( &dirnames, (Word)ML_(addStr)(si,buf,-1) );
if (0) VG_(printf)("rel path %s\n", buf);
} else {
/* just use 'data'. */
- addto_WordArray( &dirnames, (Word)VG_(addStr)(si,data,-1) );
+ addto_WordArray( &dirnames, (Word)ML_(addStr)(si,data,-1) );
if (0) VG_(printf)("abs path %s\n", data);
}
=20
@@ -532,7 +532,7 @@
# undef NBUF
}
if (*data !=3D 0) {
- VG_(symerr)("can't find NUL at end of DWARF2 directory table");
+ ML_(symerr)("can't find NUL at end of DWARF2 directory table");
goto out;
}
data ++;
@@ -553,12 +553,12 @@
read_leb128 (data, & bytes_read, 0);
data +=3D bytes_read;
=20
- addto_WordArray( &filenames, (Word)VG_(addStr)(si,name,-1) );
+ addto_WordArray( &filenames, (Word)ML_(addStr)(si,name,-1) );
addto_WordArray( &fnidx2dir, (Word)diridx );
if (0) VG_(printf)("file %s diridx %d\n", name, diridx );
}
if (*data !=3D 0) {
- VG_(symerr)("can't find NUL at end of DWARF2 file name table");
+ ML_(symerr)("can't find NUL at end of DWARF2 file name table");
goto out;
}
data ++;
@@ -592,7 +592,7 @@
if (state_machine_regs.is_stmt) {
/* only add a statement if there was a previous boundary */
if (state_machine_regs.last_address)=20
- VG_(addLineInfo)(
+ ML_(addLineInfo)(
si,=20
(Char*)index_WordArray( &filenames,
state_machine_regs.last_file )=
,
@@ -624,7 +624,7 @@
if (state_machine_regs.is_stmt) {
/* only add a statement if there was a previous boundary =
*/
if (state_machine_regs.last_address)=20
- VG_(addLineInfo)(
+ ML_(addLineInfo)(
si,=20
(Char*)index_WordArray( &filenames,
state_machine_regs.last_fil=
e ),
@@ -901,7 +901,7 @@
* Inputs: given .debug_xxx sections
* Output: update si to contain all the dwarf2 debug infos
*/
-void VG_(read_debuginfo_dwarf2)=20
+void ML_(read_debuginfo_dwarf2)=20
( SegInfo* si,
UChar* debuginfo, Int debug_info_sz, /* .debug_info */
UChar* debugabbrev, /* .debug_abbrev */
@@ -922,13 +922,13 @@
blklen =3D *((UInt*)block); /* This block length */
=20
if ( block + blklen + 4 > end ) {
- VG_(symerr)( "Last block truncated in .debug_info; ignoring" );
+ ML_(symerr)( "Last block truncated in .debug_info; ignoring" );
return;
}
ver =3D *((UShort*)(block + 4)); /* version should be 2 */
=20
if ( ver !=3D 2 ) {
- VG_(symerr)( "Ignoring non-dwarf2 block in .debug_info" );
+ ML_(symerr)( "Ignoring non-dwarf2 block in .debug_info" );
continue;
}
=20
@@ -1109,7 +1109,7 @@
=20
/* end of enums taken from gdb-6.0 sources */
=20
-void VG_(read_debuginfo_dwarf1) (=20
+void ML_(read_debuginfo_dwarf1) (=20
SegInfo* si,=20
UChar* dwarf1d, Int dwarf1d_sz,=20
UChar* dwarf1l, Int dwarf1l_sz )
@@ -1215,7 +1215,7 @@
UChar* ptr;
UInt prev_line, prev_delta;
=20
- curr_filenm =3D VG_(addStr) ( si, src_filename, -1 );
+ curr_filenm =3D ML_(addStr) ( si, src_filename, -1 );
prev_line =3D prev_delta =3D 0;
=20
ptr =3D dwarf1l + stmt_list;
@@ -1236,7 +1236,7 @@
if (delta > 0 && prev_line > 0) {
if (0) VG_(printf) (" %d %d-%d\n",
prev_line, prev_delta, delta-1);
- VG_(addLineInfo) ( si, curr_filenm, NULL,
+ ML_(addLineInfo) ( si, curr_filenm, NULL,
base + prev_delta, base + delta,
prev_line, 0 );
}
@@ -1457,7 +1457,7 @@
=20
/* ------------ Deal with summary-info records ------------ */
=20
-void VG_(ppCfiSI) ( CfiSI* si )
+void ML_(ppCfiSI) ( CfiSI* si )
{
# define SHOW_HOW(_how, _off) \
do { \
@@ -2125,9 +2125,9 @@
if (loc_prev !=3D ctx->loc && si) {
summ_ok =3D summarise_context ( &cfisi, loc_prev, ctx );
if (summ_ok) {
- VG_(addCfiSI)(si, &cfisi);
+ ML_(addCfiSI)(si, &cfisi);
if (VG_(clo_trace_cfi))
- VG_(ppCfiSI)(&cfisi);
+ ML_(ppCfiSI)(&cfisi);
}
}
}
@@ -2137,9 +2137,9 @@
if (si) {
summ_ok =3D summarise_context ( &cfisi, loc_prev, ctx );
if (summ_ok) {
- VG_(addCfiSI)(si, &cfisi);
+ ML_(addCfiSI)(si, &cfisi);
if (VG_(clo_trace_cfi))
- VG_(ppCfiSI)(&cfisi);
+ ML_(ppCfiSI)(&cfisi);
}
}
}
@@ -2184,7 +2184,7 @@
static CIE the_CIEs[N_CIEs];
=20
=20
-void VG_(read_callframe_info_dwarf2)=20
+void ML_(read_callframe_info_dwarf2)=20
( /*OUT*/SegInfo* si,=20
UChar* ehframe, Int ehframe_sz, Addr ehframe_addr )
{
Modified: trunk/coregrind/m_debuginfo/priv_symtab.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_debuginfo/priv_symtab.h 2005-06-23 00:17:51 UTC (re=
v 3999)
+++ trunk/coregrind/m_debuginfo/priv_symtab.h 2005-06-23 01:02:53 UTC (re=
v 4000)
@@ -163,7 +163,7 @@
}
CfiSI;
=20
-extern void VG_(ppCfiSI) ( CfiSI* );
+extern void ML_(ppCfiSI) ( CfiSI* );
=20
=20
/* A structure which contains information pertaining to one mapped
@@ -232,29 +232,29 @@
};
=20
extern
-Char *VG_(addStr) ( SegInfo* si, Char* str, Int len );
+Char *ML_(addStr) ( SegInfo* si, Char* str, Int len );
=20
extern
-void VG_(addScopeInfo) ( SegInfo* si, Addr this, Addr next, Scope *scope=
);
+void ML_(addScopeInfo) ( SegInfo* si, Addr this, Addr next, Scope *scope=
);
=20
extern
-void VG_(addLineInfo) ( SegInfo* si,=20
+void ML_(addLineInfo) ( SegInfo* si,=20
Char* filename,=20
Char* dirname, /* NULL is allowable */
Addr this, Addr next, Int lineno, Int entry);
=20
extern
-void VG_(addCfiSI) ( SegInfo* si, CfiSI* cfisi );
+void ML_(addCfiSI) ( SegInfo* si, CfiSI* cfisi );
=20
/* Non-fatal -- use vg_panic if terminal. */
extern
-void VG_(symerr) ( Char* msg );
+void ML_(symerr) ( Char* msg );
=20
/* --------------------
Stabs reader
-------------------- */
extern
-void VG_(read_debuginfo_stabs) ( SegInfo* si,
+void ML_(read_debuginfo_stabs) ( SegInfo* si,
UChar* stabC, Int stab_sz,=20
UChar* stabstr, Int stabstr_sz );
=20
@@ -262,7 +262,7 @@
DWARF2 reader
-------------------- */
extern
-void VG_(read_debuginfo_dwarf2)=20
+void ML_(read_debuginfo_dwarf2)=20
( SegInfo* si,
UChar* debuginfo, Int debug_info_sz, /* .debug_info */
UChar* debugabbrev, /* .debug_abbrev */
@@ -273,7 +273,7 @@
DWARF1 reader
-------------------- */
extern
-void VG_(read_debuginfo_dwarf1) ( SegInfo* si,=20
+void ML_(read_debuginfo_dwarf1) ( SegInfo* si,=20
UChar* dwarf1d, Int dwarf1d_sz,=20
UChar* dwarf1l, Int dwarf1l_sz );
=20
@@ -281,7 +281,7 @@
CFI reader
-------------------- */
extern
-void VG_(read_callframe_info_dwarf2)=20
+void ML_(read_callframe_info_dwarf2)=20
( /*OUT*/SegInfo* si, UChar* ehframe, Int ehframe_sz, Addr ehframe_a=
ddr );
=20
=20
Modified: trunk/coregrind/m_debuginfo/priv_symtypes.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_debuginfo/priv_symtypes.h 2005-06-23 00:17:51 UTC (=
rev 3999)
+++ trunk/coregrind/m_debuginfo/priv_symtypes.h 2005-06-23 01:02:53 UTC (=
rev 4000)
@@ -43,49 +43,49 @@
unresolved symbols. If type is not a typedef, then this is just
returns type.
*/
-SymType *VG_(st_basetype)(SymType *type, Bool resolve);
+SymType *ML_(st_basetype)(SymType *type, Bool resolve);
=20
-void VG_(st_setname)(SymType *ty, Char *name);
+void ML_(st_setname)(SymType *ty, Char *name);
=20
typedef void (SymResolver)(SymType *, void *);
=20
/* Create an unresolved type */
-SymType *VG_(st_mkunresolved)(SymType *, SymResolver *resolve, void *dat=
a);
+SymType *ML_(st_mkunresolved)(SymType *, SymResolver *resolve, void *dat=
a);
=20
/* update an unresolved type's data */
-void VG_(st_unresolved_setdata)(SymType *, SymResolver *resolve, void *d=
ata);
+void ML_(st_unresolved_setdata)(SymType *, SymResolver *resolve, void *d=
ata);
=20
-Bool VG_(st_isresolved)(SymType *);
-UInt VG_(st_sizeof)(SymType *);
+Bool ML_(st_isresolved)(SymType *);
+UInt ML_(st_sizeof)(SymType *);
=20
/* Unknown type (unparsable) */
-SymType *VG_(st_mkunknown)(SymType *);
+SymType *ML_(st_mkunknown)(SymType *);
=20
-SymType *VG_(st_mkvoid)(SymType *);
+SymType *ML_(st_mkvoid)(SymType *);
=20
-SymType *VG_(st_mkint)(SymType *, UInt size, Bool isSigned);
-SymType *VG_(st_mkbool)(SymType *, UInt size);
-SymType *VG_(st_mkchar)(SymType *, Bool isSigned);
-SymType *VG_(st_mkfloat)(SymType *, UInt size);
-SymType *VG_(st_mkdouble)(SymType *, UInt size);
+SymType *ML_(st_mkint)(SymType *, UInt size, Bool isSigned);
+SymType *ML_(st_mkbool)(SymType *, UInt size);
+SymType *ML_(st_mkchar)(SymType *, Bool isSigned);
+SymType *ML_(st_mkfloat)(SymType *, UInt size);
+SymType *ML_(st_mkdouble)(SymType *, UInt size);
=20
-SymType *VG_(st_mkpointer)(SymType *, SymType *);
-SymType *VG_(st_mkrange)(SymType *, SymType *, Int min, Int max);
+SymType *ML_(st_mkpointer)(SymType *, SymType *);
+SymType *ML_(st_mkrange)(SymType *, SymType *, Int min, Int max);
=20
-SymType *VG_(st_mkstruct)(SymType *, UInt size, UInt nfields);
-SymType *VG_(st_mkunion)(SymType *, UInt size, UInt nfields);
-void VG_(st_addfield)(SymType *, Char *name, SymType *, UInt off, UInt s=
ize);
+SymType *ML_(st_mkstruct)(SymType *, UInt size, UInt nfields);
+SymType *ML_(st_mkunion)(SymType *, UInt size, UInt nfields);
+void ML_(st_addfield)(SymType *, Char *name, SymType *, UInt off, UInt s=
ize);
=20
-SymType *VG_(st_mkenum)(SymType *, UInt ntags);
-SymType *VG_(st_addtag)(SymType *, Char *name, Int val);
+SymType *ML_(st_mkenum)(SymType *, UInt ntags);
+SymType *ML_(st_addtag)(SymType *, Char *name, Int val);
=20
-SymType *VG_(st_mkarray)(SymType *, SymType *idxtype, SymType *artype);
+SymType *ML_(st_mkarray)(SymType *, SymType *idxtype, SymType *artype);
=20
-SymType *VG_(st_mktypedef)(SymType *, Char *name, SymType *type);
+SymType *ML_(st_mktypedef)(SymType *, Char *name, SymType *type);
=20
-Bool VG_(st_isstruct)(SymType *);
-Bool VG_(st_isunion)(SymType *);
-Bool VG_(st_isenum)(SymType *);
+Bool ML_(st_isstruct)(SymType *);
+Bool ML_(st_isunion)(SymType *);
+Bool ML_(st_isenum)(SymType *);
=20
/* ------------------------------------------------------------
Interface with symtab.c
@@ -104,7 +104,7 @@
Variable *container;
};
=20
-Variable *VG_(get_scope_variables)(ThreadId tid);
+Variable *ML_(get_scope_variables)(ThreadId tid);
=20
#endif // __PRIV_SYMTYPES_H
=20
Modified: trunk/coregrind/m_debuginfo/stabs.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_debuginfo/stabs.c 2005-06-23 00:17:51 UTC (rev 3999=
)
+++ trunk/coregrind/m_debuginfo/stabs.c 2005-06-23 01:02:53 UTC (rev 4000=
)
@@ -153,11 +153,11 @@
=20
sl =3D VG_(arena_malloc)(VG_AR_SYMTAB, sizeof(*sl));
if (isstruct)
- ty =3D VG_(st_mkstruct)(def, 0, 0);
+ ty =3D ML_(st_mkstruct)(def, 0, 0);
else
- ty =3D VG_(st_mkunion)(def, 0, 0);
+ ty =3D ML_(st_mkunion)(def, 0, 0);
=20
- VG_(st_setname)(ty, name);
+ ML_(st_setname)(ty, name);
sl->isstruct =3D isstruct;
sl->type =3D ty;
sl->name =3D name;
@@ -190,9 +190,9 @@
VG_(printf)("defining %s ref for %s %p -> %p\n",
isstruct ? "struct" : "union", name, ref, def);
=20
- def =3D VG_(st_mktypedef)(ref, name, VG_(st_basetype)(def, False))=
;
+ def =3D ML_(st_mktypedef)(ref, name, ML_(st_basetype)(def, False))=
;
}
- VG_(st_setname)(def, name);
+ ML_(st_setname)(def, name);
return def;
}
=20
@@ -484,7 +484,7 @@
{
static const Bool debug =3D False || stabs_debug;
Char *str =3D (Char *)data;
- vg_assert(!VG_(st_isresolved)(st));
+ vg_assert(!ML_(st_isresolved)(st));
=20
if (debug)
VG_(printf)("stab_resolve: failing to do anything useful with symt=
ype %p=3D%s\n",=20
@@ -555,7 +555,7 @@
}
=20
if (stabtype->type =3D=3D NULL) {
- stabtype->type =3D VG_(st_mkunresolved)(def, stab_resolve, NULL);
+ stabtype->type =3D ML_(st_mkunresolved)(def, stab_resolve, NULL);
if (debug)
VG_(printf)("making (%d,%d) %p unresolved\n", file, sym, stabtyp=
e->type);
}
@@ -567,16 +567,16 @@
/* a type definition */
p++;
=20
- if (VG_(st_isresolved)(symtype)) {
+ if (ML_(st_isresolved)(symtype)) {
/* a redefinition; clear the old type out */
StabType *stabtype =3D getStabType(tab, file, sym);
=20
- symtype =3D stabtype->type =3D VG_(st_mkunresolved)(NULL, stab_reso=
lve, NULL);
+ symtype =3D stabtype->type =3D ML_(st_mkunresolved)(NULL, stab_reso=
lve, NULL);
if (debug)
VG_(printf)("creating new type %p for definition (%d,%d)\n",
symtype, file, sym);
} else
- VG_(st_unresolved_setdata)(symtype, stab_resolve, p);
+ ML_(st_unresolved_setdata)(symtype, stab_resolve, p);
=20
if (debug)
VG_(printf)("defining type %p (%d,%d) =3D %s\n", symtype, file, sym=
, p);
@@ -600,23 +600,23 @@
vg_assert(stabtype->type !=3D NULL);
if (0) {
/* XXX bogus */
- vg_assert(!VG_(st_isresolved)(stabtype->type));
+ vg_assert(!ML_(st_isresolved)(stabtype->type));
VG_(arena_free)(VG_AR_SYMTAB, stabtype->type); /* XXX proper fre=
e method? */
}
stabtype->type =3D type;
- } else if (!VG_(st_isresolved)(type)) {
+ } else if (!ML_(st_isresolved)(type)) {
/* If type is defined in terms of itself, and is
therefore not resolved, it is void */
if (debug)
VG_(printf)("type %p is defined in terms of self - making void\n=
", type);
- type =3D VG_(st_mkvoid)(type);
+ type =3D ML_(st_mkvoid)(type);
}
} else {
/* just a type reference */
type =3D symtype;
- if ((0 || debug) && !VG_(st_isresolved)(type))
+ if ((0 || debug) && !ML_(st_isresolved)(type))
VG_(printf)("type %p (%d,%d) is unresolved\n", type, file, sym);
- if ((0 || debug) && VG_(st_isresolved)(type))
+ if ((0 || debug) && ML_(st_isresolved)(type))
VG_(printf)("reference (%d,%d) -> %p\n", file, sym, type);
}
break;
@@ -627,35 +627,35 @@
p--;
n =3D atoi(&p, 0);
switch(n) {
- case -1: type =3D VG_(st_mkint)(def, 4, True); break;
- case -2: type =3D VG_(st_mkint)(def, 1, True); break;
- case -3: type =3D VG_(st_mkint)(def, 2, True); break;
- case -4: type =3D VG_(st_mkint)(def, 4, True); break;
- case -5: type =3D VG_(st_mkint)(def, 1, False); break;
- case -6: type =3D VG_(st_mkint)(def, 1, True); break;
- case -7: type =3D VG_(st_mkint)(def, 2, False); break;
- case -8: type =3D VG_(st_mkint)(def, 4, False); break;
- case -9: type =3D VG_(st_mkint)(def, 4, False); break;
- case -10: type =3D VG_(st_mkint)(def, 4, False); break;
- case -11: type =3D VG_(st_mkvoid)(def); break;
- case -12: type =3D VG_(st_mkfloat)(def, 4); break;
- case -13: type =3D VG_(st_mkfloat)(def, 8); break;
- case -15: type =3D VG_(st_mkint)(def, 4, True); break;
- case -16: type =3D VG_(st_mkbool)(def, 4); break;
- case -17: type =3D VG_(st_mkfloat)(def, 4); break;
- case -18: type =3D VG_(st_mkfloat)(def, 8); break;
- case -20: type =3D VG_(st_mkint)(def, 1, False); break;
- case -21: type =3D VG_(st_mkint)(def, 1, False); break;
- case -22: type =3D VG_(st_mkint)(def, 2, False); break;
- case -23: type =3D VG_(st_mkint)(def, 4, False); break;
- case -24: type =3D VG_(st_mkint)(def, 4, False); break;
- case -27: type =3D VG_(st_mkint)(def, 1, True); break;
- case -28: type =3D VG_(st_mkint)(def, 2, True); break;
- case -29: type =3D VG_(st_mkint)(def, 4, True); break;
- case -31: type =3D VG_(st_mkint)(def, 8, True); break;
- case -32: type =3D VG_(st_mkint)(def, 8, False); break;
- case -33: type =3D VG_(st_mkint)(def, 8, False); break;
- case -34: type =3D VG_(st_mkint)(def, 8, True); break;
+ case -1: type =3D ML_(st_mkint)(def, 4, True); break;
+ case -2: type =3D ML_(st_mkint)(def, 1, True); break;
+ case -3: type =3D ML_(st_mkint)(def, 2, True); break;
+ case -4: type =3D ML_(st_mkint)(def, 4, True); break;
+ case -5: type =3D ML_(st_mkint)(def, 1, False); break;
+ case -6: type =3D ML_(st_mkint)(def, 1, True); break;
+ case -7: type =3D ML_(st_mkint)(def, 2, False); break;
+ case -8: type =3D ML_(st_mkint)(def, 4, False); break;
+ case -9: type =3D ML_(st_mkint)(def, 4, False); break;
+ case -10: type =3D ML_(st_mkint)(def, 4, False); break;
+ case -11: type =3D ML_(st_mkvoid)(def); break;
+ case -12: type =3D ML_(st_mkfloat)(def, 4); break;
+ case -13: type =3D ML_(st_mkfloat)(def, 8); break;
+ case -15: type =3D ML_(st_mkint)(def, 4, True); break;
+ case -16: type =3D ML_(st_mkbool)(def, 4); break;
+ case -17: type =3D ML_(st_mkfloat)(def, 4); break;
+ case -18: type =3D ML_(st_mkfloat)(def, 8); break;
+ case -20: type =3D ML_(st_mkint)(def, 1, False); break;
+ case -21: type =3D ML_(st_mkint)(def, 1, False); break;
+ case -22: type =3D ML_(st_mkint)(def, 2, False); break;
+ case -23: type =3D ML_(st_mkint)(def, 4, False); break;
+ case -24: type =3D ML_(st_mkint)(def, 4, False); break;
+ case -27: type =3D ML_(st_mkint)(def, 1, True); break;
+ case -28: type =3D ML_(st_mkint)(def, 2, True); break;
+ case -29: type =3D ML_(st_mkint)(def, 4, True); break;
+ case -31: type =3D ML_(st_mkint)(def, 8, True); break;
+ case -32: type =3D ML_(st_mkint)(def, 8, False); break;
+ case -33: type =3D ML_(st_mkint)(def, 8, False); break;
+ case -34: type =3D ML_(st_mkint)(def, 8, True); break;
=20
default:
VG_(printf)(" @@ unrecognized negative type %d\n", n);
@@ -673,7 +673,7 @@
=20
case 't': { /* typedef: 't' TYPE */
SymType *td =3D stabtype_parser(si, NULL, &p);
- type =3D VG_(st_mktypedef)(def, NULL, td);
+ type =3D ML_(st_mktypedef)(def, NULL, td);
break;
}
=20
@@ -685,7 +685,7 @@
bytes =3D atoi(&p, 0);
EXPECT(';', "FP-TYPE bytes");
=20
- type =3D VG_(st_mkfloat)(def, bytes);
+ type =3D ML_(st_mkfloat)(def, bytes);
break;
}
=20
@@ -710,16 +710,16 @@
if (rtype =3D=3D def) {
if (debug)
VG_(printf)("type %p is subrange of self - making int\n", def);
- type =3D VG_(st_mkint)(def, sizeof(int), False);
+ type =3D ML_(st_mkint)(def, sizeof(int), False);
} else if (min > max && max =3D=3D 0) {
if (debug)
VG_(printf)("type %p has backwards range %d - %d: making float\n",=20
def, min, max);
- type =3D VG_(st_mkfloat)(def, min);
+ type =3D ML_(st_mkfloat)(def, min);
} else
- type =3D VG_(st_mkrange)(def, rtype, min, max);
+ type =3D ML_(st_mkrange)(def, rtype, min, max);
=20
- vg_assert(VG_(st_isresolved)(type));
+ vg_assert(ML_(st_isresolved)(type));
break;
}
=20
@@ -727,7 +727,7 @@
case '*': { /* pointer */
/* ('*' | '&') TYPE */
type =3D stabtype_parser(si, NULL, &p);
- type =3D VG_(st_mkpointer)(def, type);
+ type =3D ML_(st_mkpointer)(def, type);
break;
}
=20
@@ -746,7 +746,7 @@
p =3D templ_name(name);
EXPECT(':', "struct/union/enum ref");
=20
- name =3D VG_(addStr)(si, name, p-1-name);
+ name =3D ML_(addStr)(si, name, p-1-name);
=20
switch (kind) {
case 's': /* struct */
@@ -755,7 +755,7 @@
break;
=20
case 'e': /* enum */
- type =3D VG_(st_mkenum)(def, 0);
+ type =3D ML_(st_mkenum)(def, 0);
break;
=20
default:
@@ -772,7 +772,7 @@
=20
typeinfo =3D stabtype_parser(si, NULL, &p);
=20
- type =3D VG_(st_mkarray)(def, typeinfo, VG_(st_mkint)(NULL, 1, Tru=
e));
+ type =3D ML_(st_mkarray)(def, typeinfo, ML_(st_mkint)(NULL, 1, Tru=
e));
break;
}
=20
@@ -785,7 +785,7 @@
idxtype =3D stabtype_parser(si, NULL, &p);
artype =3D stabtype_parser(si, NULL, &p);
=20
- type =3D VG_(st_mkarray)(def, idxtype, artype);
+ type =3D ML_(st_mkarray)(def, idxtype, artype);
=20
break;
}
@@ -793,7 +793,7 @@
case 'e': { /* enum */
/* 'e' ( NAME ':' N ',' )* ';' */
=20
- type =3D VG_(st_mkenum)(def, 0);
+ type =3D ML_(st_mkenum)(def, 0);
=20
/* don't really care about tags; just skip them */
while(*p !=3D ';') {
@@ -826,7 +826,7 @@
Bool method =3D False;
=20
size =3D atou(&p, 0);
- type =3D (t =3D=3D 's' ? VG_(st_mkstruct) : VG_(st_mkunion))(def, =
size, 0);
+ type =3D (t =3D=3D 's' ? ML_(st_mkstruct) : ML_(st_mkunion))(def, =
size, 0);
=20
if (*p =3D=3D '!') {
/* base classes */
@@ -866,10 +866,10 @@
appear as "operator=3D=3D::" */
end =3D SKIPPAST(end, '.', "op$ name");
}
- name =3D VG_(addStr)(si, p, end-p);
+ name =3D ML_(addStr)(si, p, end-p);
p =3D end+2;
} else {
- name =3D VG_(addStr)(si, p, end-p);
+ name =3D ML_(addStr)(si, p, end-p);
p =3D end+1;
}
=20
@@ -941,7 +941,7 @@
}
=20
if (fieldty !=3D NULL)
- VG_(st_addfield)(type, name, fieldty, off, sz);
+ ML_(st_addfield)(type, name, fieldty, off, sz);
=20
EXPECT(';', "struct field end");
}
@@ -961,7 +961,7 @@
=20
case 'f': /* function */
/* 'f' TYPE */
- type =3D VG_(st_mkvoid)(def); /* approximate functions as void */
+ type =3D ML_(st_mkvoid)(def); /* approximate functions as void */
stabtype_parser(si, NULL, &p);
break;
=20
@@ -970,7 +970,7 @@
CLASS-TYPE ',' RET-TYPE ',' ( ARG-TYPE ( ',' ARG-TYPE )* )? )
';'
*/
- type =3D VG_(st_mkvoid)(def); /* methods are really void */
+ type =3D ML_(st_mkvoid)(def); /* methods are really void */
=20
if (*p =3D=3D '#') {
p++; /* skip '#' */
@@ -996,7 +996,7 @@
=20
case '@': /* pointer to member */
/* '@' CLASS-TYPE ',' MEMBER-TYPE */
- type =3D VG_(st_mkint)(def, sizeof(int), False); /* make it an int=
for our use */
+ type =3D ML_(st_mkint)(def, sizeof(int), False); /* make it an int=
for our use */
=20
stabtype_parser(si, NULL, &p); /* CLASS-TYPE */
EXPECT(',', "member-pointer CLASS-TYPE");
@@ -1057,7 +1057,7 @@
=20
if (*ty !=3D ':') {
/* no type info */
- sym->type =3D VG_(st_mkvoid)(NULL);
+ sym->type =3D ML_(st_mkvoid)(NULL);
} else {
ty++; /* skip ':' */
=20
@@ -1090,19 +1090,19 @@
=20
out:
sym->type =3D stabtype_parser(si, NULL, &ty);
- base =3D VG_(st_basetype)(sym->type, False);
- if (isStruct && (VG_(st_isstruct)(base) || VG_(st_isunion)(base)))=
{
- Char *sname =3D VG_(addStr)(si, name, len);
- structDef(si->stab_typetab, base, VG_(st_isstruct)(base), sname);
+ base =3D ML_(st_basetype)(sym->type, False);
+ if (isStruct && (ML_(st_isstruct)(base) || ML_(st_isunion)(base)))=
{
+ Char *sname =3D ML_(addStr)(si, name, len);
+ structDef(si->stab_typetab, base, ML_(st_isstruct)(base), sname);
}
=20
if (isTypedef) {
- Char *tname =3D VG_(addStr)(si, name, len);
+ Char *tname =3D ML_(addStr)(si, name, len);
vg_assert(sym->type !=3D base);
if (debug)
VG_(printf)(" typedef %p \"%s\"\n", sym->type, tname);
- VG_(st_setname)(sym->type, tname);
- VG_(st_setname)(base, tname);
+ ML_(st_setname)(sym->type, tname);
+ ML_(st_setname)(base, tname);
}
}
*namep =3D ty;
@@ -1147,7 +1147,7 @@
if (isStruct || isTypedef) {
return True; /* skip */
} else {
- sym->name =3D VG_(addStr)(si, name, len);
+ sym->name =3D ML_(addStr)(si, name, len);
return False; /* don't skip */
}
}
@@ -1205,7 +1205,7 @@
/* Read stabs-format debug info. This is all rather horrible because
stabs is a underspecified, kludgy hack.
*/
-void VG_(read_debuginfo_stabs) ( SegInfo* si,
+void ML_(read_debuginfo_stabs) ( SegInfo* si,
UChar* stabC, Int stab_sz,=20
UChar* stabstr, Int stabstr_sz )
{
@@ -1264,7 +1264,7 @@
Finding the instruction address range covered by an N_SLINE is
complicated; see the N_SLINE case below.
*/
- file.name =3D VG_(addStr)(si,"???", -1);
+ file.name =3D ML_(addStr)(si,"???", -1);
=20
n_stab_entries =3D stab_sz/(int)sizeof(struct nlist);
=20
@@ -1354,7 +1354,7 @@
=20
if (buf !=3D NULL) {
i--; /* overstepped */
- string =3D VG_(addStr)(si, buf, idx);
+ string =3D ML_(addStr)(si, buf, idx);
VG_(arena_free)(VG_AR_SYMTAB, buf);
if (contdebug)
VG_(printf)("made composite: \"%s\"\n", string);
@@ -1415,7 +1415,7 @@
=20
if (line.addr !=3D 0) {
/* finish off previous line */
- VG_(addLineInfo)(si, file.name, NULL, line.addr,
+ ML_(addLineInfo)(si, file.name, NULL, line.addr,
addr, line.no + line.ovf * LINENO_OVERFLOW, i);
}
=20
@@ -1427,7 +1427,7 @@
line.jump =3D True;
=20
if (len > 0 && nm[len-1] !=3D '/') {
- file.name =3D VG_(addStr)(si, nm, -1);
+ file.name =3D ML_(addStr)(si, nm, -1);
if (debug)
VG_(printf)("new source: %s\n", file.name);
if (st->n_type =3D=3D N_SO) {
@@ -1435,7 +1435,7 @@
clearStabFiles(tab);
}
} else if (len =3D=3D 0)
- file.name =3D VG_(addStr)(si, "?1\0", -1);
+ file.name =3D ML_(addStr)(si, "?1\0", -1);
=20
if (func.start !=3D 0)
line.jump =3D True;
@@ -1447,7 +1447,7 @@
=20
if (line.addr !=3D 0) {
/* there was a previous */
- VG_(addLineInfo)(si, file.name, NULL, line.addr,
+ ML_(addLineInfo)(si, file.name, NULL, line.addr,
addr, line.no + line.ovf * LINENO_OVERFLOW, i);
}
=20
@@ -1521,7 +1521,7 @@
=20
if (scope.addr !=3D 0) {
/* finish any previous scope range */
- VG_(addScopeInfo)(si, scope.addr, addr, scope.scope);
+ ML_(addScopeInfo)(si, scope.addr, addr, scope.scope);
}
=20
/* tidy up arg scope */
@@ -1556,14 +1556,14 @@
}
=20
if (line.addr) {
- VG_(addLineInfo)(si, file.name, NULL, line.addr,
+ ML_(addLineInfo)(si, file.name, NULL, line.addr,
addr, line.no + line.ovf * LINENO_OVERFLOW, i);
line.addr =3D 0;
}
=20
if (scope.addr) {
/* finish any previous scope range */
- VG_(addScopeInfo)(si, scope.addr, addr, scope.scope);
+ ML_(addScopeInfo)(si, scope.addr, addr, scope.scope);
}
=20
if (newfunc) {
@@ -1571,7 +1571,7 @@
Scope *sc;
if (scope.addr) {
/* finish any previous scope range */
- VG_(addScopeInfo)(si, scope.addr, addr, scope.scope);
+ ML_(addScopeInfo)(si, scope.addr, addr, scope.scope);
}
=20
sc =3D addSymsToScope(NULL, scope.symlist, scope.nsyms, scope.sc=
ope);
@@ -1590,7 +1590,7 @@
=20
if (scope.addr) {
/* end previous range */
- VG_(addScopeInfo)(si, scope.addr, addr, scope.scope);
+ ML_(addScopeInfo)(si, scope.addr, addr, scope.scope);
}
=20
scope.addr =3D addr;
@@ -1626,7 +1626,7 @@
}
=20
vg_assert(scope.addr !=3D 0);
- VG_(addScopeInfo)(si, scope.addr, addr, scope.scope);
+ ML_(addScopeInfo)(si, scope.addr, addr, scope.scope);
=20
/* XXX LEAK: free scope if it or any of its inner scopes was
never added to a scope range */
Modified: trunk/coregrind/m_debuginfo/symtab.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_debuginfo/symtab.c 2005-06-23 00:17:51 UTC (rev 399=
9)
+++ trunk/coregrind/m_debuginfo/symtab.c 2005-06-23 01:02:53 UTC (rev 400=
0)
@@ -130,7 +130,7 @@
pointers are stable.
*/
=20
-Char *VG_(addStr) ( SegInfo* si, Char* str, Int len )
+Char* ML_(addStr) ( SegInfo* si, Char* str, Int len )
{
struct strchunk *chunk;
Int space_needed;
@@ -219,7 +219,7 @@
=20
/* Top-level place to call to add a source-location mapping entry. */
=20
-void VG_(addLineInfo) ( SegInfo* si,
+void ML_(addLineInfo) ( SegInfo* si,
Char* filename,
Char* dirname, /* NULL =3D=3D directory is unknown */
Addr this,
@@ -329,7 +329,7 @@
=20
/* Top-level place to call to add a source-location mapping entry. */
=20
-void VG_(addScopeInfo) ( SegInfo* si,
+void ML_(addScopeInfo) ( SegInfo* si,
Addr this,
Addr next,
Scope *scope)
@@ -359,13 +359,13 @@
=20
/* Top-level place to call to add a CFI summary record. The supplied
CfiSI is copied. */
-void VG_(addCfiSI) ( SegInfo* si, CfiSI* cfisi )
+void ML_(addCfiSI) ( SegInfo* si, CfiSI* cfisi )
{
static const Bool debug =3D False;
=20
if (debug) {
VG_(printf)("adding CfiSI: ");
- VG_(ppCfiSI)(cfisi);
+ ML_(ppCfiSI)(cfisi);
}
=20
vg_assert(cfisi->len > 0 && cfisi->len < 2000000);
@@ -392,7 +392,7 @@
);
}
if (VG_(clo_trace_cfi))=20
- VG_(ppCfiSI)(cfisi);
+ ML_(ppCfiSI)(cfisi);
}
return;
}
@@ -421,7 +421,7 @@
/*------------------------------------------------------------*/
=20
/* Non-fatal -- use vg_panic if terminal. */
-void VG_(symerr) ( Char* msg )
+void ML_(symerr) ( Char* msg )
{
if (VG_(clo_verbosity) > 1)
VG_(message)(Vg_DebugMsg,"%s", msg );
@@ -996,7 +996,7 @@
Char buf[80];
vg_assert(VG_(strlen)(tab_name) < 40);
VG_(sprintf)(buf, " object doesn't have a %s", tab_name);
- VG_(symerr)(buf);
+ ML_(symerr)(buf);
return;
}
=20
@@ -1040,7 +1040,7 @@
if ( is_interesting_symbol(si, sym, sym_name, sym_addr) ) {
vg_assert(sym->st_name !=3D 0);
vg_assert(sym_name[0] !=3D 0);
- name =3D VG_(addStr) ( si, sym_name, -1 );
+ name =3D ML_(addStr) ( si, sym_name, -1 );
vg_assert(name !=3D NULL);
=20
/*
@@ -1239,14 +1239,14 @@
=20
i =3D VG_(stat)(si->filename, &stat_buf);
if (i !=3D 0) {
- VG_(symerr)("Can't stat .so/.exe (to determine its size)?!");
+ ML_(symerr)("Can't stat .so/.exe (to determine its size)?!");
return False;
}
n_oimage =3D stat_buf.st_size;
=20
fd =3D VG_(open)(si->filename, VKI_O_RDONLY, 0);
if (fd < 0) {
- VG_(symerr)("Can't open .so/.exe to read symbols?!");
+ ML_(symerr)("Can't open .so/.exe to read symbols?!");
return False;
}
=20
@@ -1273,7 +1273,7 @@
ok &=3D VG_(is_object_file)(ehdr);
=20
if (!ok) {
- VG_(symerr)("Invalid ELF header, or missing stringtab/sectiontab."=
);
+ ML_(symerr)("Invalid ELF header, or missing stringtab/sectiontab."=
);
goto out;
}
=20
@@ -1282,7 +1282,7 @@
bss memory. Also computes correct symbol offset value for this
ELF file. */
if (ehdr->e_phoff + ehdr->e_phnum*sizeof(ElfXX_Phdr) > n_oimage) {
- VG_(symerr)("ELF program header is beyond image end?!");
+ ML_(symerr)("ELF program header is beyond image end?!");
goto out;
}
{
@@ -1332,7 +1332,7 @@
}
=20
if (o_phdr->p_vaddr < prev_addr) {
- VG_(symerr)("ELF Phdrs are out of order!?");
+ ML_(symerr)("ELF Phdrs are out of order!?");
goto out;
}
prev_addr =3D o_phdr->p_vaddr;
@@ -1400,7 +1400,7 @@
ehdr->e_shoff, ehdr->e_shnum, sizeof(ElfXX_Shdr), n_oima=
ge );
=20
if (ehdr->e_shoff + ehdr->e_shnum*sizeof(ElfXX_Shdr) > n_oimage) {
- VG_(symerr)("ELF section header is beyond image end?!");
+ ML_(symerr)("ELF section header is beyond image end?!");
goto out;
}
=20
@@ -1463,7 +1463,7 @@
TRACE_SYMTAB( "%18s: %p .. %p\n", \
sec_name, sec_data, sec_data + sec_size - 1); =
\
if ( shdr[i].sh_offset + sec_size > n_oimage ) { \
- VG_(symerr)(" section beyond image end?!"); \
+ ML_(symerr)(" section beyond image end?!"); \
goto out; \
} \
}
@@ -1529,7 +1529,7 @@
TRACE_SYMTAB( "%18s: %p .. %p\n", \
sec_name, sec_data, sec_data + sec_si=
ze - 1); \
if ( shdr[i].sh_offset + sec_size > n_dimage ) { \
- VG_(symerr)(" section beyond image end?!"); \
+ ML_(symerr)(" section beyond image end?!"); \
goto out; \
} \
}
@@ -1562,7 +1562,7 @@
=20
/* Read .eh_frame (call-frame-info) if any */
if (ehframe) {
- VG_(read_callframe_info_dwarf2) ( si, ehframe, ehframe_sz, ehfr=
ame_addr );
+ ML_(read_callframe_info_dwarf2) ( si, ehframe, ehframe_sz, ehfr=
ame_addr );
}
=20
/* Read the stabs and/or dwarf2 debug information, if any. It
@@ -1571,13 +1571,13 @@
# if !defined(VGP_amd64_linux)
if (stab !=3D NULL && stabstr !=3D NULL) {
has_debuginfo =3D True;
- VG_(read_debuginfo_stabs) ( si, stab, stab_sz,=20
+ ML_(read_debuginfo_stabs) ( si, stab, stab_sz,=20
stabstr, stabstr_sz );
}
# endif
if (debug_line) {
has_debuginfo =3D True;
- VG_(read_debuginfo_dwarf2) ( si,=20
+ ML_(read_debuginfo_dwarf2) ( si,=20
debug_info, debug_info_sz,
debug_abbv,
debug_line, debug_line_sz,
@@ -1585,11 +1585,11 @@
}
if (dwarf1d && dwarf1l) {
has_debuginfo =3D True;
- VG_(read_debuginfo_dwarf1) ( si, dwarf1d, dwarf1d_sz,=20
+ ML_(read_debuginfo_dwarf1) ( si, dwarf1d, dwarf1d_sz,=20
dwarf1l, dwarf1l_sz );
}=20
if (!has_debuginfo) {
- VG_(symerr)(" object doesn't have any line number info");
+ ML_(symerr)(" object doesn't have any line number info");
goto out;
}
}
@@ -2233,7 +2233,7 @@
=20
/* Get a list of all variables in scope, working out from the directly
current one */
-Variable *VG_(get_scope_variables)(ThreadId tid)
+Variable* ML_(get_scope_variables)(ThreadId tid)
{
static const Bool debug =3D False;
Variable *list, *end;
@@ -2291,10 +2291,10 @@
=20
v->next =3D NULL;
v->distance =3D distance;
- v->type =3D VG_(st_basetype)(sym->type, False);
+ v->type =3D ML_(st_basetype)(sym->type, False);
v->name =3D VG_(arena_strdup)(VG_AR_SYMTAB, sym->name);
v->container =3D NULL;
- v->size =3D VG_(st_sizeof)(sym->type);
+ v->size =3D ML_(st_sizeof)(sym->type);
=20
if (debug && 0)
VG_(printf)("sym->name=3D%s sym->kind=3D%d offset=3D%d\n", sym->nam=
e, sym->kind, sym->u.offset);
@@ -2516,7 +2516,7 @@
=20
if (0) {
VG_(printf)("found cfisi: ");=20
- VG_(ppCfiSI)(cfisi);
+ ML_(ppCfiSI)(cfisi);
}
=20
ipPrev =3D spPrev =3D fpPrev =3D 0;
Modified: trunk/coregrind/m_debuginfo/symtypes.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_debuginfo/symtypes.c 2005-06-23 00:17:51 UTC (rev 3=
999)
+++ trunk/coregrind/m_debuginfo/symtypes.c 2005-06-23 01:02:53 UTC (rev 4=
000)
@@ -166,17 +166,17 @@
};
=20
=20
-Bool VG_(st_isstruct)(SymType *ty)
+Bool ML_(st_isstruct)(SymType *ty)
{
return ty->kind =3D=3D TyStruct;
}
=20
-Bool VG_(st_isunion)(SymType *ty)
+Bool ML_(st_isunion)(SymType *ty)
{
return ty->kind =3D=3D TyUnion;
}
=20
-Bool VG_(st_isenum)(SymType *ty)
+Bool ML_(st_isenum)(SymType *ty)
{
return ty->kind =3D=3D TyEnum;
}
@@ -203,7 +203,7 @@
st->kind =3D TyError;
}
=20
-SymType *VG_(st_mkunresolved)(SymType *st, SymResolver *resolver, void *=
data)
+SymType *ML_(st_mkunresolved)(SymType *st, SymResolver *resolver, void *=
data)
{
st =3D alloc(st);
=20
@@ -217,7 +217,7 @@
return st;
}
=20
-void VG_(st_unresolved_setdata)(SymType *st, SymResolver *resolver, void=
*data)
+void ML_(st_unresolved_setdata)(SymType *st, SymResolver *resolver, void=
*data)
{
if (st->kind !=3D TyUnresolved)
return;
@@ -226,18 +226,18 @@
st->u.t_unresolved.data =3D data;
}
=20
-Bool VG_(st_isresolved)(SymType *st)
+Bool ML_(st_isresolved)(SymType *st)
{
return st->kind !=3D TyUnresolved;
}
=20
-void VG_(st_setname)(SymType *st, Char *name)
+void ML_(st_setname)(SymType *st, Char *name)
{
if (st->name !=3D NULL)
st->name =3D name;
}
=20
-SymType *VG_(st_mkvoid)(SymType *st)
+SymType *ML_(st_mkvoid)(SymType *st)
{
st =3D alloc(st);
=20
@@ -249,7 +249,7 @@
return st;
}
=20
-SymType *VG_(st_mkint)(SymType *st, UInt size, Bool isSigned)
+SymType *ML_(st_mkint)(SymType *st, UInt size, Bool isSigned)
{
st =3D alloc(st);
=20
@@ -262,7 +262,7 @@
return st;
}
=20
-SymType *VG_(st_mkfloat)(SymType *st, UInt size)
+SymType *ML_(st_mkfloat)(SymType *st, UInt size)
{
st =3D alloc(st);
=20
@@ -275,7 +275,7 @@
return st;
}
=20
-SymType *VG_(st_mkbool)(SymType *st, UInt size)
+SymType *ML_(st_mkbool)(SymType *st, UInt size)
{
st =3D alloc(st);
=20
@@ -288,7 +288,7 @@
}
=20
=20
-SymType *VG_(st_mkpointer)(SymType *st, SymType *ptr)
+SymType *ML_(st_mkpointer)(SymType *st, SymType *ptr)
{
st =3D alloc(st);
=20
@@ -301,7 +301,7 @@
return st;
}
=20
-SymType *VG_(st_mkrange)(SymType *st, SymType *ty, Int min, Int max)
+SymType *ML_(st_mkrange)(SymType *st, SymType *ty, Int min, Int max)
{
st =3D alloc(st);
=20
@@ -316,7 +316,7 @@
return st;
}
=20
-SymType *VG_(st_mkstruct)(SymType *st, UInt size, UInt nfields)
+SymType *ML_(st_mkstruct)(SymType *st, UInt size, UInt nfields)
{
st =3D alloc(st);
=20
@@ -336,7 +336,7 @@
return st;
}
=20
-SymType *VG_(st_mkunion)(SymType *st, UInt size, UInt nfields)
+SymType *ML_(st_mkunion)(SymType *st, UInt size, UInt nfields)
{
st =3D alloc(st);
=20
@@ -356,7 +356,7 @@
return st;
}
=20
-void VG_(st_addfield)(SymType *st, Char *name, SymType *type, UInt off, =
UInt size)
+void ML_(st_addfield)(SymType *st, Char *name, SymType *type, UInt off, =
UInt size)
{
StField *f;
=20
@@ -380,7 +380,7 @@
}
=20
=20
-SymType *VG_(st_mkenum)(SymType *st, UInt ntags)
+SymType *ML_(st_mkenum)(SymType *st, UInt ntags)
{
st =3D alloc(st);
=20
@@ -393,7 +393,7 @@
return st;
}
=20
-SymType *VG_(st_mkarray)(SymType *st, SymType *idxtype, SymType *type)
+SymType *ML_(st_mkarray)(SymType *st, SymType *idxtype, SymType *type)
{
st =3D alloc(st);
=20
@@ -406,7 +406,7 @@
return st;
}
=20
-SymType *VG_(st_mktypedef)(SymType *st, Char *name, SymType *type)
+SymType *ML_(st_mktypedef)(SymType *st, Char *name, SymType *type)
{
st =3D alloc(st);
=20
@@ -423,7 +423,7 @@
}
=20
=20
-SymType *VG_(st_basetype)(SymType *type, Bool do_resolve)
+SymType *ML_(st_basetype)(SymType *type, Bool do_resolve)
{
while (type->kind =3D=3D TyTypedef || (do_resolve && type->kind =3D=3D=
TyUnresolved)) {
if (do_resolve)
@@ -436,7 +436,7 @@
return type;
}
=20
-UInt VG_(st_sizeof)(SymType *ty)
+UInt ML_(st_sizeof)(SymType *ty)
{
return ty->size;
}
@@ -725,7 +725,7 @@
keeplist =3D NULL;
=20
eip =3D VG_(get_IP)(tid);
- list =3D VG_(get_scope_variables)(tid);
+ list =3D ML_(get_scope_variables)(tid);
=20
if (memaccount) {
Variable *v;
@@ -785,7 +785,7 @@
v->name =3D VG_(arena_strdup)(VG_AR_SYMTAB, name);
else
v->name =3D NULL;
- v->type =3D VG_(st_basetype)(ty, False);
+ v->type =3D ML_(st_basetype)(ty, False);
v->valuep =3D valuep;
v->size =3D size =3D=3D -1 ? ty->size : size;
v->container =3D var;
@@ -835,7 +835,7 @@
break;
}
=20
- type =3D VG_(st_basetype)(type, True);
+ type =3D ML_(st_basetype)(type, True);
=20
switch(type->kind) {
case TyUnion:
Modified: trunk/coregrind/m_scheduler/priv_sema.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_scheduler/priv_sema.h 2005-06-23 00:17:51 UTC (rev =
3999)
+++ trunk/coregrind/m_scheduler/priv_sema.h 2005-06-23 01:02:53 UTC (rev =
4000)
@@ -40,10 +40,10 @@
=20
// Nb: this may be OS-specific, but let's not factor it out until we
// implement an OS port for which this isn't ok.
-void VG_(sema_init) ( vg_sema_t *sema );
-void VG_(sema_deinit) ( vg_sema_t *sema );
-void VG_(sema_down) ( vg_sema_t *sema );
-void VG_(sema_up) ( vg_sema_t *sema );
+void ML_(sema_init) ( vg_sema_t *sema );
+void ML_(sema_deinit) ( vg_sema_t *sema );
+void ML_(sema_down) ( vg_sema_t *sema );
+void ML_(sema_up) ( vg_sema_t *sema );
=20
#endif // __PRIV_SEMA_H
=20
Modified: trunk/coregrind/m_scheduler/scheduler.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_scheduler/scheduler.c 2005-06-23 00:17:51 UTC (rev =
3999)
+++ trunk/coregrind/m_scheduler/scheduler.c 2005-06-23 01:02:53 UTC (rev =
4000)
@@ -194,7 +194,7 @@
=20
tst->status =3D VgTs_Runnable;
=20
- VG_(sema_down)(&run_sema);
+ ML_(sema_down)(&run_sema);
if (VG_(running_tid) !=3D VG_INVALID_THREADID)
VG_(printf)("tid %d found %d running\n", tid, VG_(running_tid));
vg_assert(VG_(running_tid) =3D=3D VG_INVALID_THREADID);
@@ -227,7 +227,7 @@
=20
/* Release the run_sema; this will reschedule any runnable
thread. */
- VG_(sema_up)(&run_sema);
+ ML_(sema_up)(&run_sema);
=20
if (VG_(clo_trace_sched)) {
Char buf[50];
@@ -252,7 +252,7 @@
/* There should still be a valid exitreason for this thread */
vg_assert(VG_(threads)[tid].exitreason !=3D VgSrc_None);
=20
- VG_(sema_up)(&run_sema);
+ ML_(sema_up)(&run_sema);
}
=20
/* Kill a thread. This interrupts whatever a thread is doing, and
@@ -500,9 +500,9 @@
}
=20
/* re-init and take the sema */
- VG_(sema_deinit)(&run_sema);
- VG_(sema_init)(&run_sema);
- VG_(sema_down)(&run_sema);
+ ML_(sema_deinit)(&run_sema);
+ ML_(sema_init)(&run_sema);
+ ML_(sema_down)(&run_sema);
}
=20
=20
@@ -516,7 +516,7 @@
Int i;
ThreadId tid_main;
=20
- VG_(sema_init)(&run_sema);
+ ML_(sema_init)(&run_sema);
=20
for (i =3D 0 /* NB; not 1 */; i < VG_N_THREADS; i++) {
=20
Modified: trunk/coregrind/m_scheduler/sema.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_scheduler/sema.c 2005-06-23 00:17:51 UTC (rev 3999)
+++ trunk/coregrind/m_scheduler/sema.c 2005-06-23 01:02:53 UTC (rev 4000)
@@ -39,7 +39,7 @@
pipe-based token passing scheme.
*/
=20
-void VG_(sema_init)(vg_sema_t *sema)
+void ML_(sema_init)(vg_sema_t *sema)
{
VG_(pipe)(sema->pipe);
sema->pipe[0] =3D VG_(safe_fd)(sema->pipe[0]);
@@ -51,7 +51,7 @@
VG_(write)(sema->pipe[1], "T", 1);
}
=20
-void VG_(sema_deinit)(vg_sema_t *sema)
+void ML_(sema_deinit)(vg_sema_t *sema)
{
VG_(close)(sema->pipe[0]);
VG_(close)(sema->pipe[1]);
@@ -59,7 +59,7 @@
}
=20
/* get a token */
-void VG_(sema_down)(vg_sema_t *sema)
+void ML_(sema_down)(vg_sema_t *sema)
{
Char buf[2] =3D { 'x' };
Int ret;
@@ -80,7 +80,7 @@
}
=20
/* put token back */
-void VG_(sema_up)(vg_sema_t *sema)
+void ML_(sema_up)(vg_sema_t *sema)
{
Int ret;
=20
Modified: trunk/coregrind/m_syswrap/priv_syswrap-generic.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/priv_syswrap-generic.h 2005-06-23 00:17:51 =
UTC (rev 3999)
+++ trunk/coregrind/m_syswrap/priv_syswrap-generic.h 2005-06-23 01:02:53 =
UTC (rev 4000)
@@ -37,27 +37,27 @@
// Return true if address range entirely contained within client
// address space.
extern
-Bool VG_(valid_client_addr)(Addr start, SizeT size, ThreadId tid,
+Bool ML_(valid_client_addr)(Addr start, SizeT size, ThreadId tid,
const Char *syscallname);
=20
// Returns True if the signal is OK for the client to use.
-extern Bool VG_(client_signal_OK)(Int sigNo);
+extern Bool ML_(client_signal_OK)(Int sigNo);
=20
// Return true if we're allowed to use or create this fd.
extern
-Bool VG_(fd_allowed)(Int fd, const Char *syscallname, ThreadId tid, Bool=
soft);
+Bool ML_(fd_allowed)(Int fd, const Char *syscallname, ThreadId tid, Bool=
soft);
=20
extern
-void VG_(record_fd_open)(ThreadId tid, Int fd, char *pathname);
+void ML_(record_fd_open)(ThreadId tid, Int fd, char *pathname);
=20
// Used when killing threads -- we must not kill a thread if it's the th=
read
// that would do Valgrind's final cleanup and output.
extern
-Bool VG_(do_sigkill)(Int pid, Int tgid);
+Bool ML_(do_sigkill)(Int pid, Int tgid);
=20
/* So that it can be seen from syswrap-x86-linux.c. */
extern=20
-void VG_(mmap_segment) ( Addr a, SizeT len, UInt prot,=20
+void ML_(mmap_segment) ( Addr a, SizeT len, UInt prot,=20
UInt mm_flags, Int fd, ULong offset );
=20
=20
@@ -269,45 +269,45 @@
#define UW UWord
#define SR SysRes
=20
-extern void VG_(generic_PRE_sys_socketpair) ( TId, UW, UW, UW, UW );
-extern SysRes VG_(generic_POST_sys_socketpair) ( TId, SR, UW, UW, UW, U=
W );
-extern SysRes VG_(generic_POST_sys_socket) ( TId, SR );
-extern void VG_(generic_PRE_sys_bind) ( TId, UW, UW, UW );
-extern void VG_(generic_PRE_sys_accept) ( TId, UW, UW, UW );
-extern SysRes VG_(generic_POST_sys_accept) ( TId, SR, UW, UW, UW );
-extern void VG_(generic_PRE_sys_sendto) ( TId, UW, UW, UW, UW, U=
W, UW );
-extern void VG_(generic_PRE_sys_send) ( TId, UW, UW, UW );
-extern void VG_(generic_PRE_sys_recvfrom) ( TId, UW, UW, UW, UW, U=
W, UW );
-extern void VG_(generic_POST_sys_recvfrom) ( TId, SR, UW, UW, UW, U=
W, UW, UW );
-extern void VG_(generic_PRE_sys_recv) ( TId, UW, UW, UW );
-extern void VG_(generic_POST_sys_recv) ( TId, UW, UW, UW, UW );
-extern void VG_(generic_PRE_sys_connect) ( TId, UW, UW, UW );
-extern void VG_(generic_PRE_sys_setsockopt) ( TId, UW, UW, UW, UW, U=
W );
-extern void VG_(generic_PRE_sys_getsockopt) ( TId, UW, UW, UW, UW, U=
W );
-extern void VG_(generic_POST_sys_getsockopt) ( TId, SR, UW, UW, UW, U=
W, UW );
-extern void VG_(generic_PRE_sys_getsockname) ( TId, UW, UW, UW );
-extern void VG_(generic_POST_sys_getsockname) ( TId, SR, UW, UW, UW );
-extern void VG_(generic_PRE_sys_getpeername) ( TId, UW, UW, UW );
-extern void VG_(generic_POST_sys_getpeername) ( TId, SR, UW, UW, UW );
-extern void VG_(generic_PRE_sys_sendmsg) ( TId, UW, UW );
-extern void VG_(generic_PRE_sys_recvmsg) ( TId, UW, UW );
-extern void VG_(generic_POST_sys_recvmsg) ( TId, UW, UW );
+extern void ML_(generic_PRE_sys_socketpair) ( TId, UW, UW, UW, UW );
+extern SysRes ML_(generic_POST_sys_socketpair) ( TId, SR, UW, UW, UW, U=
W );
+extern SysRes ML_(generic_POST_sys_socket) ( TId, SR );
+extern void ML_(generic_PRE_sys_bind) ( TId, UW, UW, UW );
+extern void ML_(generic_PRE_sys_accept) ( TId, UW, UW, UW );
+extern SysRes ML_(generic_POST_sys_accept) ( TId, SR, UW, UW, UW );
+extern void ML_(generic_PRE_sys_sendto) ( TId, UW, UW, UW, UW, U=
W, UW );
+extern void ML_(generic_PRE_sys_send) ( TId, UW, UW, UW );
+extern void ML_(generic_PRE_sys_recvfrom) ( TId, UW, UW, UW, UW, U=
W, UW );
+extern void ML_(generic_POST_sys_recvfrom) ( TId, SR, UW, UW, UW, U=
W, UW, UW );
+extern void ML_(generic_PRE_sys_recv) ( TId, UW, UW, UW );
+extern void ML_(generic_POST_sys_recv) ( TId, UW, UW, UW, UW );
+extern void ML_(generic_PRE_sys_connect) ( TId, UW, UW, UW );
+extern void ML_(generic_PRE_sys_setsockopt) ( TId, UW, UW, UW, UW, U=
W );
+extern void ML_(generic_PRE_sys_getsockopt) ( TId, UW, UW, UW, UW, U=
W );
+extern void ML_(generic_POST_sys_getsockopt) ( TId, SR, UW, UW, UW, U=
W, UW );
+extern void ML_(generic_PRE_sys_getsockname) ( TId, UW, UW, UW );
+extern void ML_(generic_POST_sys_getsockname) ( TId, SR, UW, UW, UW );
+extern void ML_(generic_PRE_sys_getpeername) ( TId, UW, UW, UW );
+extern void ML_(generic_POST_sys_getpeername) ( TId, SR, UW, UW, UW );
+extern void ML_(generic_PRE_sys_sendmsg) ( TId, UW, UW );
+extern void ML_(generic_PRE_sys_recvmsg) ( TId, UW, UW );
+extern void ML_(generic_POST_sys_recvmsg) ( TId, UW, UW );
=20
-extern void VG_(generic_PRE_sys_semop) ( TId, UW, UW, UW );
-extern void VG_(generic_PRE_sys_semtimedop) ( TId, UW, UW, UW, UW );
-extern void VG_(generic_PRE_sys_semctl) ( TId, UW, UW, UW, UW );
-extern void VG_(generic_POST_sys_semctl) ( TId, UW, UW, UW, UW, U=
W );
-extern void VG_(generic_PRE_sys_msgsnd) ( TId, UW, UW, UW, UW );
-extern void VG_(generic_PRE_sys_msgrcv) ( TId, UW, UW, UW, UW, U=
W );
-extern void VG_(generic_POST_sys_msgrcv) ( TId, UW, UW, UW, UW, U=
W, UW );
-extern void VG_(generic_PRE_sys_msgctl) ( TId, UW, UW, UW );
-extern void VG_(generic_POST_sys_msgctl) ( TId, UW, UW, UW, UW );
-extern UWord VG_(generic_PRE_sys_shmat) ( TId, UW, UW, UW );
-extern void VG_(generic_POST_sys_shmat) ( TId, UW, UW, UW, UW );
-extern Bool VG_(generic_PRE_sys_shmdt) ( TId, UW );
-extern void VG_(generic_POST_sys_shmdt) ( TId, UW, UW );
-extern void VG_(generic_PRE_sys_shmctl) ( TId, UW, UW, UW );
-extern void VG_(generic_POST_sys_shmctl) ( TId, UW, UW, UW, UW );
+extern void ML_(generic_PRE_sys_semop) ( TId, UW, UW, UW );
+extern void ML_(generic_PRE_sys_semtimedop) ( TId, UW, UW, UW, UW );
+extern void ML_(generic_PRE_sys_semctl) ( TId, UW, UW, UW, UW );
+extern void ML_(generic_POST_sys_semctl) ( TId, UW, UW, UW, UW, U=
W );
+extern void ML_(generic_PRE_sys_msgsnd) ( TId, UW, UW, UW, UW );
+extern void ML_(generic_PRE_sys_msgrcv) ( TId, UW, UW, UW, UW, U=
W );
+extern void ML_(generic_POST_sys_msgrcv) ( TId, UW, UW, UW, UW, U=
W, UW );
+extern void ML_(generic_PRE_sys_msgctl) ( TId, UW, UW, UW );
+extern void ML_(generic_POST_sys_msgctl) ( TId, UW, UW, UW, UW );
+extern UWord ML_(generic_PRE_sys_shmat) ( TId, UW, UW, UW );
+extern void ML_(generic_POST_sys_shmat) ( TId, UW, UW, UW, UW );
+extern Bool ML_(generic_PRE_sys_shmdt) ( TId, UW );
+extern void ML_(generic_POST_sys_shmdt) ( TId, UW, UW );
+extern void ML_(generic_PRE_sys_shmctl) ( TId, UW, UW, UW );
+extern void ML_(generic_POST_sys_shmctl) ( TId, UW, UW, UW, UW );
=20
#undef TId
#undef UW
Modified: trunk/coregrind/m_syswrap/priv_syswrap-linux.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2005-06-23 00:17:51 UT=
C (rev 3999)
+++ trunk/coregrind/m_syswrap/priv_syswrap-linux.h 2005-06-23 01:02:53 UT=
C (rev 4000)
@@ -34,7 +34,7 @@
/* requires #include "priv_types_n_macros.h" */
=20
// Run a thread from beginning to end.=20
-extern VgSchedReturnCode VG_(thread_wrapper)(Word /*ThreadId*/ tid);
+extern VgSchedReturnCode ML_(thread_wrapper)(Word /*ThreadId*/ tid);
=20
DECL_TEMPLATE(linux, sys_exit_group);
=20
Modified: trunk/coregrind/m_syswrap/priv_syswrap-main.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/priv_syswrap-main.h 2005-06-23 00:17:51 UTC=
(rev 3999)
+++ trunk/coregrind/m_syswrap/priv_syswrap-main.h 2005-06-23 01:02:53 UTC=
(rev 4000)
@@ -33,7 +33,7 @@
=20
/* Back up a thread so as to restart a system call. */
extern
-void VG_(fixup_guest_state_to_restart_syscall) ( ThreadArchState* arch )=
;
+void ML_(fixup_guest_state_to_restart_syscall) ( ThreadArchState* arch )=
;
=20
#endif // __PRIV_SYSWRAP_MAIN_H
=20
Modified: trunk/coregrind/m_syswrap/syswrap-generic.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/syswrap-generic.c 2005-06-23 00:17:51 UTC (=
rev 3999)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2005-06-23 01:02:53 UTC (=
rev 4000)
@@ -58,7 +58,7 @@
=20
/* return true if address range entirely contained within client
address space */
-Bool VG_(valid_client_addr)(Addr start, SizeT size, ThreadId tid,
+Bool ML_(valid_client_addr)(Addr start, SizeT size, ThreadId tid,
const Char *syscallname)
{
Addr end =3D start+size;
@@ -93,7 +93,7 @@
return ret;
}
=20
-Bool VG_(client_signal_OK)(Int sigNo)
+Bool ML_(client_signal_OK)(Int sigNo)
{
/* signal 0 is OK for kill */
Bool ret =3D sigNo >=3D 0 && sigNo <=3D VG_SIGVGRTUSERMAX;
@@ -130,7 +130,7 @@
*a =3D ra;
}
=20
-void VG_(mmap_segment) ( Addr a, SizeT len, UInt prot,=20
+void ML_(mmap_segment) ( Addr a, SizeT len, UInt prot,=20
UInt mm_flags, Int fd, ULong offset )
{
Bool rr, ww, xx;
@@ -169,7 +169,7 @@
if (VG_PGROUNDDN(old_addr) !=3D old_addr)
return VG_(mk_SysRes_Error)( VKI_EINVAL );
=20
- if (!VG_(valid_client_addr)(old_addr, old_size, tid, "mremap(old_addr=
)"))
+ if (!ML_(valid_client_addr)(old_addr, old_size, tid, "mremap(old_addr=
)"))
return VG_(mk_SysRes_Error)( VKI_EFAULT );
=20
/* fixed at the current address means we don't move it */
@@ -180,7 +180,7 @@
if (VG_PGROUNDDN(new_addr) !=3D new_addr)
return VG_(mk_SysRes_Error)( VKI_EINVAL );
=20
- if (!VG_(valid_client_addr)(new_addr, new_size, tid, "mremap(new_a=
ddr)"))
+ if (!ML_(valid_client_addr)(new_addr, new_size, tid, "mremap(new_a=
ddr)"))
return VG_(mk_SysRes_Error)( VKI_ENOMEM );
=20
/* check for overlaps */
@@ -345,7 +345,7 @@
some such thing) or that we don't know the filename. If the fd is
already open, then we're probably doing a dup2() to an existing fd,
so just overwrite the existing one. */
-void VG_(record_fd_open)(ThreadId tid, Int fd, char *pathname)
+void ML_(record_fd_open)(ThreadId tid, Int fd, char *pathname)
{
OpenFd *i;
=20
@@ -521,7 +521,7 @@
=20
for (i =3D 0; i < count; i++)
if(VG_(fcntl)(i, VKI_F_GETFL, 0) !=3D -1)
- VG_(record_fd_open)(-1, i, NULL);
+ ML_(record_fd_open)(-1, i, NULL);
}
=20
/* Initialize the list of open file descriptors with the file descriptor=
s
@@...
[truncated message content] |