* magic.h: Renamed to gmagic.h to avoid <magic.h> conflict.

* magic.c:  Renamed to gmagic.c in sympathy.
	* eval.c, gmagic.c, config/tm-magic.h:
 	Include "gmagic.h" rather than "magic.h".
This commit is contained in:
Fred Fish 1995-11-28 19:33:22 +00:00
parent c6e4e83496
commit bfe8f51619
8 changed files with 1288 additions and 1281 deletions

View File

@ -60,7 +60,7 @@ else
fi
fi
gm_files="magic.c magic.h"
gm_files="gmagic.c gmagic.h"
if ( echo $* | grep keep\-gm > /dev/null ) ; then
keep_these_too="${gm_files} ${keep_these_too}"

View File

@ -1,3 +1,10 @@
Tue Nov 28 11:17:47 1995 Fred Fish <fnf@cygnus.com>
* magic.h: Renamed to gmagic.h to avoid <magic.h> conflict.
* magic.c: Renamed to gmagic.c in sympathy.
* eval.c, gmagic.c, config/tm-magic.h:
Include "gmagic.h" rather than "magic.h".
Sat Nov 25 02:56:38 1995 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
* mdebugread.c (handle_psymbol_enumerators, parse_symbol):

View File

@ -17,7 +17,7 @@ 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. */
#include "magic.h"
#include "gmagic.h"
#define TARGET_SYMFILE_POSTREAD(OBJFILE) init_magic ()

View File

@ -30,9 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "language.h" /* For CAST_IS_CONVERSION */
#include "f-lang.h" /* for array bound stuff */
/* start-sanitize-gm */
#ifdef GENERAL_MAGIC_HACKS
#include "magic.h"
#endif /* GENERAL_MAGIC_HACKS */
#ifdef GENERAL_MAGIC
#include "gmagic.h"
#endif /* GENERAL_MAGIC */
/* end-sanitize-gm */
/* Prototypes for local functions. */
@ -845,7 +845,7 @@ evaluate_subexp_standard (expect_type, exp, pos, noside)
}
/* start-sanitize-gm */
#ifdef GENERAL_MAGIC_HACKS
#ifdef GENERAL_MAGIC
case STRUCTOP_FIELD:
tem = longest_to_int (exp->elts[pc + 1].longconst);
(*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
@ -871,7 +871,7 @@ evaluate_subexp_standard (expect_type, exp, pos, noside)
NULL, "structure pointer");
}
}
#endif /* GENERAL_MAGIC_HACKS */
#endif /* GENERAL_MAGIC */
/* end-sanitize-gm */
case STRUCTOP_MEMBER:

1242
gdb/gmagic.c Normal file

File diff suppressed because it is too large Load Diff

32
gdb/gmagic.h Normal file
View File

@ -0,0 +1,32 @@
/* gmagic.h - Interface to the General Magic debugger extras */
/* object framework definitions, from FrameworkDefines.asm.h and Generic.h */
#define kIDBitObject 31 /* set for valid object IDs */
#define kIDBitUsable 26 /* set if objectID is usable */
/* Return nonzero if <object> is a valid ObjectID */
#define IsObjectID(object) (((unsigned long)(object) & 0x80000000) != 0)
#define kSizeOfObjectHeader 12 /* size of object header in bytes */
/* public interfaces */
extern void
init_magic PARAMS ((void));
extern void
magic_create_inferior_hook PARAMS ((void));
extern struct type *
type_of_object PARAMS ((CORE_ADDR object));
extern CORE_ADDR
baseptr_of_object PARAMS ((CORE_ADDR object));
extern int
magic_in_dispatcher PARAMS ((CORE_ADDR stop_pc, char *name));
extern CORE_ADDR
magic_skip_dispatcher PARAMS ((CORE_ADDR stop_pc));

File diff suppressed because it is too large Load Diff

View File

@ -1,32 +0,0 @@
/* magic.h - Interface to the General Magic debugger extras */
/* object framework definitions, from FrameworkDefines.asm.h and Generic.h */
#define kIDBitObject 31 /* set for valid object IDs */
#define kIDBitUsable 26 /* set if objectID is usable */
/* Return nonzero if <object> is a valid ObjectID */
#define IsObjectID(object) (((unsigned long)(object) & 0x80000000) != 0)
#define kSizeOfObjectHeader 12 /* size of object header in bytes */
/* public interfaces */
extern void
init_magic PARAMS ((void));
extern void
magic_create_inferior_hook PARAMS ((void));
extern struct type *
type_of_object PARAMS ((CORE_ADDR object));
extern CORE_ADDR
baseptr_of_object PARAMS ((CORE_ADDR object));
extern int
magic_in_dispatcher PARAMS ((CORE_ADDR stop_pc, char *name));
extern CORE_ADDR
magic_skip_dispatcher PARAMS ((CORE_ADDR stop_pc));