|
From: <sv...@va...> - 2014-10-06 21:04:22
|
Author: florian
Date: Mon Oct 6 22:04:14 2014
New Revision: 14601
Log:
Followup to r14600. Copy the contents of pub_core_guest.h to pub_tool_guest.h
to make it available to tools. This allows to remove quite a bit of
ifdeffery from memcheck's mc_machine.c
Added:
trunk/include/pub_tool_guest.h
Modified:
trunk/coregrind/pub_core_guest.h
trunk/include/Makefile.am
trunk/memcheck/mc_machine.c
Modified: trunk/coregrind/pub_core_guest.h
==============================================================================
--- trunk/coregrind/pub_core_guest.h (original)
+++ trunk/coregrind/pub_core_guest.h Mon Oct 6 22:04:14 2014
@@ -37,36 +37,11 @@
#ifndef __PUB_CORE_GUEST_H
#define __PUB_CORE_GUEST_H
-#if defined(VGA_x86)
-# include "libvex_guest_x86.h"
- typedef VexGuestX86State VexGuestArchState;
-#elif defined(VGA_amd64)
-# include "libvex_guest_amd64.h"
- typedef VexGuestAMD64State VexGuestArchState;
-#elif defined(VGA_ppc32)
-# include "libvex_guest_ppc32.h"
- typedef VexGuestPPC32State VexGuestArchState;
-#elif defined(VGA_ppc64be) || defined(VGA_ppc64le)
-# include "libvex_guest_ppc64.h"
- typedef VexGuestPPC64State VexGuestArchState;
-#elif defined(VGA_arm)
-# include "libvex_guest_arm.h"
- typedef VexGuestARMState VexGuestArchState;
-#elif defined(VGA_arm64)
-# include "libvex_guest_arm64.h"
- typedef VexGuestARM64State VexGuestArchState;
-#elif defined(VGA_s390x)
-# include "libvex_guest_s390x.h"
- typedef VexGuestS390XState VexGuestArchState;
-#elif defined(VGA_mips32)
-# include "libvex_guest_mips32.h"
- typedef VexGuestMIPS32State VexGuestArchState;
-#elif defined(VGA_mips64)
-# include "libvex_guest_mips64.h"
- typedef VexGuestMIPS64State VexGuestArchState;
-#else
-# error Unknown arch
-#endif
+#include "pub_tool_guest.h"
+
+// No core-only exports; everything in this module is visible to both
+// the core and tools.
+
#endif // __PUB_CORE_GUEST_H
Modified: trunk/include/Makefile.am
==============================================================================
--- trunk/include/Makefile.am (original)
+++ trunk/include/Makefile.am Mon Oct 6 22:04:14 2014
@@ -14,6 +14,7 @@
pub_tool_errormgr.h \
pub_tool_execontext.h \
pub_tool_gdbserver.h \
+ pub_tool_guest.h \
pub_tool_poolalloc.h \
pub_tool_hashtable.h \
pub_tool_libcbase.h \
Added: trunk/include/pub_tool_guest.h
==============================================================================
--- trunk/include/pub_tool_guest.h (added)
+++ trunk/include/pub_tool_guest.h Mon Oct 6 22:04:14 2014
@@ -0,0 +1,75 @@
+/* -*- mode: C; c-basic-offset: 3; -*- */
+
+/*---------------------------------------------------------------*/
+/*--- Provides guest state definition. pub_tool_guest.h ---*/
+/*---------------------------------------------------------------*/
+
+/*
+ This file is part of Valgrind, a dynamic binary instrumentation
+ framework.
+
+ Copyright (C) 2014-2014 OpenWorks LLP
+ in...@op...
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ The GNU General Public License is contained in the file COPYING.
+
+ Neither the names of the U.S. Department of Energy nor the
+ University of California nor the names of its contributors may be
+ used to endorse or promote products derived from this software
+ without prior written permission.
+*/
+
+#ifndef __PUB_TOOL_GUEST_H
+#define __PUB_TOOL_GUEST_H
+
+#if defined(VGA_x86)
+# include "libvex_guest_x86.h"
+ typedef VexGuestX86State VexGuestArchState;
+#elif defined(VGA_amd64)
+# include "libvex_guest_amd64.h"
+ typedef VexGuestAMD64State VexGuestArchState;
+#elif defined(VGA_ppc32)
+# include "libvex_guest_ppc32.h"
+ typedef VexGuestPPC32State VexGuestArchState;
+#elif defined(VGA_ppc64be) || defined(VGA_ppc64le)
+# include "libvex_guest_ppc64.h"
+ typedef VexGuestPPC64State VexGuestArchState;
+#elif defined(VGA_arm)
+# include "libvex_guest_arm.h"
+ typedef VexGuestARMState VexGuestArchState;
+#elif defined(VGA_arm64)
+# include "libvex_guest_arm64.h"
+ typedef VexGuestARM64State VexGuestArchState;
+#elif defined(VGA_s390x)
+# include "libvex_guest_s390x.h"
+ typedef VexGuestS390XState VexGuestArchState;
+#elif defined(VGA_mips32)
+# include "libvex_guest_mips32.h"
+ typedef VexGuestMIPS32State VexGuestArchState;
+#elif defined(VGA_mips64)
+# include "libvex_guest_mips64.h"
+ typedef VexGuestMIPS64State VexGuestArchState;
+#else
+# error Unknown arch
+#endif
+
+#endif // __PUB_TOOL_GUEST_H
+
+/*--------------------------------------------------------------------*/
+/*--- end ---*/
+/*--------------------------------------------------------------------*/
Modified: trunk/memcheck/mc_machine.c
==============================================================================
--- trunk/memcheck/mc_machine.c (original)
+++ trunk/memcheck/mc_machine.c Mon Oct 6 22:04:14 2014
@@ -41,55 +41,12 @@
#include "pub_tool_libcassert.h"
#include "pub_tool_libcprint.h"
#include "pub_tool_tooliface.h"
+#include "pub_tool_guest.h" // VexGuestArchState
#include "mc_include.h"
-#undef MC_SIZEOF_GUEST_STATE
+#define MC_SIZEOF_GUEST_STATE sizeof(VexGuestArchState)
-#if defined(VGA_x86)
-# include "libvex_guest_x86.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestX86State)
-#endif
-
-#if defined(VGA_amd64)
-# include "libvex_guest_amd64.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestAMD64State)
-#endif
-
-#if defined(VGA_ppc32)
-# include "libvex_guest_ppc32.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestPPC32State)
-#endif
-
-#if defined(VGA_ppc64be) || defined(VGA_ppc64le)
-# include "libvex_guest_ppc64.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestPPC64State)
-#endif
-
-#if defined(VGA_s390x)
-# include "libvex_guest_s390x.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestS390XState)
-#endif
-
-#if defined(VGA_arm)
-# include "libvex_guest_arm.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestARMState)
-#endif
-
-#if defined(VGA_arm64)
-# include "libvex_guest_arm64.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestARM64State)
-#endif
-
-#if defined(VGA_mips32)
-# include "libvex_guest_mips32.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestMIPS32State)
-#endif
-
-#if defined(VGA_mips64)
-# include "libvex_guest_mips64.h"
-# define MC_SIZEOF_GUEST_STATE sizeof(VexGuestMIPS64State)
-#endif
static inline Bool host_is_big_endian ( void ) {
UInt x = 0x11223344;
|