|
From: <sv...@va...> - 2012-10-21 03:43:28
|
florian 2012-10-21 04:43:20 +0100 (Sun, 21 Oct 2012)
New Revision: 13071
Log:
First round of Char/HChar fixes for memcheck.
Modified files:
trunk/memcheck/mc_errors.c
trunk/memcheck/mc_include.h
trunk/memcheck/mc_main.c
trunk/memcheck/mc_malloc_wrappers.c
trunk/memcheck/mc_translate.c
Modified: trunk/memcheck/mc_errors.c (+4 -4)
===================================================================
--- trunk/memcheck/mc_errors.c 2012-10-21 04:23:36 +01:00 (rev 13070)
+++ trunk/memcheck/mc_errors.c 2012-10-21 04:43:20 +01:00 (rev 13071)
@@ -99,7 +99,7 @@
// blocks.
struct {
BlockKind block_kind;
- Char* block_desc; // "block", "mempool" or user-defined
+ const HChar* block_desc; // "block", "mempool" or user-defined
SizeT block_szB;
PtrdiffT rwoffset;
ExeContext* lastchange;
@@ -322,7 +322,7 @@
SizeT block_szB = ai->Addr.Block.block_szB;
PtrdiffT rwoffset = ai->Addr.Block.rwoffset;
SizeT delta;
- const Char* relative;
+ const HChar* relative;
if (rwoffset < 0) {
delta = (SizeT)(-rwoffset);
@@ -412,7 +412,7 @@
static void mc_pp_origin ( ExeContext* ec, UInt okind )
{
- HChar* src = NULL;
+ const HChar* src = NULL;
tl_assert(ec);
switch (okind) {
@@ -1518,7 +1518,7 @@
}
}
-Char* MC_(get_error_name) ( Error* err )
+HChar* MC_(get_error_name) ( Error* err )
{
switch (VG_(get_error_kind)(err)) {
case Err_RegParam: return "Param";
Modified: trunk/memcheck/mc_include.h (+2 -2)
===================================================================
--- trunk/memcheck/mc_include.h 2012-10-21 04:23:36 +01:00 (rev 13070)
+++ trunk/memcheck/mc_include.h 2012-10-21 04:43:20 +01:00 (rev 13071)
@@ -382,7 +382,7 @@
Bool MC_(get_extra_suppression_info) ( Error* err,
/*OUT*/Char* buf, Int nBuf );
-Char* MC_(get_error_name) ( Error* err );
+HChar* MC_(get_error_name) ( Error* err );
/* Recording of errors */
void MC_(record_address_error) ( ThreadId tid, Addr a, Int szB,
@@ -429,7 +429,7 @@
Addr start;
SizeT size;
ExeContext* where;
- Char* desc;
+ HChar* desc;
}
CGenBlock;
Modified: trunk/memcheck/mc_translate.c (+2 -2)
===================================================================
--- trunk/memcheck/mc_translate.c 2012-10-21 04:23:36 +01:00 (rev 13070)
+++ trunk/memcheck/mc_translate.c 2012-10-21 04:43:20 +01:00 (rev 13071)
@@ -3843,7 +3843,7 @@
IRAtom* addr, UInt bias )
{
void* helper;
- Char* hname;
+ const HChar* hname;
IRDirty* di;
IRTemp datavbits;
IRAtom* addrAct;
@@ -4155,7 +4155,7 @@
IROp mkAdd;
IRType ty, tyAddr;
void* helper = NULL;
- Char* hname = NULL;
+ const HChar* hname = NULL;
IRConst* c;
tyAddr = mce->hWordTy;
Modified: trunk/memcheck/mc_main.c (+2 -2)
===================================================================
--- trunk/memcheck/mc_main.c 2012-10-21 04:23:36 +01:00 (rev 13070)
+++ trunk/memcheck/mc_main.c 2012-10-21 04:43:20 +01:00 (rev 13071)
@@ -1373,7 +1373,7 @@
if (lenT > 256 * 1024 * 1024) {
if (VG_(clo_verbosity) > 0 && !VG_(clo_xml)) {
- Char* s = "unknown???";
+ const HChar* s = "unknown???";
if (vabits16 == VA_BITS16_NOACCESS ) s = "noaccess";
if (vabits16 == VA_BITS16_UNDEFINED) s = "undefined";
if (vabits16 == VA_BITS16_DEFINED ) s = "defined";
@@ -5481,7 +5481,7 @@
/* VG_(printf)("allocated %d %p\n", i, cgbs); */
cgbs[i].start = arg[1];
cgbs[i].size = arg[2];
- cgbs[i].desc = VG_(strdup)("mc.mhcr.1", (Char *)arg[3]);
+ cgbs[i].desc = (HChar *)VG_(strdup)("mc.mhcr.1", (Char *)arg[3]);
cgbs[i].where = VG_(record_ExeContext) ( tid, 0/*first_ip_delta*/ );
*ret = i;
} else
Modified: trunk/memcheck/mc_malloc_wrappers.c (+1 -1)
===================================================================
--- trunk/memcheck/mc_malloc_wrappers.c 2012-10-21 04:23:36 +01:00 (rev 13070)
+++ trunk/memcheck/mc_malloc_wrappers.c 2012-10-21 04:43:20 +01:00 (rev 13071)
@@ -222,7 +222,7 @@
/*------------------------------------------------------------*/
// XXX: should make this a proper error (bug #79311).
-static Bool complain_about_silly_args(SizeT sizeB, Char* fn)
+static Bool complain_about_silly_args(SizeT sizeB, const HChar* fn)
{
// Cast to a signed type to catch any unexpectedly negative args. We're
// assuming here that the size asked for is not greater than 2^31 bytes
|