|
From: Nicholas N. <nj...@ca...> - 2004-10-18 15:47:28
|
CVS commit by nethercote:
Increase the size of M_VG_ERRTXT from 512B to 4KB, increasing the size of C++
names that can be demangled.
MERGE TO STABLE
M +1 -1 core.h 1.40
M +3 -3 vg_errcontext.c 1.63
M +4 -4 vg_symtab2.c 1.91
M +1 -1 vg_to_ucode.c 1.148
--- valgrind/coregrind/core.h #1.39:1.40
@@ -116,5 +116,5 @@
/* 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. */
--- valgrind/coregrind/vg_errcontext.c #1.62:1.63
@@ -333,5 +333,5 @@ 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);
@@ -987,6 +987,6 @@ static Supp* is_suppressible_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;
--- valgrind/coregrind/vg_symtab2.c #1.90:1.91
@@ -2146,7 +2146,7 @@ Char* VG_(describe_eip)(Addr eip, Char*
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);
@@ -2186,5 +2186,5 @@ void VG_(mini_stack_dump) ( Addr eips[],
{
UInt i;
- UChar buf[M_VG_ERRTXT];
+ static UChar buf[M_VG_ERRTXT];
Bool main_done = False;
--- valgrind/coregrind/vg_to_ucode.c #1.147:1.148
@@ -3858,5 +3858,5 @@ static Addr disInstr ( UCodeBlock* cb, A
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
|