|
From: <sv...@va...> - 2005-05-18 04:36:06
|
Author: njn
Date: 2005-05-18 05:36:01 +0100 (Wed, 18 May 2005)
New Revision: 3766
Modified:
trunk/coregrind/m_options.c
trunk/coregrind/vg_main.c
Log:
Hmm, actually put some code into m_options.c.
Modified: trunk/coregrind/m_options.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_options.c 2005-05-17 21:14:54 UTC (rev 3765)
+++ trunk/coregrind/m_options.c 2005-05-18 04:36:01 UTC (rev 3766)
@@ -29,10 +29,53 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-/* This file would contain the executable content of the m_options
- module, if there were any. However, there aren't. */
+#include "core.h"
+#include "pub_core_options.h"
=20
+// See pub_{core,tool}_options.h for explanations of all these.
=20
+
+/* Define, and set defaults. */
+VexControl VG_(clo_vex_control);
+Bool VG_(clo_error_limit) =3D True;
+Bool VG_(clo_db_attach) =3D False;
+Char* VG_(clo_db_command) =3D GDB_PATH " -nw %f %p";
+Int VG_(clo_gen_suppressions) =3D 0;
+Int VG_(clo_sanity_level) =3D 1;
+Int VG_(clo_verbosity) =3D 1;
+Bool VG_(clo_demangle) =3D True;
+Bool VG_(clo_trace_children) =3D False;
+Int VG_(clo_log_fd) =3D 2;
+Char* VG_(clo_log_name) =3D NULL;
+Bool VG_(clo_time_stamp) =3D False;
+Int VG_(clo_input_fd) =3D 0; /* stdin */
+Int VG_(clo_n_suppressions) =3D 0;
+Char* VG_(clo_suppressions)[VG_CLO_MAX_SFILES];
+Bool VG_(clo_profile) =3D False;
+UChar VG_(clo_trace_flags) =3D 0; // 00000000b
+UChar VG_(clo_profile_flags) =3D 0; // 00000000b
+Int VG_(clo_trace_notbelow) =3D 0;
+Bool VG_(clo_trace_syscalls) =3D False;
+Bool VG_(clo_trace_signals) =3D False;
+Bool VG_(clo_trace_symtab) =3D False;
+Bool VG_(clo_trace_cfi) =3D False;
+Bool VG_(clo_trace_redir) =3D False;
+Bool VG_(clo_trace_sched) =3D False;
+Bool VG_(clo_trace_pthreads) =3D False;
+Int VG_(clo_dump_error) =3D 0;
+Int VG_(clo_backtrace_size) =3D 12;
+Char* VG_(clo_weird_hacks) =3D NULL;
+Bool VG_(clo_run_libc_freeres) =3D True;
+Bool VG_(clo_track_fds) =3D False;
+Bool VG_(clo_show_below_main)=3D False;
+Bool VG_(clo_pointercheck) =3D True;
+Bool VG_(clo_support_elan3) =3D False;
+Bool VG_(clo_branchpred) =3D False;
+Bool VG_(clo_model_pthreads) =3D False;
+Bool VG_(clo_show_emwarns) =3D False;
+Int VG_(clo_max_stackframe) =3D 2000000;
+Bool VG_(clo_wait_for_gdb) =3D False;
+
/*--------------------------------------------------------------------*/
/*--- end m_options.c ---*/
/*--------------------------------------------------------------------*/
Modified: trunk/coregrind/vg_main.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/vg_main.c 2005-05-17 21:14:54 UTC (rev 3765)
+++ trunk/coregrind/vg_main.c 2005-05-18 04:36:01 UTC (rev 3766)
@@ -1395,55 +1395,6 @@
vg_assert(0 =3D=3D res);
}
=20
-
-/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
-/*=3D=3D=3D Command-line: variables, processing, etc =
=3D=3D=3D*/
-/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
-
-// See pub_{core,tool}_options.h for explanations of all these.
-
-/* Define, and set defaults. */
-VexControl VG_(clo_vex_control);
-Bool VG_(clo_error_limit) =3D True;
-Bool VG_(clo_db_attach) =3D False;
-Char* VG_(clo_db_command) =3D CLO_DEFAULT_DBCOMMAND;
-Int VG_(clo_gen_suppressions) =3D 0;
-Int VG_(clo_sanity_level) =3D 1;
-Int VG_(clo_verbosity) =3D 1;
-Bool VG_(clo_demangle) =3D True;
-Bool VG_(clo_trace_children) =3D False;
-Int VG_(clo_log_fd) =3D 2;
-Char* VG_(clo_log_name) =3D NULL;
-Bool VG_(clo_time_stamp) =3D False;
-Int VG_(clo_input_fd) =3D 0; /* stdin */
-Int VG_(clo_n_suppressions) =3D 0;
-Char* VG_(clo_suppressions)[VG_CLO_MAX_SFILES];
-Bool VG_(clo_profile) =3D False;
-UChar VG_(clo_trace_flags) =3D 0; // 00000000b
-UChar VG_(clo_profile_flags) =3D 0; // 00000000b
-Int VG_(clo_trace_notbelow) =3D 0;
-Bool VG_(clo_trace_syscalls) =3D False;
-Bool VG_(clo_trace_signals) =3D False;
-Bool VG_(clo_trace_symtab) =3D False;
-Bool VG_(clo_trace_cfi) =3D False;
-Bool VG_(clo_trace_redir) =3D False;
-Bool VG_(clo_trace_sched) =3D False;
-Bool VG_(clo_trace_pthreads) =3D False;
-Int VG_(clo_dump_error) =3D 0;
-Int VG_(clo_backtrace_size) =3D 12;
-Char* VG_(clo_weird_hacks) =3D NULL;
-Bool VG_(clo_run_libc_freeres) =3D True;
-Bool VG_(clo_track_fds) =3D False;
-Bool VG_(clo_show_below_main)=3D False;
-Bool VG_(clo_pointercheck) =3D True;
-Bool VG_(clo_support_elan3) =3D False;
-Bool VG_(clo_branchpred) =3D False;
-Bool VG_(clo_model_pthreads) =3D False;
-Bool VG_(clo_show_emwarns) =3D False;
-Int VG_(clo_max_stackframe) =3D 2000000;
-Bool VG_(clo_wait_for_gdb) =3D False;
-
-
static void usage ( Bool debug_help )
{
Char* usage1 =3D=20
|