mirror of
https://github.com/Zenithsiz/ftmemsim-valgrind.git
synced 2026-02-05 11:10:21 +00:00
df503439c5
- Factored out a lot of commonality between AddrCheck and MemCheck. Basic
idea is that common code goes into a single file in MemCheck, and AddrCheck
peeks in and "borrows" it.
More or less, only identical code or identical-with-respect-to-subtypes
code was factored out.
Identical-with-respect-to-subtypes means that some enum types (SuppKind,
ErrorKind, etc) were merged because they were identical except that
MemCheck had some extra constants. So some of the code borrowed by
AddrCheck contains cases it never needs. But that's not so bad, avoiding
the duplication is IMHO more important.
Removed:
- ac_include.h, it wasn't necessary
- All the old debugging stuff from ac_main.c (printing shadow regs, not
applicable for AddrCheck).
- MANUAL_DEPS from memcheck/Makefile.am because it wasn't doing anything
- Some unnecessary crud from addrcheck/Makefile.am
Added:
- memcheck/mc_common.{c,h}
- memcheck/mc_constants.h
- addrcheck/ac_common.c, which simply #includes memcheck/mc_common.c. This
hack was required because there is no way (that I could work out) to tell
Automake that it should build ../memcheck/mc_common.o before building
AddrCheck.
Changed:
- a lot of prefixes from SK_ to MC_; only core/skin interface functions are
prefixed with SK_ now. This makes it clear which functions are from the
core/skin interface, and for AddrCheck it's clear which functions are
shared with/borrowed from MemCheck. Changed some related prefixes for
consistency.
- Also factored out some duplication within AddrCheck -- some accessibility
checking was needlessly split up into separate read and write checks that
did the same thing.
Unchanged:
- I considered moving the leak detector out of core into mc_common.c, but
didn't, because it constantly accesses ShadowChunk fields and converting to
get/set methods would have been a total pain.
- Left old debugging stuff in for MemCheck, although I seriously doubt it
would still work.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1325
141 lines
4.6 KiB
C
141 lines
4.6 KiB
C
|
|
/*--------------------------------------------------------------------*/
|
|
/*--- A header file for all parts of the MemCheck skin. ---*/
|
|
/*--- mc_include.h ---*/
|
|
/*--------------------------------------------------------------------*/
|
|
|
|
/*
|
|
This file is part of MemCheck, a heavyweight Valgrind skin for
|
|
detecting memory errors.
|
|
|
|
Copyright (C) 2000-2002 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_INCLUDE_H
|
|
#define __MC_INCLUDE_H
|
|
|
|
#include "mc_common.h"
|
|
|
|
/* UCode extension for efficient memory checking operations */
|
|
typedef
|
|
enum {
|
|
/* uinstrs which are not needed for mere translation of x86 code,
|
|
only for instrumentation of it. */
|
|
LOADV = DUMMY_FINAL_UOPCODE + 1,
|
|
STOREV,
|
|
GETV,
|
|
PUTV,
|
|
TESTV,
|
|
SETV,
|
|
/* Get/set the v-bit (and it is only one bit) for the simulated
|
|
%eflags register. */
|
|
GETVF,
|
|
PUTVF,
|
|
|
|
/* Do a unary or binary tag op. Only for post-instrumented
|
|
code. For TAG1, first and only arg is a TempReg, and is both
|
|
arg and result reg. For TAG2, first arg is src, second is
|
|
dst, in the normal way; both are TempRegs. In both cases,
|
|
3rd arg is a RiCHelper with a Lit16 tag. This indicates
|
|
which tag op to do. */
|
|
TAG1,
|
|
TAG2
|
|
}
|
|
MemCheckOpcode;
|
|
|
|
|
|
/* Lists the names of value-tag operations used in instrumented
|
|
code. These are the third argument to TAG1 and TAG2 uinsns. */
|
|
typedef
|
|
enum {
|
|
/* Unary. */
|
|
Tag_PCast40, Tag_PCast20, Tag_PCast10,
|
|
Tag_PCast01, Tag_PCast02, Tag_PCast04,
|
|
|
|
Tag_PCast14, Tag_PCast12, Tag_PCast11,
|
|
|
|
Tag_Left4, Tag_Left2, Tag_Left1,
|
|
|
|
Tag_SWiden14, Tag_SWiden24, Tag_SWiden12,
|
|
Tag_ZWiden14, Tag_ZWiden24, Tag_ZWiden12,
|
|
|
|
/* Binary; 1st is rd; 2nd is rd+wr */
|
|
Tag_UifU4, Tag_UifU2, Tag_UifU1, Tag_UifU0,
|
|
Tag_DifD4, Tag_DifD2, Tag_DifD1,
|
|
|
|
Tag_ImproveAND4_TQ, Tag_ImproveAND2_TQ, Tag_ImproveAND1_TQ,
|
|
Tag_ImproveOR4_TQ, Tag_ImproveOR2_TQ, Tag_ImproveOR1_TQ,
|
|
Tag_DebugFn
|
|
}
|
|
TagOp;
|
|
|
|
|
|
/*------------------------------------------------------------*/
|
|
/*--- Functions ---*/
|
|
/*------------------------------------------------------------*/
|
|
|
|
/* Functions defined in vg_memcheck_helpers.S */
|
|
extern void MC_(helper_value_check4_fail) ( void );
|
|
extern void MC_(helper_value_check2_fail) ( void );
|
|
extern void MC_(helper_value_check1_fail) ( void );
|
|
extern void MC_(helper_value_check0_fail) ( void );
|
|
|
|
|
|
/* Functions defined in vg_memcheck.c */
|
|
extern void MC_(helperc_STOREV4) ( Addr, UInt );
|
|
extern void MC_(helperc_STOREV2) ( Addr, UInt );
|
|
extern void MC_(helperc_STOREV1) ( Addr, UInt );
|
|
|
|
extern UInt MC_(helperc_LOADV1) ( Addr );
|
|
extern UInt MC_(helperc_LOADV2) ( Addr );
|
|
extern UInt MC_(helperc_LOADV4) ( Addr );
|
|
|
|
extern void MC_(fpu_write_check) ( Addr addr, Int size );
|
|
extern void MC_(fpu_read_check) ( Addr addr, Int size );
|
|
|
|
|
|
/* For client requests */
|
|
extern void MC_(make_noaccess) ( Addr a, UInt len );
|
|
extern void MC_(make_readable) ( Addr a, UInt len );
|
|
extern void MC_(make_writable) ( Addr a, UInt len );
|
|
|
|
extern Bool MC_(check_writable) ( Addr a, UInt len, Addr* bad_addr );
|
|
extern Bool MC_(check_readable) ( Addr a, UInt len, Addr* bad_addr );
|
|
|
|
extern void MC_(detect_memory_leaks) ( void );
|
|
|
|
|
|
/* Functions defined in vg_memcheck_clientreqs.c */
|
|
extern Bool MC_(client_perm_maybe_describe)( Addr a, AddrInfo* ai );
|
|
extern void MC_(show_client_block_stats) ( void );
|
|
|
|
|
|
/* Functions defined in vg_memcheck_errcontext.c */
|
|
extern void MC_(record_value_error) ( Int size );
|
|
extern void MC_(record_user_error) ( ThreadState* tst, Addr a, Bool isWrite );
|
|
|
|
#endif
|
|
|
|
/*--------------------------------------------------------------------*/
|
|
/*--- end mc_include.h ---*/
|
|
/*--------------------------------------------------------------------*/
|
|
|