Removed the core_arch_asm.h files. The OYNK macros now live in tool_asm.h,

at least for the moment.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3748

diff --git a/coregrind/amd64/Makefile.am b/coregrind/amd64/Makefile.am
index 7160e2cbfaa5709389bf74fe287b1d47a23d3e04..35729bb48f8962c93668d171476a3f0da47174b7 100644 (file)
--- a/coregrind/amd64/Makefile.am
+++ b/coregrind/amd64/Makefile.am
@@ -4,8 +4,7 @@ include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
 
 noinst_HEADERS = \
-       core_arch.h \
-       core_arch_asm.h
+       core_arch.h
 
 noinst_LIBRARIES = libarch.a
 

diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index 193a5ef75a5a09d8a1ed033adf295e164f451075..b4c57a0779fd73f75f464a1c52a8903b5e434189 100644 (file)
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -31,8 +31,6 @@
 #ifndef __AMD64_CORE_ARCH_H
 #define __AMD64_CORE_ARCH_H
 
-#include "core_arch_asm.h"    // arch-specific asm  stuff
-
 #include "libvex.h"
 #include "libvex_guest_amd64.h"
 

diff --git a/coregrind/amd64/core_arch_asm.h b/coregrind/amd64/core_arch_asm.h
deleted file mode 100644 (file)
index d9c5a3d..0000000
--- a/coregrind/amd64/core_arch_asm.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------------------------------------------*/
-/*---                                        amd64/core_arch_asm.h ---*/
-/*--------------------------------------------------------------------*/
-
-/*
-   This file is part of Valgrind, a dynamic binary instrumentation
-   framework.
-
-   Copyright (C) 2000-2005 Nicholas Nethercote
-      njn@valgrind.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 __AMD64_CORE_ARCH_ASM_H
-#define __AMD64_CORE_ARCH_ASM_H
-
-// Print a constant from asm code.
-#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
-
-#endif   // __AMD64_CORE_ARCH_ASM_H
-
-/*--------------------------------------------------------------------*/
-/*--- end                                                          ---*/
-/*--------------------------------------------------------------------*/

diff --git a/coregrind/arm/Makefile.am b/coregrind/arm/Makefile.am
index 1bb806eca4c95955125ad4f3e99f9c74ed6bf1f7..c4a81e84eed0c2f8c3e9be23880812db586aa8fd 100644 (file)
--- a/coregrind/arm/Makefile.am
+++ b/coregrind/arm/Makefile.am
@@ -4,8 +4,7 @@ include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
 
 noinst_HEADERS = \
-       core_arch.h \
-       core_arch_asm.h
+       core_arch.h
 
 noinst_LIBRARIES = libarch.a
 

diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index 13ad9c81e0695e00b21fa4d768626b86d79094d9..c8aeec51e4f1207b187fe6aa69df83bbdae49d81 100644 (file)
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -31,8 +31,6 @@
 #ifndef __ARM_CORE_ARCH_H
 #define __ARM_CORE_ARCH_H
 
-#include "core_arch_asm.h"    // arch-specific asm  stuff
-
 #include "libvex.h"
 #include "libvex_guest_arm.h"
 

diff --git a/coregrind/arm/core_arch_asm.h b/coregrind/arm/core_arch_asm.h
deleted file mode 100644 (file)
index 2d990c4..0000000
--- a/coregrind/arm/core_arch_asm.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------------------------------------------*/
-/*---                                          arm/core_arch_asm.h ---*/
-/*--------------------------------------------------------------------*/
-
-/*
-   This file is part of Valgrind, a dynamic binary instrumentation
-   framework.
-
-   Copyright (C) 2000-2005 Nicholas Nethercote
-      njn@valgrind.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 __ARM_CORE_ARCH_ASM_H
-#define __ARM_CORE_ARCH_ASM_H
-
-#if 0
-/* Debugging hack for assembly code ... sigh. */
-#if 0
-#define OYNK(nnn) pushal;  pushl $nnn; call VG_(oynk) ; addl $4,%esp; popal
-#else
-#define OYNK(nnn)
-#endif
-
-#if 0
-#define OYNNK(nnn) pushal;  pushl $nnn; call VG_(oynk) ; addl $4,%esp; popal
-#else
-#define OYNNK(nnn)
-#endif
-#endif
-
-#endif   // __ARM_CORE_ARCH_ASM_H
-
-/*--------------------------------------------------------------------*/
-/*--- end                                                          ---*/
-/*--------------------------------------------------------------------*/

diff --git a/coregrind/x86/Makefile.am b/coregrind/x86/Makefile.am
index d5ccd3605e913670eec4cd641866936d18dbc11b..03d41694b7f7d4aaeb7b67ff02f7226b577d954d 100644 (file)
--- a/coregrind/x86/Makefile.am
+++ b/coregrind/x86/Makefile.am
@@ -4,8 +4,7 @@ include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
 AM_CFLAGS = $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O -g
 
 noinst_HEADERS = \
-       core_arch.h \
-       core_arch_asm.h
+       core_arch.h
 
 noinst_LIBRARIES = libarch.a
 

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index a0816d684a22c48f02f033164fa2bac9c6e25d5b..e9c0bca8db6f401574ea6732736d39e9773205b1 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -31,8 +31,6 @@
 #ifndef __X86_CORE_ARCH_H
 #define __X86_CORE_ARCH_H
 
-#include "core_arch_asm.h"    // arch-specific asm  stuff
-
 #include "libvex.h"
 #include "libvex_guest_x86.h"
 

diff --git a/coregrind/x86/core_arch_asm.h b/coregrind/x86/core_arch_asm.h
deleted file mode 100644 (file)
index c8a6210..0000000
--- a/coregrind/x86/core_arch_asm.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------------------------------------------*/
-/*---                                          x86/core_arch_asm.h ---*/
-/*--------------------------------------------------------------------*/
-
-/*
-   This file is part of Valgrind, a dynamic binary instrumentation
-   framework.
-
-   Copyright (C) 2000-2005 Nicholas Nethercote
-      njn@valgrind.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 __X86_CORE_ARCH_ASM_H
-#define __X86_CORE_ARCH_ASM_H
-
-#endif   /* __X86_CORE_ARCH_ASM_H */
-
-/*--------------------------------------------------------------------*/
-/*--- end                                                          ---*/
-/*--------------------------------------------------------------------*/

diff --git a/docs/directory-structure b/docs/directory-structure
index 0eb1a3df6f06716d2a3939e463b23dd22bad143f..e8a6e40294eb2f4d0c435eb15f877c8f72b2bf75 100644 (file)
--- a/docs/directory-structure
+++ b/docs/directory-structure
@@ -1,6 +1,9 @@
 -------------------------------------------------------------------
 Guide to the directory structure
 -------------------------------------------------------------------
+[16-May-2005: a lot of the stuff about arch/OS/platform specific code
+ is out of date in here.  Hopefully, things have gotten simpler.  --njn]
+
 Valgrind has 2 main levels of genericity.
  
  1. Multiple tools, plus the core.

diff --git a/include/tool_asm.h b/include/tool_asm.h
index c8d01dc4c10d4b185c6ce92de1530d09bf99f1cb..95f3fafc6d18b43add76072a256e9d345d756c57 100644 (file)
--- a/include/tool_asm.h
+++ b/include/tool_asm.h
@@ -45,6 +45,22 @@
 #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 */
 
 /*--------------------------------------------------------------------*/