|
From: <sv...@va...> - 2005-08-10 14:03:37
|
Author: njn
Date: 2005-08-10 15:03:28 +0100 (Wed, 10 Aug 2005)
New Revision: 4370
Log:
Don't need local_strcmp() -- the one in m_libcbase is entirely standalone
and so safe to use from the very start.
Modified:
branches/ASPACEM/coregrind/m_main.c
branches/ASPACEM/memcheck/tests/Makefile.am
Modified: branches/ASPACEM/coregrind/m_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
--- branches/ASPACEM/coregrind/m_main.c 2005-08-10 13:42:50 UTC (rev 4369=
)
+++ branches/ASPACEM/coregrind/m_main.c 2005-08-10 14:03:28 UTC (rev 4370=
)
@@ -106,21 +106,6 @@
/*=3D=3D=3D Ultra-basic startup stuff =
=3D=3D=3D*/
/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
=20
-/* This may be needed before m_mylibc is OK to run. */
-static Int local_strcmp ( const HChar* s1, const HChar* s2 )
-{
- while (True) {
- if (*s1 =3D=3D 0 && *s2 =3D=3D 0) return 0;
- if (*s1 =3D=3D 0) return -1;
- if (*s2 =3D=3D 0) return 1;
-
- if (*(UChar*)s1 < *(UChar*)s2) return -1;
- if (*(UChar*)s1 > *(UChar*)s2) return 1;
-
- s1++; s2++;
- }
-}
-
// HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK A
// temporary bootstrapping allocator, for use until such time as we
// can get rid of the circularites in allocator dependencies at
@@ -1257,7 +1242,7 @@
/* parse the options we have (only the options we care about now) */
for (i =3D 1; i < vg_argc; i++) {
=20
- if (local_strcmp(vg_argv[i], "--version") =3D=3D 0) {
+ if (VG_STREQ(vg_argv[i], "--version")) {
VG_(printf)("valgrind-" VERSION "\n");
VG_(exit)(0);
=20
@@ -1698,8 +1683,8 @@
=20
=20
/* Check that the requested tool actually supports XML output. */
- if (VG_(clo_xml) && 0 !=3D local_strcmp(toolname, "memcheck")
- && 0 !=3D local_strcmp(toolname, "none")) {
+ if (VG_(clo_xml) && !VG_STREQ(toolname, "memcheck")
+ && !VG_STREQ(toolname, "none")) {
VG_(clo_xml) =3D False;
VG_(message)(Vg_UserMsg,=20
"Currently only Memcheck|None supports XML output.");=20
@@ -1909,9 +1894,9 @@
for (i =3D 1; i < vg_argc; i++) {
Char *arg =3D vg_argv[i];
=20
- if (VG_(memcmp)(arg, "--exec=3D", 7) =3D=3D 0) {
+ if (VG_CLO_STREQN(7, arg, "--exec=3D")) {
// don't copy existing --exec=3D arg
- } else if (local_strcmp(arg, "--") =3D=3D 0) {
+ } else if (VG_CLO_STREQ(arg, "--")) {
// stop at "--"
break;
} else {
@@ -2324,9 +2309,9 @@
for (i =3D 1; i < argc; i++) {
if (argv[i][0] !=3D '-')
break;
- if (0 =3D=3D local_strcmp(argv[i], "--"))=20
+ if (VG_STREQ(argv[i], "--"))=20
break;
- if (0 =3D=3D local_strcmp(argv[i], "-d"))=20
+ if (VG_STREQ(argv[i], "-d"))=20
loglevel++;
}
=20
@@ -2390,9 +2375,9 @@
for (i =3D 1; i < vg_argc; i++) {
if (vg_argv[i][0] !=3D '-')
break;
- if (0 =3D=3D local_strcmp(vg_argv[i], "--"))=20
+ if (VG_STREQ(vg_argv[i], "--"))=20
break;
- if (0 =3D=3D local_strcmp(vg_argv[i], "-d"))=20
+ if (VG_STREQ(vg_argv[i], "-d"))=20
loglevel++;
}
VG_(debugLog_startup)(loglevel, "Stage 2 (second go)");
Modified: branches/ASPACEM/memcheck/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/memcheck/tests/Makefile.am 2005-08-10 13:42:50 UTC (=
rev 4369)
+++ branches/ASPACEM/memcheck/tests/Makefile.am 2005-08-10 14:03:28 UTC (=
rev 4370)
@@ -134,8 +134,8 @@
=20
# Valgrind unit self-tests
hello_LDFLAGS =3D -Wl,-defsym,valt_load_address=3D0x50000000 \
- -Wl,-T,../../../valt_load_address.lds
-hello_DEPENDENCIES =3D ../../../valt_load_address.lds
+ -Wl,-T,$(top_srcdir)/valt_load_address.lds
+hello_DEPENDENCIES =3D $(top_srcdir)/valt_load_address.lds
=20
vgtest_ume_CFLAGS =3D -DVGA_$(VG_ARCH) -DVGO_$(VG_OS)
vgtest_ume_LDADD =3D ../../coregrind/m_ume.o
|