Increase the size of M_VG_ERRTXT from 512B to 4KB, increasing the size of C++

names that can be demangled.

MERGE TO STABLE


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2787
This commit is contained in:
Nicholas Nethercote 2004-10-18 15:47:18 +00:00
parent 3cff5cf8d9
commit e0e17fab32
4 changed files with 9 additions and 9 deletions

View File

@ -115,7 +115,7 @@
#define M_VG_LIBNAMESTR 100
/* Max length of a text fragment used to construct error messages. */
#define M_VG_ERRTXT 512
#define M_VG_ERRTXT 4096
/* Max length of the string copied from env var VG_ARGS at startup. */
#define M_VG_CMDLINE_STRLEN 1000

View File

@ -332,7 +332,7 @@ void construct_error ( Error* err, ThreadId tid, ErrorKind ekind, Addr a,
static void gen_suppression(Error* err)
{
Int i;
UChar buf[M_VG_ERRTXT];
static UChar buf[M_VG_ERRTXT];
Bool main_done = False;
ExeContext* ec = VG_(get_error_where)(err);
Int stop_at = VG_(clo_backtrace_size);
@ -986,8 +986,8 @@ static Supp* is_suppressible_error ( Error* err )
{
Int i;
Char caller_obj[VG_N_SUPP_CALLERS][M_VG_ERRTXT];
Char caller_fun[VG_N_SUPP_CALLERS][M_VG_ERRTXT];
static Char caller_obj[VG_N_SUPP_CALLERS][M_VG_ERRTXT];
static Char caller_fun[VG_N_SUPP_CALLERS][M_VG_ERRTXT];
Supp* su;

View File

@ -2145,9 +2145,9 @@ Char* VG_(describe_eip)(Addr eip, Char* buf, Int n_buf)
UInt lineno;
UChar ibuf[20];
UInt n = 0;
UChar buf_fn[M_VG_ERRTXT];
UChar buf_obj[M_VG_ERRTXT];
UChar buf_srcloc[M_VG_ERRTXT];
static UChar buf_fn[M_VG_ERRTXT];
static UChar buf_obj[M_VG_ERRTXT];
static UChar buf_srcloc[M_VG_ERRTXT];
Bool know_fnname = VG_(get_fnname) (eip, buf_fn, M_VG_ERRTXT);
Bool know_objname = VG_(get_objname)(eip, buf_obj, M_VG_ERRTXT);
Bool know_srcloc = VG_(get_filename_linenum)(eip, buf_srcloc, M_VG_ERRTXT,
@ -2185,7 +2185,7 @@ Char* VG_(describe_eip)(Addr eip, Char* buf, Int n_buf)
void VG_(mini_stack_dump) ( Addr eips[], UInt n_eips )
{
UInt i;
UChar buf[M_VG_ERRTXT];
static UChar buf[M_VG_ERRTXT];
Bool main_done = False;
Int stop_at = n_eips;

View File

@ -3857,7 +3857,7 @@ static Addr disInstr ( UCodeBlock* cb, Addr eip, Bool* isEnd )
Int t1, t2, t3, t4;
UChar dis_buf[50];
Int am_sz, d_sz;
Char loc_buf[M_VG_ERRTXT];
static Char loc_buf[M_VG_ERRTXT];
/* Holds eip at the start of the insn, so that we can print
consistent error messages for unimplemented insns. */