|
From: <sv...@va...> - 2005-06-18 04:11:57
|
Author: njn
Date: 2005-06-18 05:10:56 +0100 (Sat, 18 Jun 2005)
New Revision: 3931
Log:
Renamed tool_asm.h as pub_basics_asm.h. Removed core_asm.h.
Added:
trunk/include/pub_basics_asm.h
Removed:
trunk/coregrind/core_asm.h
trunk/include/tool_asm.h
Modified:
trunk/NOTES.txt
trunk/coregrind/Makefile.am
trunk/coregrind/amd64/cpuid.S
trunk/coregrind/m_dispatch/dispatch-amd64.S
trunk/coregrind/m_dispatch/dispatch-arm.S
trunk/coregrind/m_dispatch/dispatch-x86.S
trunk/coregrind/m_syswrap/syscall-amd64-linux.S
trunk/coregrind/m_syswrap/syscall-arm-linux.S
trunk/coregrind/m_syswrap/syscall-x86-linux.S
trunk/coregrind/m_trampoline.S
trunk/coregrind/pub_core_debuglog.h
trunk/coregrind/x86/cpuid.S
trunk/include/Makefile.am
trunk/include/basic_types.h
trunk/include/tool.h
Modified: trunk/NOTES.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/NOTES.txt 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/NOTES.txt 2005-06-18 04:10:56 UTC (rev 3931)
@@ -10,18 +10,6 @@
x86-only systems. However, am not sure where to look for the call
into memcheck that states the new stack area.
=20
-
-9 Apr 05 (starting work on memcheck for 32/64-bit and big/little endian)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* get rid of include/tool_asm.h. I think=20
- 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.
-
- [tool_asm.h will need to remain in some form -- there are still assemb=
ly
- files that need to see VG_() and related macros. --njn]
-
-
23 March 05
~~~~~~~~~~~
Do we still need ARCH_PTHREQ_RET (or *PTHREQ* for that matter) ?
Modified: trunk/coregrind/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
--- trunk/coregrind/Makefile.am 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/coregrind/Makefile.am 2005-06-18 04:10:56 UTC (rev 3931)
@@ -36,7 +36,6 @@
=20
noinst_HEADERS =3D \
core.h \
- core_asm.h \
coregrind.h \
pub_core_aspacemgr.h \
pub_core_debuginfo.h \
Modified: trunk/coregrind/amd64/cpuid.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/amd64/cpuid.S 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/coregrind/amd64/cpuid.S 2005-06-18 04:10:56 UTC (rev 3931)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
=20
/*
Bool VG_(has_cpuid)(void)
Deleted: trunk/coregrind/core_asm.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/core_asm.h 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/coregrind/core_asm.h 2005-06-18 04:10:56 UTC (rev 3931)
@@ -1,2 +0,0 @@
-// XXX: temporary only
-#include "tool_asm.h"
Modified: trunk/coregrind/m_dispatch/dispatch-amd64.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dispatch/dispatch-amd64.S 2005-06-18 03:44:34 UTC (=
rev 3930)
+++ trunk/coregrind/m_dispatch/dispatch-amd64.S 2005-06-18 04:10:56 UTC (=
rev 3931)
@@ -29,7 +29,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
#include "libvex_guest_offsets.h" /* for OFFSET_amd64_RIP */
Modified: trunk/coregrind/m_dispatch/dispatch-arm.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dispatch/dispatch-arm.S 2005-06-18 03:44:34 UTC (re=
v 3930)
+++ trunk/coregrind/m_dispatch/dispatch-arm.S 2005-06-18 04:10:56 UTC (re=
v 3931)
@@ -29,7 +29,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
=20
Modified: trunk/coregrind/m_dispatch/dispatch-x86.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_dispatch/dispatch-x86.S 2005-06-18 03:44:34 UTC (re=
v 3930)
+++ trunk/coregrind/m_dispatch/dispatch-x86.S 2005-06-18 04:10:56 UTC (re=
v 3931)
@@ -29,7 +29,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "pub_core_dispatch_asm.h"
#include "pub_core_transtab_asm.h"
#include "libvex_guest_offsets.h" /* for OFFSET_x86_EIP */
Modified: trunk/coregrind/m_syswrap/syscall-amd64-linux.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_syswrap/syscall-amd64-linux.S 2005-06-18 03:44:34 U=
TC (rev 3930)
+++ trunk/coregrind/m_syswrap/syscall-amd64-linux.S 2005-06-18 04:10:56 U=
TC (rev 3931)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "vki_unistd.h"
#include "libvex_guest_offsets.h"
=20
Modified: trunk/coregrind/m_syswrap/syscall-arm-linux.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_syswrap/syscall-arm-linux.S 2005-06-18 03:44:34 UTC=
(rev 3930)
+++ trunk/coregrind/m_syswrap/syscall-arm-linux.S 2005-06-18 04:10:56 UTC=
(rev 3931)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "vki_unistd.h"
=20
# XXX: must reinstate comments also -- see x86-linux/syscall.S
Modified: trunk/coregrind/m_syswrap/syscall-x86-linux.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_syswrap/syscall-x86-linux.S 2005-06-18 03:44:34 UTC=
(rev 3930)
+++ trunk/coregrind/m_syswrap/syscall-x86-linux.S 2005-06-18 04:10:56 UTC=
(rev 3931)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "vki_unistd.h"
#include "libvex_guest_offsets.h"
=09
Modified: trunk/coregrind/m_trampoline.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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_trampoline.S 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/coregrind/m_trampoline.S 2005-06-18 04:10:56 UTC (rev 3931)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
#include "vki_unistd.h"
=20
/* ------------------ SIMULATED CPU HELPERS ------------------ */
Modified: trunk/coregrind/pub_core_debuglog.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/pub_core_debuglog.h 2005-06-18 03:44:34 UTC (rev 3930=
)
+++ trunk/coregrind/pub_core_debuglog.h 2005-06-18 04:10:56 UTC (rev 3931=
)
@@ -47,7 +47,7 @@
portable way to avoid using stdarg.h. */
#include <stdarg.h>
=20
-#include "core_asm.h" /* For definition of VG_ macro */
+#include "pub_basics_asm.h" /* For definition of VG_ macro */
=20
/* There are no tool-visible exports from m_debuglog, hence no header
file for it. */
Modified: trunk/coregrind/x86/cpuid.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/x86/cpuid.S 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/coregrind/x86/cpuid.S 2005-06-18 04:10:56 UTC (rev 3931)
@@ -28,7 +28,7 @@
The GNU General Public License is contained in the file COPYING.
*/
=20
-#include "core_asm.h"
+#include "pub_basics_asm.h"
=20
/*
Bool VG_(has_cpuid)(void)
Modified: trunk/include/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
--- trunk/include/Makefile.am 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/include/Makefile.am 2005-06-18 04:10:56 UTC (rev 3931)
@@ -4,7 +4,7 @@
incinc_HEADERS =3D \
basic_types.h \
tool.h \
- tool_asm.h \
+ pub_basics_asm.h \
pub_tool_aspacemgr.h \
pub_tool_errormgr.h \
pub_tool_execontext.h \
Modified: trunk/include/basic_types.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/include/basic_types.h 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/include/basic_types.h 2005-06-18 04:10:56 UTC (rev 3931)
@@ -1,6 +1,6 @@
=20
/*--------------------------------------------------------------------*/
-/*--- Basic types basic_types.h ---*/
+/*--- Header included by every C file. basic_types.h ---*/
/*--------------------------------------------------------------------*/
=20
/*
Copied: trunk/include/pub_basics_asm.h (from rev 3925, trunk/include/tool=
_asm.h)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/include/tool_asm.h 2005-06-18 01:35:16 UTC (rev 3925)
+++ trunk/include/pub_basics_asm.h 2005-06-18 04:10:56 UTC (rev 3931)
@@ -0,0 +1,49 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Header imported directly by every asm file, and indirectly ---*/
+/*--- (via pub_basics.h) by every C file. pub_basics_asm.h ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+ This file is part of Valgrind, a dynamic binary instrumentation
+ framework.
+
+ Copyright (C) 2000-2005 Julian Seward=20
+ js...@ac...
+
+ 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 __PUB_BASICS_ASM_H
+#define __PUB_BASICS_ASM_H
+
+/* All symbols externally visible from Valgrind are prefixed
+ as specified here to avoid namespace conflict problems. */
+
+#define VGAPPEND(str1,str2) str1##str2
+
+#define VG_(str) VGAPPEND(vgPlain_, str)
+#define VGA_(str) VGAPPEND(vgArch_, str)
+#define VGO_(str) VGAPPEND(vgOS_, str)
+#define VGP_(str) VGAPPEND(vgPlatform_, str)
+
+#endif /* __PUB_BASICS_ASM_H */
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: trunk/include/tool.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/include/tool.h 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/include/tool.h 2005-06-18 04:10:56 UTC (rev 3931)
@@ -33,7 +33,7 @@
#include <stdarg.h> /* ANSI varargs stuff */
=20
#include "basic_types.h"
-#include "tool_asm.h" /* asm stuff */
+#include "pub_basics_asm.h" /* asm stuff */
=20
#if defined(VGO_linux)
# include "vki-linux.h"
Deleted: trunk/include/tool_asm.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/include/tool_asm.h 2005-06-18 03:44:34 UTC (rev 3930)
+++ trunk/include/tool_asm.h 2005-06-18 04:10:56 UTC (rev 3931)
@@ -1,68 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- Tool-specific, asm-specific includes. tool_asm.h ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, a dynamic binary instrumentation
- framework.
-
- Copyright (C) 2000-2005 Julian Seward=20
- js...@ac...
-
- 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 __TOOL_ASM_H
-#define __TOOL_ASM_H
-
-
-/* All symbols externally visible from valgrind.so are prefixed
- as specified here. The prefix can be changed, so as to avoid
- namespace conflict problems.
-*/
-#define VGAPPEND(str1,str2) str1##str2
-
-/* These macros should add different prefixes so the same base
- name can safely be used across different macros. */
-#define VG_(str) VGAPPEND(vgPlain_,str)
-#define VGA_(str) VGAPPEND(vgArch_,str)
-#define VGO_(str) VGAPPEND(vgOS_,str)
-#define VGP_(str) VGAPPEND(vgPlatform_,str)
-
-// Print a constant from asm code.
-// Nb: you'll need to define VG_(oynk)(Int) to use this.
-#if defined(VGA_x86)
-# define OYNK(nnn) pushal; pushl $nnn; call VG_(oynk) ; addl $4,%esp; =
popal
-#elif defined(VGA_amd64)
-# define OYNK(nnn) push %r8 ; push %r9 ; push %r10; push %r11; \
- push %rax; push %rbx; push %rcx; push %rdx; \
- push %rsi; push %rdi; \
- movl $nnn, %edi; call VG_(oynk); \
- pop %rdi; pop %rsi; pop %rdx; pop %rcx; \
- pop %rbx; pop %rax; pop %r11; pop %r10; \
- pop %r9 ; pop %r8
-#else
-# error Unknown architecture
-#endif
-
-#endif /* ndef __TOOL_ASM_H */
-
-/*--------------------------------------------------------------------*/
-/*--- end ---*/
-/*--------------------------------------------------------------------*/
|