From: Nicholas Nethercote Date: Fri, 13 May 2005 21:39:45 +0000 (+0000) Subject: Removed mc_asm.h, which is no longer needed since Memcheck has no X-Git-Tag: svn/VALGRIND_3_0_0~626 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed0b56fd2d7f1420dcc4116cbf0a8e7afbf8ee77;p=thirdparty%2Fvalgrind.git Removed mc_asm.h, which is no longer needed since Memcheck has no assembly files any more. Moved MC_() into mc_include.h. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3692 --- diff --git a/NOTES.txt b/NOTES.txt index 561896bf27..e7c6e7be1a 100644 --- a/NOTES.txt +++ b/NOTES.txt @@ -21,16 +21,13 @@ ToDo: vex-x86: check/fix behaviour on SSE MOVQ / MOVSD insns. 9 Apr 05 (starting work on memcheck for 32/64-bit and big/little endian) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* get rid of memcheck/mc_asm.h and include/tool_asm.h. I think - these are left over from single-platform days, when it made +* get rid of include/tool_asm.h. I think + this is left over from single-platform days, when it made sense to have tool-helpers written in assembly. Looks like we need to retain coregrind/core_asm.h, though. - [core_asm.h includes tool_asm.h. The contents of tool_asm.h could be put - into core_asm.h, but that would deviate from the structure described at - the top of core.h... that structure will slowly change as core.h/tool.h - are split up into separate headers for each module, but it might be - worthwhile keeping the asm-only headers? Not sure. --njn] + [tool_asm.h will need to remain in some form -- there are still assembly + files that need to see VG_() and related macros. --njn] Urk. Perhaps nuke all that X86_FEAT gunk in coregrind/core_asm.h though. Vex isn't clever enough to distinguish dozens of CPU diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index 7c710a0420..a9db374fa0 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -29,7 +29,6 @@ mcinclude_HEADERS = \ noinst_HEADERS = \ mac_shared.h \ - mc_asm.h \ mc_include.h mac_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer diff --git a/memcheck/mc_asm.h b/memcheck/mc_asm.h deleted file mode 100644 index dd245ee287..0000000000 --- a/memcheck/mc_asm.h +++ /dev/null @@ -1,43 +0,0 @@ - -/*--------------------------------------------------------------------*/ -/*--- mc_asm.h ---*/ -/*--------------------------------------------------------------------*/ - -/* - This file is part of MemCheck, a heavyweight Valgrind tool for - detecting memory errors. - - Copyright (C) 2000-2005 Julian Seward - jseward@acm.org - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307, USA. - - The GNU General Public License is contained in the file COPYING. -*/ - -#ifndef __MC_ASM_H -#define __MC_ASM_H - -#include "tool_asm.h" - -#define MC_(str) VGAPPEND(vgMemCheck_,str) - -#endif /* __MC_ASM_H */ - -/*--------------------------------------------------------------------*/ -/*--- end ---*/ -/*--------------------------------------------------------------------*/ - diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h index edc031fa5c..c05a6beb57 100644 --- a/memcheck/mc_include.h +++ b/memcheck/mc_include.h @@ -37,8 +37,8 @@ #define __MC_INCLUDE_H #include "mac_shared.h" -#include "mc_asm.h" +#define MC_(str) VGAPPEND(vgMemCheck_,str) /*------------------------------------------------------------*/ /*--- Command line options ---*/