-
-SUBDIRS = demangle . docs tests
+SUBDIRS = core . docs \
+ addrcheck \
+ memcheck \
+ cachegrind \
+ corecheck \
+ helgrind \
+ lackey \
+ none
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
val_DATA = $(SUPP_FILES) default.supp
EXTRA_DIST = $(val_DATA) \
PATCHES_APPLIED ACKNOWLEDGEMENTS \
README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
-
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
+ README_MISSING_SYSCALL_OR_IOCTL TODO \
+ valgrind.spec valgrind.spec.in
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(valdir)
-
-SUBDIRS = demangle . docs tests
+INCLUDES = -I$(top_srcdir)/include
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
+val_PROGRAMS = vgskin_addrcheck.so
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
+vgskin_addrcheck_so_SOURCES = ac_main.c
vgskin_addrcheck_so_LDFLAGS = -shared
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
+noinst_HEADERS = ac_include.h
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
+##vgskin_addrcheck.so$(EXEEXT): $(vgskin_addrcheck_so_OBJECTS)
+## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_addrcheck.so \
+## $(vgskin_addrcheck_so_OBJECTS)
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(valdir)
/*--------------------------------------------------------------------*/
/*--- A header file for the AddrCheck skin. ---*/
-/*--- vg_addrcheck_include.h ---*/
+/*--- ac_include.h ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#ifndef __VG_ADDRCHECK_INCLUDE_H
-#define __VG_ADDRCHECK_INCLUDE_H
+#ifndef __AC_INCLUDE_H
+#define __AC_INCLUDE_H
#include "vg_skin.h"
#endif
/*--------------------------------------------------------------------*/
-/*--- end vg_addrcheck_include.h ---*/
+/*--- end ac_include.h ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- The AddrCheck skin: like MemCheck, but only does address ---*/
/*--- checking. No definedness checking. ---*/
-/*--- vg_addrcheck.c ---*/
+/*--- ac_main.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_addrcheck_include.h"
+#include "ac_include.h"
//#include "vg_profile.c"
/*------------------------------------------------------------*/
}
/*--------------------------------------------------------------------*/
-/*--- end vg_addrcheck.c ---*/
+/*--- end ac_main.c ---*/
/*--------------------------------------------------------------------*/
-SUBDIRS = demangle . docs tests
+SUBDIRS = . tests docs
+
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
+bin_SCRIPTS = cg_annotate
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
+EXTRA_DIST = \
+ cg_sim_I1.c \
+ cg_sim_D1.c \
+ cg_sim_L2.c \
+ cg_sim_gen.c
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
+val_PROGRAMS = vgskin_cachegrind.so
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
+vgskin_cachegrind_so_SOURCES = cg_main.c
+vgskin_cachegrind_so_LDFLAGS = -shared
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
+##vgskin_cachegrind.so$(EXEEXT): $(vgskin_cachegrind_so_OBJECTS)
+## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachegrind.so \
+## $(vgskin_cachegrind_so_OBJECTS)
/*--------------------------------------------------------------------*/
/*--- The cache simulation skin: cache detection; instrumentation, ---*/
/*--- recording and results printing. ---*/
-/*--- vg_cachesim.c ---*/
+/*--- cg_main.c ---*/
/*--------------------------------------------------------------------*/
/*
int line_size; /* bytes */
} cache_t;
-#include "vg_cachesim_L2.c"
-#include "vg_cachesim_I1.c"
-#include "vg_cachesim_D1.c"
+#include "cg_sim_L2.c"
+#include "cg_sim_I1.c"
+#include "cg_sim_D1.c"
/*------------------------------------------------------------*/
/*--- Constants ---*/
#endif
/*--------------------------------------------------------------------*/
-/*--- end vg_cachesim.c ---*/
+/*--- end cg_main.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- D1 cache simulation. ---*/
-/*--- vg_cachesim_D1.c ---*/
+/*--- cg_sim_D1.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_cachesim_gen.c"
+#include "cg_sim_gen.c"
CACHESIM(D1, { (*m1)++; cachesim_L2_doref(a, size, m1, m2); } );
/*--------------------------------------------------------------------*/
-/*--- end vg_cachesim_D1.c ---*/
+/*--- end cg_sim_D1.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- I1 cache simulation. ---*/
-/*--- vg_cachesim_I1.c ---*/
+/*--- cg_sim_I1.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_cachesim_gen.c"
+#include "cg_sim_gen.c"
CACHESIM(I1, { (*m1)++; cachesim_L2_doref(a, size, m1, m2); } );
/*--------------------------------------------------------------------*/
-/*--- end vg_cachesim_I1.c ---*/
+/*--- end cg_sim_gen.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- L2 cache simulation. ---*/
-/*--- vg_cachesim_L2.c ---*/
+/*--- cg_sim_L2.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_cachesim_gen.c"
+#include "cg_sim_gen.c"
CACHESIM(L2, (*m2)++ );
/*--------------------------------------------------------------------*/
-/*--- end vg_cachesim_L2.c ---*/
+/*--- end cg_sim_L2.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- Generic stuff shared by all cache simulation files. ---*/
-/*--- vg_cachesim_gen.c ---*/
+/*--- cg_sim_gen.c ---*/
/*--------------------------------------------------------------------*/
/*
- both blocks miss --> one miss (not two)
*/
-#ifndef __VG_CACHESIM_GEN_C
-#define __VG_CACHESIM_GEN_C
+#ifndef __CG_SIM_GEN_C
+#define __CG_SIM_GEN_C
typedef struct {
int size; /* bytes */
return; \
}
-#endif /* ndef __VG_CACHESIM_GEN_C */
+#endif /* ndef __CG_SIM_GEN_C */
/*--------------------------------------------------------------------*/
-/*--- end vg_cachesim_gen.c ---*/
+/*--- end cg_sim_gen.c ---*/
/*--------------------------------------------------------------------*/
discard ... (... -> ...) translations in range 0x........ .. 0x........
-discard syms in /.../tests/cachesim/myprint.so due to munmap()
+discard syms in /.../tests/myprint.so due to munmap()
I refs:
I1 misses:
discard ... (... -> ...) translations in range 0x........ .. 0x........
-discard syms in /.../tests/cachesim/myprint.so due to munmap()
+discard syms in /.../tests/myprint.so due to munmap()
I refs:
I1 misses:
dir=`dirname $0`
-$dir/filter_stderr | $dir/../filter_discards
+$dir/filter_stderr | $dir/../../tests/filter_discards
dir=`dirname $0`
-$dir/../filter_stderr_basic |
+$dir/../../tests/filter_stderr_basic |
# Remove numbers from I/D/L2 "refs:" lines
sed "s/\(\(I\|D\|L2\) *refs:\)[ 0-9,()+rdw]*$/\1/" |
# Process this file with autoconf to produce a configure script.
-AC_INIT(vg_clientmalloc.c)
+AC_INIT(core/vg_clientmalloc.c) # give me a source file, any source file...
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(valgrind, post-1.0.0-ERASER)
+AM_INIT_AUTOMAKE(valgrind, HEAD)
AM_MAINTAINER_MODE
AC_CHECK_FUNCS([floor memchr memset mkdir strchr strdup strpbrk strrchr strstr])
AC_OUTPUT(
- vg_annotate
- valgrind
- valgrind.spec
Makefile
+ valgrind.spec
+ core/Makefile
+ core/demangle/Makefile
+ core/docs/Makefile
+ core/valgrind
docs/Makefile
- tests/Makefile
- tests/cachesim/Makefile
- tests/corecheck/Makefile
- tests/none/Makefile
- tests/memcheck/Makefile
- demangle/Makefile)
+ addrcheck/Makefile
+ memcheck/Makefile
+ memcheck/tests/Makefile
+ memcheck/docs/Makefile
+ cachegrind/Makefile
+ cachegrind/cg_annotate
+ cachegrind/tests/Makefile
+ cachegrind/docs/Makefile
+ corecheck/Makefile
+ corecheck/tests/Makefile
+ helgrind/Makefile
+ lackey/Makefile
+ none/Makefile
+ none/tests/Makefile
+)
cat<<EOF
-
-SUBDIRS = demangle . docs tests
+SUBDIRS = . tests
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
+val_PROGRAMS = vgskin_corecheck.so
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
+vgskin_corecheck_so_SOURCES = cc_main.c
vgskin_corecheck_so_LDFLAGS = -shared
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
-
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
-
+##vgskin_corecheck.so$(EXEEXT): $(vgskin_corecheck_so_OBJECTS)
+## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_corecheck.so \
+## $(vgskin_corecheck_so_OBJECTS)
/*--------------------------------------------------------------------*/
-/*--- Skin reporting errors detected in core. vg_corecheck.c ---*/
+/*--- Skin reporting errors detected in core. cc_main.c ---*/
/*--------------------------------------------------------------------*/
/*
}
/*--------------------------------------------------------------------*/
-/*--- end vg_corecheck.c ---*/
+/*--- end cc_main.c ---*/
/*--------------------------------------------------------------------*/
dir=`dirname $0`
-$dir/../filter_stderr_basic
+$dir/../../tests/filter_stderr_basic
prog: malloc3
-stdout_filter: ../filter_addresses
+stdout_filter: ../../tests/filter_addresses
-
-SUBDIRS = demangle . docs tests
+SUBDIRS = demangle .
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
+bin_SCRIPTS = valgrind
default.supp: $(SUPP_FILES)
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
val_PROGRAMS = \
valgrind.so \
valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
+ libpthread.so
+
+EXTRA_DIST = vg_libpthread.vs
libpthread_so_SOURCES = \
vg_libpthread.c \
demangle/dyn-string.o \
demangle/safe-ctype.o
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
noinst_HEADERS = \
vg_kerneliface.h \
vg_include.h \
- vg_skin.h \
vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
+ vg_unsafe.h
MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
## $(libpthread_so_OBJECTS) \
## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
-
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
-
-INCLUDES = -I$(top_srcdir)
+
+INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/include
CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
skin_so="vgskin_${skin}.so"
if [ ! -r $VALGRIND/$skin_so ] ; then
echo
- echo "Extension error:"
+ echo "Skin error:"
echo " The shared library \`$skin_so' for the chosen"
echo " skin \`$skin' could not be found in"
echo " $VALGRIND"
-
-SUBDIRS = demangle . docs tests
-
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
+val_PROGRAMS = vgskin_helgrind.so
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
+vgskin_helgrind_so_SOURCES = hg_main.c
+vgskin_helgrind_so_LDFLAGS = -shared
+##vgskin_helgrind.so$(EXEEXT): $(vgskin_helgrind_so_OBJECTS)
+## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_helgrind.so \
+## $(vgskin_helgrind_so_OBJECTS)
/*--------------------------------------------------------------------*/
/*--- The Eraser skin: checking for data races in threaded ---*/
/*--- programs. ---*/
-/*--- vg_eraser.c ---*/
+/*--- hg_main.c ---*/
/*--------------------------------------------------------------------*/
/*
}
/*--------------------------------------------------------------------*/
-/*--- end vg_eraser.c ---*/
+/*--- end hg_main.c ---*/
/*--------------------------------------------------------------------*/
definitions.
------------------------------------------------------------------ */
-#include "./vg_kerneliface.h"
+#include "core/vg_kerneliface.h"
/*====================================================================*/
-
-SUBDIRS = demangle . docs tests
-
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
+val_PROGRAMS = vgskin_lackey.so
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
+vgskin_lackey_so_SOURCES = lk_main.c
vgskin_lackey_so_LDFLAGS = -shared
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
-
##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
## $(vgskin_lackey_so_OBJECTS)
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
-
/*--------------------------------------------------------------------*/
/*--- Simple skin for counting UInstrs, using a C helper. ---*/
-/*--- vg_lackey.c ---*/
+/*--- lk_main.c ---*/
/*--------------------------------------------------------------------*/
/*
needs->name = "lackey";
needs->description = "a UInstr counter";
- //VG_(register_compact_helper)((Addr) & add_one_dlrr_call);
+ VG_(register_compact_helper)((Addr) & add_one_dlrr_call);
VG_(register_compact_helper)((Addr) & add_one_BB);
VG_(register_compact_helper)((Addr) & add_one_x86_instr);
VG_(register_compact_helper)((Addr) & add_one_UInstr);
}
/*--------------------------------------------------------------------*/
-/*--- end vg_lackey.c ---*/
+/*--- end lk_main.c ---*/
/*--------------------------------------------------------------------*/
+SUBDIRS = . tests docs
-SUBDIRS = demangle . docs tests
+INCLUDES = -I$(top_srcdir)/include
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
-
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
-
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
+val_PROGRAMS = vgskin_memcheck.so
vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
+ mc_main.c \
+ mc_clientreqs.c \
+ mc_errcontext.c \
+ mc_from_ucode.c \
+ mc_translate.c \
+ mc_helpers.S
vgskin_memcheck_so_LDFLAGS = -shared
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
-vgskin_none_so_LDFLAGS = -shared
-
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
+ mc_include.h \
+ memcheck.h
MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
-##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
-## $(vgskin_none_so_OBJECTS)
-
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
-
/*--------------------------------------------------------------------*/
/*--- Part of the MemCheck skin: for when the client advises ---*/
/*--- Valgrind about memory permissions. ---*/
-/*--- vg_memcheck_clientreqs.c ---*/
+/*--- mc_clientreqs.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_memcheck_include.h"
+#include "mc_include.h"
-#include "vg_memcheck.h" /* for VG_USERREQ__* */
+#include "memcheck.h" /* for VG_USERREQ__* */
/*------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
-/*--- end vg_memcheck_clientreqs.c ---*/
+/*--- end mc_clientreqs.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- Part of the MemCheck skin: management of memory error ---*/
/*--- messages. ---*/
-/*--- vg_memcheck_errcontext.c ---*/
+/*--- mc_errcontext.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_memcheck_include.h"
+#include "mc_include.h"
/*------------------------------------------------------------*/
/*--- Defns ---*/
# undef STREQ
/*--------------------------------------------------------------------*/
-/*--- end vg_memcheck_errcontext.c ---*/
+/*--- end mc_errcontext.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- Part of the MemCheck skin: Generate code for skin-specific ---*/
/*--- UInstrs. ---*/
-/*--- vg_memcheck_from_ucode.c ---*/
+/*--- mc_from_ucode.c ---*/
/*--------------------------------------------------------------------*/
/*
This file is part of Valgrind, an x86 protected-mode emulator
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_memcheck_include.h"
+#include "mc_include.h"
/*------------------------------------------------------------*/
/*--- Renamings of frequently-used global functions. ---*/
}
/*--------------------------------------------------------------------*/
-/*--- end vg_memcheck_from_ucode.c ---*/
+/*--- end mc_from_ucode.c ---*/
/*--------------------------------------------------------------------*/
##--------------------------------------------------------------------##
##--- Support routines for the memory checker. ---##
-##--- vg_memcheck_helpers.S ---##
+##--- mc_helpers.S ---##
##--------------------------------------------------------------------##
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_constants.h"
+#include "vg_constants_skin.h"
.global SK_(helper_value_check0_fail)
SK_(helper_value_check0_fail):
popal
ret
-
+##--------------------------------------------------------------------##
+##--- end mc_helpers.S ---##
+##--------------------------------------------------------------------##
/*--------------------------------------------------------------------*/
/*--- A header file for all parts of the MemCheck skin. ---*/
-/*--- vg_memcheck_include.h ---*/
+/*--- mc_include.h ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#ifndef __VG_MEMCHECK_INCLUDE_H
-#define __VG_MEMCHECK_INCLUDE_H
+#ifndef __MC_INCLUDE_H
+#define __MC_INCLUDE_H
#include "vg_skin.h"
#endif
/*--------------------------------------------------------------------*/
-/*--- end vg_memcheck_include.h ---*/
+/*--- end mc_include.h ---*/
/*--------------------------------------------------------------------*/
/*--- Part of the MemCheck skin: Maintain bitmaps of memory, ---*/
/*--- tracking the accessibility (A) and validity (V) status of ---*/
/*--- each byte. ---*/
-/*--- vg_memcheck.c ---*/
+/*--- mc_main.c ---*/
/*--------------------------------------------------------------------*/
/*
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_memcheck_include.h"
-#include "vg_memcheck.h" /* for client requests */
+#include "mc_include.h"
+#include "memcheck.h" /* for client requests */
//#include "vg_profile.c"
/* Define to debug the mem audit system. */
}
/*--------------------------------------------------------------------*/
-/*--- end vg_memcheck.c ---*/
+/*--- end mc_main.c ---*/
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
/*--- Part of the MemCheck skin: instrument UCode to perform ---*/
/*--- memory checking operations. ---*/
-/*--- vg_memcheck_translate.c ---*/
+/*--- mc_translate.c ---*/
/*--------------------------------------------------------------------*/
/*
This file is part of Valgrind, an x86 protected-mode emulator
The GNU General Public License is contained in the file COPYING.
*/
-#include "vg_memcheck_include.h"
+#include "mc_include.h"
/* ---------------------------------------------------------------------
Template functions for extending UCode
#undef dis
/*--------------------------------------------------------------------*/
-/*--- end vg_memcheck_translate.c ---*/
+/*--- end mc_translate.c ---*/
/*--------------------------------------------------------------------*/
*/
-#ifndef __VG_MEMCHECK_H
-#define __VG_MEMCHECK_H
+#ifndef __MEMCHECK_H
+#define __MEMCHECK_H
/* This file is for inclusion into client (your!) code.
Invalid write of size 1
at 0x........: main (badaddrvalue.c:8)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
Address 0x........ is 1 bytes before a block of size 8 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (badaddrvalue.c:7)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
Invalid read of size 1
at 0x........: main (badaddrvalue.c:9)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
Address 0x........ is 1 bytes before a block of size 8 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (badaddrvalue.c:7)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 8 bytes in 1 blocks.
Invalid write of size 1
at 0x........: main (badaddrvalue.c:8)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
Address 0x........ is 1 bytes before a block of size 8 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (badaddrvalue.c:7)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
Invalid read of size 1
at 0x........: main (badaddrvalue.c:9)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
Address 0x........ is 1 bytes before a block of size 8 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (badaddrvalue.c:7)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badaddrvalue)
+ by 0x........: (within /.../tests/badaddrvalue)
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 8 bytes in 1 blocks.
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (badfree.c:12)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/badfree)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/badfree)
Address 0x........ is not stack'd, malloc'd or free'd
Invalid free() / delete / delete[]
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (badfree.c:15)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/badfree)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/badfree)
Address 0x........ is on thread 1's stack
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (badloop.c:12)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/badloop)
+ by 0x........: (within /.../tests/badloop)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Syscall param socketcall.getsockname(name) contains unaddressable byte(s)
at 0x........: getsockname (in /...libc...)
by 0x........: __libc_start_main (...libc...)
- by 0x........: socket@@GLIBC_2.0 (in /.../tests/memcheck/buflen_check)
+ by 0x........: socket@@GLIBC_2.0 (in /.../tests/buflen_check)
Address 0x........ is not stack'd, malloc'd or free'd
Syscall param socketcall.getsockname(namelen_in) contains uninitialised or unaddressable byte(s)
at 0x........: getsockname (in /...libc...)
by 0x........: __libc_start_main (...libc...)
- by 0x........: socket@@GLIBC_2.0 (in /.../tests/memcheck/buflen_check)
+ by 0x........: socket@@GLIBC_2.0 (in /.../tests/buflen_check)
Address 0x........ is not stack'd, malloc'd or free'd
getsockname(1) failed
getsockname(2) failed
Syscall param socketcall.getsockname(name) contains unaddressable byte(s)
at 0x........: getsockname (in /...libc...)
by 0x........: __libc_start_main (...libc...)
- by 0x........: socket@@GLIBC_2.0 (in /.../tests/memcheck/buflen_check)
+ by 0x........: socket@@GLIBC_2.0 (in /.../tests/buflen_check)
Address 0x........ is not stack'd, malloc'd or free'd
getsockname(1) failed
getsockname(2) failed
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (doublefree.c:10)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/doublefree)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/doublefree)
Address 0x........ is 0 bytes inside a block of size 177 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (doublefree.c:10)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/doublefree)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/doublefree)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Invalid write of size 1
at 0x........: main (exitprog.c:15)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/exitprog)
+ by 0x........: (within /.../tests/exitprog)
Address 0x........ is 0 bytes after a block of size 1000000 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (exitprog.c:12)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/exitprog)
+ by 0x........: (within /.../tests/exitprog)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 1000000 bytes in 1 blocks.
dir=`dirname $0`
-$dir/../filter_stderr_basic |
+$dir/../../tests/filter_stderr_basic |
# Anonymise addresses
-$dir/../filter_addresses |
+$dir/../../tests/filter_addresses |
# Anonymise line numbers in vg_clientfuncs.c
sed "s/vg_clientfuncs.c:[0-9]\+/vg_clientfuncs.c:.../" |
-$dir/../filter_test_paths |
+$dir/../../tests/filter_test_paths |
# Anonymise paths like "(in /foo/bar/libc-baz.so)"
sed "s/(in \/.*libc.*)$/(in \/...libc...)/" |
Use of uninitialised value of size 8
at 0x........: main (fprw.c:14)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Use of uninitialised value of size 4
at 0x........: main (fprw.c:15)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Use of uninitialised value of size 8
at 0x........: main (fprw.c:16)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Use of uninitialised value of size 4
at 0x........: main (fprw.c:17)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Invalid read of size 8
at 0x........: main (fprw.c:20)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Address 0x........ is 0 bytes inside a block of size 8 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (fprw.c:18)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Invalid write of size 8
at 0x........: main (fprw.c:20)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Address 0x........ is 0 bytes inside a block of size 8 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (fprw.c:18)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Invalid read of size 4
at 0x........: main (fprw.c:21)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Address 0x........ is 0 bytes inside a block of size 4 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (fprw.c:19)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Invalid write of size 4
at 0x........: main (fprw.c:21)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Address 0x........ is 0 bytes inside a block of size 4 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (fprw.c:19)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Invalid free() / delete / delete[]
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (fprw.c:22)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Address 0x........ is not stack'd, malloc'd or free'd
Invalid write of size 8
at 0x........: main (fprw.c:24)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (fprw.c:23)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/fprw)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/fprw)
ERROR SUMMARY: 10 errors from 10 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 4 bytes in 1 blocks.
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (inits.c:17)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/inits)
+ by 0x........: (within /.../tests/inits)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
at 0x........: addemup (inline.c:10)
by 0x........: main (inline.c:18)
by 0x........: __libc_start_main (...libc...)
- by 0x........: calloc@@GLIBC_2.0 (in /.../tests/memcheck/inline)
+ by 0x........: calloc@@GLIBC_2.0 (in /.../tests/inline)
Address 0x........ is 0 bytes after a block of size 40 alloc'd
at 0x........: calloc (vg_clientfuncs.c:...)
by 0x........: main (inline.c:17)
by 0x........: __libc_start_main (...libc...)
- by 0x........: calloc@@GLIBC_2.0 (in /.../tests/memcheck/inline)
+ by 0x........: calloc@@GLIBC_2.0 (in /.../tests/inline)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 40 bytes in 1 blocks.
at 0x........: really (malloc1.c:20)
by 0x........: main (malloc1.c:10)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/malloc1)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc1)
Address 0x........ is 1 bytes inside a block of size 10 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: really (malloc1.c:19)
at 0x........: really (malloc1.c:23)
by 0x........: main (malloc1.c:10)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/malloc1)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc1)
Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: really (malloc1.c:21)
Invalid write of size 1
at 0x........: main (malloc2.c:39)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/malloc2)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
Address 0x........ is 0 bytes inside a block of size 429 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (malloc2.c:38)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/malloc2)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
Invalid free() / delete / delete[]
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (malloc2.c:43)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/malloc2)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
Address 0x........ is 0 bytes inside a block of size 429 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (malloc2.c:38)
by 0x........: __libc_start_main (...libc...)
- by 0x........: free@@GLIBC_2.0 (in /.../tests/memcheck/malloc2)
+ by 0x........: free@@GLIBC_2.0 (in /.../tests/malloc2)
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (manuel1.c:7)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/manuel1)
+ by 0x........: (within /.../tests/manuel1)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Use of uninitialised value of size 4
at 0x........: main (manuel2.c:8)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/manuel2)
+ by 0x........: (within /.../tests/manuel2)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (memalign_test.c:17)
by 0x........: __libc_start_main (...libc...)
- by 0x........: valloc@@GLIBC_2.0 (in /.../tests/memcheck/memalign_test)
+ by 0x........: valloc@@GLIBC_2.0 (in /.../tests/memalign_test)
Address 0x........ is 0 bytes inside a block of size 111110 free'd
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (memalign_test.c:15)
by 0x........: __libc_start_main (...libc...)
- by 0x........: valloc@@GLIBC_2.0 (in /.../tests/memcheck/memalign_test)
+ by 0x........: valloc@@GLIBC_2.0 (in /.../tests/memalign_test)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Conditional jump or move depends on uninitialised value(s)
at 0x........: memcmp (in /...libc...)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/memcmptest)
+ by 0x........: (within /.../tests/memcmptest)
Conditional jump or move depends on uninitialised value(s)
at 0x........: memcmp (in /...libc...)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/memcmptest)
+ by 0x........: (within /.../tests/memcmptest)
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 20 bytes in 2 blocks.
at 0x........: __builtin_delete (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:6)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Address 0x........ is 0 bytes inside a block of size 10 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:5)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Mismatched free() / delete / delete []
at 0x........: __builtin_vec_delete (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:8)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Address 0x........ is 0 bytes inside a block of size 10 alloc'd
at 0x........: malloc (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:7)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Mismatched free() / delete / delete []
at 0x........: __builtin_delete (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:13)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Address 0x........ is 0 bytes inside a block of size 40 alloc'd
at 0x........: __builtin_vec_new (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:12)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Mismatched free() / delete / delete []
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:15)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Address 0x........ is 0 bytes inside a block of size 40 alloc'd
at 0x........: __builtin_vec_new (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:14)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Mismatched free() / delete / delete []
at 0x........: __builtin_vec_delete (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:20)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: __builtin_new (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:19)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Mismatched free() / delete / delete []
at 0x........: free (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:22)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: __builtin_new (vg_clientfuncs.c:...)
by 0x........: main (mismatches.cpp:21)
by 0x........: __libc_start_main (...libc...)
- by 0x........: __builtin_new (in /.../tests/memcheck/mismatches)
+ by 0x........: __builtin_new (in /.../tests/mismatches)
ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
Conditional jump or move depends on uninitialised value(s)
at 0x........: main (new_override.cpp:25)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/new_override)
+ by 0x........: (within /.../tests/new_override)
ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 32 bytes in 1 blocks.
Conditional jump or move depends on uninitialised value(s)
- at 0x........: fooble (in /.../tests/memcheck/pushfpopf)
+ at 0x........: fooble (in /.../tests/pushfpopf)
by 0x........: main (pushfpopf_c.c:12)
by 0x........: __libc_start_main (...libc...)
- by 0x........: (within /.../tests/memcheck/pushfpopf)
+ by 0x........: (within /.../tests/pushfpopf)
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
malloc/free: in use at exit: 0 bytes in 0 blocks.
at 0x........: __libc_sigaction (...libc...)
by 0x........: main (sigaltstack.c:27)
by 0x........: __libc_start_main (...libc...)
- by 0x........: sigaltstack@@GLIBC_2.0 (in /.../tests/memcheck/sigaltstack)
+ by 0x........: sigaltstack@@GLIBC_2.0 (in /.../tests/sigaltstack)
Address 0x........ is on thread 1's stack
res = 0
raising the signal
Invalid write of size 4
at 0x........: main (signal2.c:17)
by 0x........: __libc_start_main (...libc...)
- by 0x........: exit@@GLIBC_2.0 (in /.../tests/memcheck/signal2)
+ by 0x........: exit@@GLIBC_2.0 (in /.../tests/signal2)
Address 0x........ is not stack'd, malloc'd or free'd
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Invalid write of size 4
at 0x........: main (signal2.c:16)
by 0x........: __libc_start_main (...libc...)
- by 0x........: exit@@GLIBC_2.0 (in /.../tests/memcheck/signal2)
+ by 0x........: exit@@GLIBC_2.0 (in /.../tests/signal2)
Address 0x........ is not stack'd, malloc'd or free'd
ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Syscall param ioctl(TCSET{A,AW,AF}) contains uninitialised or unaddressable byte(s)
at 0x........: __ioctl (in /...libc...)
by 0x........: __libc_start_main (...libc...)
- by 0x........: ioctl@@GLIBC_2.0 (in /.../tests/memcheck/weirdioctl)
+ by 0x........: ioctl@@GLIBC_2.0 (in /.../tests/weirdioctl)
Address 0x........ is on thread 1's stack
ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0)
-
-SUBDIRS = demangle . docs tests
+SUBDIRS = . tests
CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-#LDFLAGS = -Wl,-z -Wl,initfirst
-
-INCLUDES = -I$(srcdir)/demangle
-
-bin_SCRIPTS = valgrind vg_annotate
-
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp xfree-3.supp xfree-4.supp
-
-val_DATA = $(SUPP_FILES) default.supp
-
-BUILT_SOURCES = default.supp
-
-default.supp: $(SUPP_FILES)
-
-bzdist: dist
- gunzip -c $(PACKAGE)-$(VERSION).tar.gz | bzip2 > $(PACKAGE)-$(VERSION).tar.bz2
-
-EXTRA_DIST = $(val_DATA) \
- PATCHES_APPLIED ACKNOWLEDGEMENTS \
- README_KDE3_FOLKS README_PACKAGERS \
- README_MISSING_SYSCALL_OR_IOCTL TODO dosyms vg_libpthread.vs \
- valgrind.spec valgrind.spec.in \
- vg_profile.c \
- vg_cachesim_I1.c vg_cachesim_D1.c vg_cachesim_L2.c vg_cachesim_gen.c
+INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-val_PROGRAMS = \
- valgrind.so \
- valgrinq.so \
- libpthread.so \
- vgskin_memcheck.so \
- vgskin_cachesim.so \
- vgskin_eraser.so \
- vgskin_addrcheck.so \
- vgskin_none.so \
- vgskin_lackey.so \
- vgskin_corecheck.so
+val_PROGRAMS = vgskin_none.so
-libpthread_so_SOURCES = \
- vg_libpthread.c \
- vg_libpthread_unimp.c
-libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-valgrinq_so_SOURCES = vg_valgrinq_dummy.c
-valgrinq_so_LDFLAGS = -shared
-
-valgrind_so_SOURCES = \
- vg_clientfuncs.c \
- vg_scheduler.c \
- vg_clientmalloc.c \
- vg_default.c \
- vg_demangle.c \
- vg_dispatch.S \
- vg_errcontext.c \
- vg_execontext.c \
- vg_from_ucode.c \
- vg_helpers.S \
- vg_instrument.c \
- vg_main.c \
- vg_malloc2.c \
- vg_memory.c \
- vg_messages.c \
- vg_mylibc.c \
- vg_procselfmaps.c \
- vg_dummy_profile.c \
- vg_signals.c \
- vg_startup.S \
- vg_symtab2.c \
- vg_syscalls.c \
- vg_syscall.S \
- vg_to_ucode.c \
- vg_translate.c \
- vg_transtab.c
-valgrind_so_LDFLAGS = -Wl,-z -Wl,initfirst -shared
-valgrind_so_LDADD = \
- demangle/cp-demangle.o \
- demangle/cplus-dem.o \
- demangle/dyn-string.o \
- demangle/safe-ctype.o
-
-vgskin_memcheck_so_SOURCES = \
- vg_memcheck.c \
- vg_memcheck_clientreqs.c \
- vg_memcheck_errcontext.c \
- vg_memcheck_from_ucode.c \
- vg_memcheck_translate.c \
- vg_memcheck_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
-
-vgskin_cachesim_so_SOURCES = vg_cachesim.c
-vgskin_cachesim_so_LDFLAGS = -shared
-
-vgskin_eraser_so_SOURCES = vg_eraser.c
-vgskin_eraser_so_LDFLAGS = -shared
-
-vgskin_addrcheck_so_SOURCES = vg_addrcheck.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-
-vgskin_none_so_SOURCES = vg_none.c
+vgskin_none_so_SOURCES = nl_main.c
vgskin_none_so_LDFLAGS = -shared
-vgskin_lackey_so_SOURCES = vg_lackey.c
-vgskin_lackey_so_LDFLAGS = -shared
-
-vgskin_corecheck_so_SOURCES = vg_corecheck.c
-vgskin_corecheck_so_LDFLAGS = -shared
-
-include_HEADERS = valgrind.h
-
-noinst_HEADERS = \
- vg_kerneliface.h \
- vg_include.h \
- vg_skin.h \
- vg_constants.h \
- vg_constants_skin.h \
- vg_unsafe.h \
- vg_memcheck_include.h \
- vg_memcheck.h
-
-MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-
-vg_memory.o: vg_memory.c $(MANUAL_DEPS)
- $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-
-vg_clientfuncs.o: vg_clientfuncs.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-vg_libpthread.o: vg_libpthread.c $(MANUAL_DEPS)
- $(COMPILE) -fno-omit-frame-pointer -c $<
-
-##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
-## $(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-
-##valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-
-##libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
-## $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
-## $(libpthread_so_OBJECTS) \
-## -Wl,-version-script $(srcdir)/vg_libpthread.vs
-
-##vgskin_memcheck.so$(EXEEXT): $(vgskin_memcheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_memcheck.so \
-## $(vgskin_memcheck_so_OBJECTS)
-
-##vgskin_cachesim.so$(EXEEXT): $(vgskin_cachesim_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachesim.so \
-## $(vgskin_cachesim_so_OBJECTS)
-
-##vgskin_eraser.so$(EXEEXT): $(vgskin_eraser_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_eraser.so \
-## $(vgskin_eraser_so_OBJECTS)
-
##vgskin_none.so$(EXEEXT): $(vgskin_none_so_OBJECTS)
## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_none.so \
## $(vgskin_none_so_OBJECTS)
-
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-## $(vgskin_lackey_so_OBJECTS)
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
-
/*--------------------------------------------------------------------*/
-/*--- The null skin. vg_none.c ---*/
+/*--- The null skin. nl_main.c ---*/
/*--------------------------------------------------------------------*/
/*
}
/*--------------------------------------------------------------------*/
-/*--- end vg_none.c ---*/
+/*--- end nl_main.c ---*/
/*--------------------------------------------------------------------*/
#! /bin/sh
-../filter_stderr_basic
+../../tests/filter_stderr_basic
# - Add directory to valgrind/configure.in
# - Write a Makefile.am for it
# - Write a filter_stderr for it; it should always call
-# ../filter_stderr_basic as its first step
+# ../../tests/filter_stderr_basic as its first step
# - Add test programs, .vgtest, .stderr.exp{,.hd}, .stdout.exp files
#
# Note that if you add new basis filters in tests/, if they call other basic
my $exp = ""; # --eraser is default
-# Assumes we're in tests/
-my $valgrind = "../bin/valgrind";
+# Assumes we're in valgrind/
+my $valgrind = "bin/valgrind";
chomp(my $tests_dir = `pwd`);
(system($_[0]) != 2) or exit 1; # 2 is SIGINT
}
+# from a directory name like "/foo/cachesim/tests/" determine the skin name
+sub determine_skin()
+{
+ my $dir = `pwd`;
+ $dir =~ /.*\/([^\/]+)\/tests.*/; # foo/skin_name/tests/foo
+ return $1;
+}
+
sub do_one_test($$)
{
my ($dir, $vgtest) = @_;
if ($exp eq ".hd") {
mysystem("$valgrind $vgopts $prog $args > $name.stdout.out 2> $name.stderr.out");
} else {
- mysystem("$valgrind --skin=$dir $vgopts $prog $args > $name.stdout.out 2> $name.stderr.out");
+ my $skin=determine_skin();
+ mysystem("$valgrind --skin=$skin $vgopts $prog $args > $name.stdout.out 2> $name.stderr.out");
}
if (defined $stdout_filter) {
}
#----------------------------------------------------------------------------
-# Test one directory
+# Test one directory (and any subdirs)
#----------------------------------------------------------------------------
+sub test_one_dir($); # forward declaration
+
sub test_one_dir($)
{
my ($dir) = @_;
$dir =~ s/\/$//; # trim a trailing '/'
+ if ($dir =~ /^(CVS|docs)$/) { return; } # ignore CVS/ and docs/ dirs
+
print "-- Running tests in $dir ----------------------------------\n";
chdir($dir) or die "Could not change into $dir\n";
- my @vgtests = glob "*\.vgtest";
-
- foreach my $vgtest (@vgtests) {
- do_one_test($dir, $vgtest);
+# my @vgtests = glob "*\.vgtest";
+ my @fs = glob "*";
+
+ foreach my $f (@fs) {
+ if (-d $f) {
+ test_one_dir($f);
+ } elsif ($f =~ /\.vgtest$/) {
+ do_one_test($dir, $f);
+ }
}
+
+ print "-- Finished tests in $dir ----------------------------------\n";
chdir("..");
- print "\n";
}
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
sub summarise_results
{
- print "-- Failed tests -------------------------------\n";
+ print "\n== Failed tests ===============================\n";
if (0 == @failures) {
print " (none)\n";
} else {
projects / thirdparty / valgrind.git / commitdiff
