1997-03-14 15:13:58 +00:00
|
|
|
# Makefile fragment for common parts of all simulators.
|
|
|
|
|
# Copyright (C) 1997 Free Software Foundation, Inc.
|
|
|
|
|
# Contributed by Cygnus Support.
|
|
|
|
|
|
|
|
|
|
# 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.
|
|
|
|
|
|
|
|
|
|
# This Makefile fragment consists of two separate parts.
|
|
|
|
|
# They are merged into the final Makefile at points denoted by
|
|
|
|
|
# "## COMMON_PRE_CONFIG_FRAG" and "## COMMON_POST_CONFIG_FRAG".
|
|
|
|
|
#
|
|
|
|
|
# The target Makefile should look like:
|
|
|
|
|
#
|
|
|
|
|
#># Copyright blah blah
|
|
|
|
|
#>
|
|
|
|
|
#>## COMMON_PRE_CONFIG_FRAG
|
|
|
|
|
#>
|
|
|
|
|
#># Any overrides necessary for the SIM_FOO config vars.
|
|
|
|
|
#>SIM_FOO = ...
|
|
|
|
|
#>
|
|
|
|
|
#>## COMMON_POST_CONFIG_FRAG
|
|
|
|
|
#>
|
|
|
|
|
#># Rules to build target specific .o's.
|
|
|
|
|
|
|
|
|
|
## COMMON_PRE_CONFIG_FRAG
|
|
|
|
|
|
|
|
|
|
VPATH = @srcdir@
|
|
|
|
|
srcdir = @srcdir@
|
|
|
|
|
srcroot = $(srcdir)/../..
|
|
|
|
|
|
|
|
|
|
prefix = @prefix@
|
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
|
|
|
|
|
|
host_alias = @host_alias@
|
|
|
|
|
target_alias = @target_alias@
|
|
|
|
|
program_transform_name = @program_transform_name@
|
|
|
|
|
bindir = @bindir@
|
|
|
|
|
|
|
|
|
|
libdir = @libdir@
|
|
|
|
|
tooldir = $(libdir)/$(target_alias)
|
|
|
|
|
|
|
|
|
|
datadir = @datadir@
|
|
|
|
|
mandir = @mandir@
|
|
|
|
|
man1dir = $(mandir)/man1
|
|
|
|
|
infodir = @infodir@
|
|
|
|
|
includedir = @includedir@
|
|
|
|
|
|
|
|
|
|
SHELL = /bin/sh
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
INSTALL = @INSTALL@
|
1997-03-14 15:13:58 +00:00
|
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
|
|
|
|
|
|
|
|
CC = @CC@
|
|
|
|
|
CC_FOR_BUILD = @CC_FOR_BUILD@
|
|
|
|
|
CFLAGS = @CFLAGS@
|
|
|
|
|
SIM_BSWAP = @sim_bswap@
|
|
|
|
|
SIM_CFLAGS = @sim_cflags@
|
|
|
|
|
SIM_DEBUG = @sim_debug@
|
|
|
|
|
SIM_TRACE = @sim_trace@
|
1997-04-30 18:35:58 +00:00
|
|
|
SIM_PROFILE = @sim_profile@
|
1997-03-17 15:29:29 +00:00
|
|
|
|
1997-03-14 15:13:58 +00:00
|
|
|
HDEFINES = @HDEFINES@
|
|
|
|
|
TDEFINES =
|
|
|
|
|
|
|
|
|
|
AR = @AR@
|
|
|
|
|
AR_FLAGS = rc
|
|
|
|
|
RANLIB = @RANLIB@
|
|
|
|
|
MAKEINFO = makeinfo
|
|
|
|
|
|
|
|
|
|
# Each simulator's Makefile.in defines one or more of these variables
|
* Make-common.in (sim-options.o, sim-load.o): Add rules for.
(sim_main_headers): Add sim-trace.h.
* run.c (exec_bfd, target_byte_order): Delete.
(main): Pass -E <endian> to sim_open. Delete code to load sections,
call sim_load instead. Check return code of sim_create_inferior.
* sim-base.h (CURRENT_STATE): Define.
(sim_state_base): Make typedef. New members options, prog_argv,
prog_bfd, text_{section,start,end}, start_addr, simcache_size,
mem_size, memory [+ corresponding access macros].
(sim_cpu_base): New typedef.
* sim-trace.h: New file.
* sim-basics.h: #include it.
* sim-load.c: New file.
1997-04-17 09:37:02 +00:00
|
|
|
# to override our settings as necessary. There is no need to define these
|
|
|
|
|
# in the simulator's Makefile.in if one is using the default value. In fact
|
|
|
|
|
# it's preferable not to.
|
1997-03-14 15:13:58 +00:00
|
|
|
|
|
|
|
|
# List of object files, less common parts.
|
|
|
|
|
SIM_OBJS =
|
1997-04-15 19:13:56 +00:00
|
|
|
# List of extra dependencies.
|
|
|
|
|
# Generally this consists of simulator specific files included by sim-main.h.
|
|
|
|
|
SIM_EXTRA_DEPS =
|
1997-03-14 15:13:58 +00:00
|
|
|
# List of flags to always pass to $(CC).
|
|
|
|
|
SIM_EXTRA_CFLAGS =
|
|
|
|
|
# List of extra libraries to link with.
|
|
|
|
|
SIM_EXTRA_LIBS =
|
|
|
|
|
# List of extra program dependencies.
|
|
|
|
|
SIM_EXTRA_LIBDEPS =
|
|
|
|
|
# List of main object files for `run'.
|
|
|
|
|
SIM_RUN_OBJS = run.o
|
|
|
|
|
# Dependency of `all' to build any extra files.
|
|
|
|
|
SIM_EXTRA_ALL =
|
|
|
|
|
# Dependency of `install' to install any extra files.
|
|
|
|
|
SIM_EXTRA_INSTALL =
|
|
|
|
|
# Dependency of `clean' to clean any extra files.
|
|
|
|
|
SIM_EXTRA_CLEAN =
|
|
|
|
|
|
|
|
|
|
## End COMMON_PRE_CONFIG_FRAG
|
|
|
|
|
|
|
|
|
|
## COMMON_POST_CONFIG_FRAG
|
|
|
|
|
|
1997-04-30 18:35:58 +00:00
|
|
|
CONFIG_CFLAGS = @DEFS@ $(SIM_CFLAGS) $(SIM_DEBUG) $(SIM_TRACE) $(SIM_PROFILE) \
|
|
|
|
|
$(SIM_BSWAP) $(SIM_EXTRA_CFLAGS) $(HDEFINES) $(TDEFINES)
|
1997-03-14 15:13:58 +00:00
|
|
|
CSEARCH = -I. -I$(srcdir) -I../common -I$(srcdir)/../common \
|
|
|
|
|
-I../../include -I$(srcroot)/include \
|
1997-03-17 15:29:29 +00:00
|
|
|
-I../../bfd -I$(srcroot)/bfd \
|
1997-03-14 15:13:58 +00:00
|
|
|
-I../../opcodes -I$(srcroot)/opcodes
|
|
|
|
|
ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS)
|
|
|
|
|
BUILD_CFLAGS = -g -O $(CSEARCH)
|
|
|
|
|
|
|
|
|
|
LIBIBERTY_LIB = ../../libiberty/libiberty.a
|
|
|
|
|
BFD_LIB = ../../bfd/libbfd.a
|
|
|
|
|
OPCODES_LIB = ../../opcodes/libopcodes.a
|
|
|
|
|
CONFIG_LIBS = @LIBS@
|
|
|
|
|
LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) \
|
|
|
|
|
$(SIM_EXTRA_LIBDEPS)
|
|
|
|
|
EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) \
|
|
|
|
|
$(CONFIG_LIBS) $(SIM_EXTRA_LIBS)
|
|
|
|
|
|
|
|
|
|
LIB_OBJS = callback.o targ-map.o $(SIM_OBJS)
|
|
|
|
|
|
|
|
|
|
all: libsim.a run $(SIM_EXTRA_ALL)
|
|
|
|
|
|
|
|
|
|
libsim.a: $(LIB_OBJS)
|
|
|
|
|
rm -f libsim.a
|
|
|
|
|
$(AR) $(ARFLAGS) libsim.a $(LIB_OBJS)
|
|
|
|
|
$(RANLIB) libsim.a
|
|
|
|
|
|
|
|
|
|
run: $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o run \
|
|
|
|
|
$(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS)
|
|
|
|
|
|
|
|
|
|
run.o: $(srcdir)/../common/run.c config.h tconfig.h \
|
|
|
|
|
$(srcroot)/include/callback.h
|
|
|
|
|
$(CC) -c $(srcdir)/../common/run.c $(ALL_CFLAGS)
|
|
|
|
|
|
|
|
|
|
# FIXME: Ideally, callback.o and friends live in a library outside of
|
|
|
|
|
# both the gdb and simulator source trees (e.g. devo/remote. Not
|
|
|
|
|
# devo/libremote because this directory would contain more than just
|
|
|
|
|
# a library).
|
|
|
|
|
|
|
|
|
|
callback.o: $(srcdir)/../common/callback.c config.h tconfig.h \
|
|
|
|
|
$(srcroot)/include/callback.h targ-vals.h
|
|
|
|
|
$(CC) -c $(srcdir)/../common/callback.c $(ALL_CFLAGS)
|
|
|
|
|
|
|
|
|
|
targ-map.o: targ-map.c targ-vals.h
|
|
|
|
|
|
|
|
|
|
gentmap: Makefile $(srcdir)/../common/gentmap.c targ-vals.def
|
|
|
|
|
$(CC_FOR_BUILD) $(srcdir)/../common/gentmap.c -o gentmap $(BUILD_CFLAGS)
|
|
|
|
|
|
|
|
|
|
targ-vals.h: gentmap
|
|
|
|
|
rm -f targ-vals.h
|
|
|
|
|
./gentmap -h >targ-vals.h
|
|
|
|
|
|
|
|
|
|
targ-map.c: gentmap
|
|
|
|
|
rm -f targ-map.c
|
|
|
|
|
./gentmap -c >targ-map.c
|
|
|
|
|
|
1997-04-02 05:04:25 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Rules for building sim-* components. Triggered by listing the corresponding
|
|
|
|
|
# .o file in the list of simulator targets.
|
|
|
|
|
#
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim_main_headers = \
|
|
|
|
|
sim-main.h \
|
|
|
|
|
$(srcdir)/../common/sim-config.h \
|
|
|
|
|
$(srcdir)/../common/sim-base.h \
|
|
|
|
|
$(srcdir)/../common/sim-basics.h \
|
1997-04-30 18:35:58 +00:00
|
|
|
$(srcdir)/../common/sim-model.h \
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(srcdir)/../common/sim-module.h \
|
* Make-common.in (sim-options.o, sim-load.o): Add rules for.
(sim_main_headers): Add sim-trace.h.
* run.c (exec_bfd, target_byte_order): Delete.
(main): Pass -E <endian> to sim_open. Delete code to load sections,
call sim_load instead. Check return code of sim_create_inferior.
* sim-base.h (CURRENT_STATE): Define.
(sim_state_base): Make typedef. New members options, prog_argv,
prog_bfd, text_{section,start,end}, start_addr, simcache_size,
mem_size, memory [+ corresponding access macros].
(sim_cpu_base): New typedef.
* sim-trace.h: New file.
* sim-basics.h: #include it.
* sim-load.c: New file.
1997-04-17 09:37:02 +00:00
|
|
|
$(srcdir)/../common/sim-trace.h \
|
1997-04-30 18:35:58 +00:00
|
|
|
$(srcdir)/../common/sim-profile.h \
|
1997-05-19 03:42:33 +00:00
|
|
|
$(srcdir)/../common/sim-engine.h \
|
1997-04-15 19:13:56 +00:00
|
|
|
tconfig.h
|
|
|
|
|
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-assert_h = $(srcdir)/../common/sim-assert.h
|
|
|
|
|
sim-endian_h = $(srcdir)/../common/sim-endian.h
|
|
|
|
|
sim-n-endian_h = $(srcdir)/../common/sim-n-endian.h
|
|
|
|
|
sim-bits_h = $(srcdir)/../common/sim-bits.h
|
|
|
|
|
sim-config_h = $(srcdir)/../common/sim-config.h
|
|
|
|
|
sim-n-bits_h = $(srcdir)/../common/sim-n-bits.h
|
|
|
|
|
sim-core_h = $(srcdir)/../common/sim-core.h
|
|
|
|
|
sim-n-core_h = $(srcdir)/../common/sim-n-core.h
|
1997-05-19 03:42:33 +00:00
|
|
|
sim-engine_h = $(srcdir)/../common/sim-engine.h
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-events_h = $(srcdir)/../common/sim-events.h
|
1997-05-05 12:46:25 +00:00
|
|
|
sim-fpu_h = $(srcdir)/../common/sim-fpu.h
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-io_h = $(srcdir)/../common/sim-io.h
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
sim-options_h = $(srcdir)/../common/sim-options.h
|
1997-04-02 05:04:25 +00:00
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
# FIXME: If this complicated way of building .o files from ../common is
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
# necessary, the reason should be documented here.
|
1997-04-15 19:13:56 +00:00
|
|
|
|
|
|
|
|
BUILT_SRC_FROM_COMMON= \
|
|
|
|
|
sim-endian.c \
|
|
|
|
|
sim-inline.c \
|
|
|
|
|
sim-bits.c \
|
|
|
|
|
sim-events.c \
|
|
|
|
|
sim-core.c \
|
|
|
|
|
sim-config.c \
|
|
|
|
|
sim-io.c
|
|
|
|
|
|
1997-05-19 03:42:33 +00:00
|
|
|
sim-abort.o: sim-abort.c \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-abort.c: $(srcdir)/../common/sim-abort.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-bits.o: sim-bits.c $(sim-bits_h) $(sim-n-bits_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-bits.c: $(srcdir)/../common/sim-bits.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-config.o: sim-config.c $(sim-config_h) $(sim-nconfig_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-config.c: $(srcdir)/../common/sim-config.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-core.o: sim-core.c $(sim-core_h) $(sim-n-core_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-core.c: $(srcdir)/../common/sim-core.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-endian.o: sim-endian.c $(sim-endian_h) $(sim-n-endian_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-endian.c: $(srcdir)/../common/sim-endian.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-05-19 03:42:33 +00:00
|
|
|
sim-engine.o: sim-engine.c $(sim_main_headers) $(sim-engine_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-engine.c: $(srcdir)/../common/sim-engine.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-events.o: sim-events.c $(sim-events_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-events.c: $(srcdir)/../common/sim-events.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-05-05 12:46:25 +00:00
|
|
|
sim-fpu.o: sim-fpu.c $(sim-fpu_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-fpu.c: $(srcdir)/../common/sim-fpu.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-inline.c: $(srcdir)/../common/sim-inline.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-io.o: sim-io.c $(sim_main_headers) $(sim-io_h) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-02 05:04:25 +00:00
|
|
|
sim-io.c: $(srcdir)/../common/sim-io.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-30 18:35:58 +00:00
|
|
|
sim-module.o: $(srcdir)/../common/sim-module.c $(sim_main_headers) \
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(sim-io_h) $(SIM_EXTRA_DEPS)
|
1997-04-30 18:35:58 +00:00
|
|
|
$(CC) -c $(srcdir)/../common/sim-module.c $(ALL_CFLAGS)
|
|
|
|
|
|
1997-04-17 14:08:30 +00:00
|
|
|
sim-options.o: $(srcdir)/../common/sim-options.c $(sim_main_headers) \
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS)
|
* Make-common.in (sim-options.o, sim-load.o): Add rules for.
(sim_main_headers): Add sim-trace.h.
* run.c (exec_bfd, target_byte_order): Delete.
(main): Pass -E <endian> to sim_open. Delete code to load sections,
call sim_load instead. Check return code of sim_create_inferior.
* sim-base.h (CURRENT_STATE): Define.
(sim_state_base): Make typedef. New members options, prog_argv,
prog_bfd, text_{section,start,end}, start_addr, simcache_size,
mem_size, memory [+ corresponding access macros].
(sim_cpu_base): New typedef.
* sim-trace.h: New file.
* sim-basics.h: #include it.
* sim-load.c: New file.
1997-04-17 09:37:02 +00:00
|
|
|
$(CC) -c $(srcdir)/../common/sim-options.c $(ALL_CFLAGS)
|
|
|
|
|
|
1997-05-19 03:42:33 +00:00
|
|
|
sim-reason.o: sim-reason.c $(sim_main_headers) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-reason.c: $(srcdir)/../common/sim-reason.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
|
|
|
|
sim-resume.o: sim-resume.c $(sim_main_headers) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-resume.c: $(srcdir)/../common/sim-resume.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
|
|
|
|
sim-run.o: sim-run.c $(sim_main_headers) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-run.c: $(srcdir)/../common/sim-run.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
|
|
|
|
sim-stop.o: sim-stop.c $(sim_main_headers) $(sim-assert_h) \
|
|
|
|
|
$(SIM_EXTRA_DEPS)
|
|
|
|
|
sim-stop.c: $(srcdir)/../common/sim-stop.c
|
|
|
|
|
rm -f $@ tmp-$@
|
|
|
|
|
echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@
|
|
|
|
|
cat $(srcdir)/../common/$@ >> tmp-$@
|
|
|
|
|
$(srcdir)/../../move-if-change tmp-$@ $@
|
|
|
|
|
|
1997-04-17 14:08:30 +00:00
|
|
|
sim-trace.o: $(srcdir)/../common/sim-trace.c $(sim_main_headers) \
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS)
|
1997-04-17 14:08:30 +00:00
|
|
|
$(CC) -c $(srcdir)/../common/sim-trace.c $(ALL_CFLAGS)
|
|
|
|
|
|
1997-04-30 18:35:58 +00:00
|
|
|
sim-profile.o: $(srcdir)/../common/sim-profile.c $(sim_main_headers) \
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS)
|
1997-04-30 18:35:58 +00:00
|
|
|
$(CC) -c $(srcdir)/../common/sim-profile.c $(ALL_CFLAGS)
|
|
|
|
|
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
sim-model.o: $(srcdir)/../common/sim-model.c $(sim_main_headers) \
|
|
|
|
|
$(sim-io_h) $(SIM_EXTRA_DEPS)
|
|
|
|
|
$(CC) -c $(srcdir)/../common/sim-model.c $(ALL_CFLAGS)
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
sim-utils.o: $(srcdir)/../common/sim-utils.c $(sim_main_headers) \
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(SIM_EXTRA_DEPS)
|
1997-04-15 19:13:56 +00:00
|
|
|
$(CC) -c $(srcdir)/../common/sim-utils.c $(ALL_CFLAGS)
|
1997-04-02 05:04:25 +00:00
|
|
|
|
* Make-common.in (sim-options.o, sim-load.o): Add rules for.
(sim_main_headers): Add sim-trace.h.
* run.c (exec_bfd, target_byte_order): Delete.
(main): Pass -E <endian> to sim_open. Delete code to load sections,
call sim_load instead. Check return code of sim_create_inferior.
* sim-base.h (CURRENT_STATE): Define.
(sim_state_base): Make typedef. New members options, prog_argv,
prog_bfd, text_{section,start,end}, start_addr, simcache_size,
mem_size, memory [+ corresponding access macros].
(sim_cpu_base): New typedef.
* sim-trace.h: New file.
* sim-basics.h: #include it.
* sim-load.c: New file.
1997-04-17 09:37:02 +00:00
|
|
|
sim-load.o: $(srcdir)/../common/sim-load.c
|
|
|
|
|
$(CC) -c $(srcdir)/../common/sim-load.c $(ALL_CFLAGS)
|
|
|
|
|
|
1997-04-17 12:43:31 +00:00
|
|
|
nrun.o: $(srcdir)/../common/nrun.c config.h tconfig.h \
|
|
|
|
|
$(srcroot)/include/callback.h $(sim_main_headers)
|
|
|
|
|
$(CC) -c $(srcdir)/../common/nrun.c $(ALL_CFLAGS)
|
1997-04-02 05:04:25 +00:00
|
|
|
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
# CGEN support.
|
|
|
|
|
|
|
|
|
|
cgen-scache.o: $(srcdir)/../common/cgen-scache.c $(sim_main_headers) \
|
|
|
|
|
$(SIM_EXTRA_DEPS) $(srcdir)/../common/cgen-scache.h
|
|
|
|
|
$(CC) -c $(srcdir)/../common/cgen-scache.c $(ALL_CFLAGS)
|
|
|
|
|
|
|
|
|
|
cgen-trace.o: $(srcdir)/../common/cgen-trace.c $(sim_main_headers) \
|
|
|
|
|
$(SIM_EXTRA_DEPS) $(srcdir)/../common/cgen-trace.h
|
|
|
|
|
$(CC) -c $(srcdir)/../common/cgen-trace.c $(ALL_CFLAGS)
|
|
|
|
|
|
|
|
|
|
cgen-utils.o: $(srcdir)/../common/cgen-utils.c $(sim_main_headers) \
|
1997-05-05 12:46:25 +00:00
|
|
|
$(SIM_EXTRA_DEPS) mem-ops.h sem-ops.h
|
* Makefile.in (sim-options_h): Define.
(sim-{module,options,trace,profile,utils}.o): Clean up dependencies.
(sim-model.o): Add new rule.
(cgen-{scache,trace,utils}.o): Add new rules.
* aclocal.m4 (SIM_AC_OPTION_{SCACHE,DEFAULT_MODEL}): Add.
* cgen-scache.c (scache_print_profile): Change `sd' arg to `cpu'.
Indent output by 2 spaces.
* cgen-scache.h (scache_print_profile): Update.
* cgen-trace.c (trace_insn_fini): Indent output by 2 spaces.
Use trace_printf, not fprintf.
(trace_extract): Use trace_printf, not cgen_trace_printf.
* genmloop.sh (!FAST case): Increment `insn_count'.
* sim-base.h (sim_state_base): Only include scache_size if WITH_SCACHE.
(sim_cpu_base): Rename member `sd' to `state' to be consistent with
access macro's name.
* sim-core.c (sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
(sim_core_{install,uninstall}): New functions.
* sim-core.h (sim_core_{install,uninstall}): Declare.
(sim_core_init): Use EXTERN_SIM_CORE to define it.
Change return type to SIM_RC.
* sim-model.h (models,machs,model_install): Declare.
* sim-module.c (modules): Add scache_install, model_install.
(sim_post_argv_init): Set cpu->state backlinks.
* sim-options.c (standard_options): Delete --simcache-size,--max-insns.
(standard_option_handler): Likewise.
* sim-profile.c (PROFILE_{HISTOGRAM,LABEL}_WIDTH): Move to
sim-profile.h.
(*): Assume ANSI C.
(profile_options): Delete --profile-simcache.
(profile_option_handler): Likewise.
(profile_print_insn): Change `sd' arg to `cpu'. Indent output 2
spaces.
(profile_print_{memory,model}): Likewise.
(profile_print_simcache): Delete.
(profile_print_speed): New function.
(profile_print): Rewrite.
* sim-profile.h (PROFILE_scache): Renamed from PROFILE_simcache.
(WITH_PROFILE_SCACHE_P): Renamed from WITH_PROFILE_SIMCACHE_P.
(PROFILE_DATA): Delete members simcache_{hits,misses}.
(PROFILE_COUNT_SIMCACHE_{HIT,MISS}): Delete.
(PROFILE_{CALLBACK,CPU_CALLBACK}): New types.
(profile_print): Update prototype.
1997-05-01 18:05:37 +00:00
|
|
|
$(CC) -c $(srcdir)/../common/cgen-utils.c $(ALL_CFLAGS)
|
|
|
|
|
|
|
|
|
|
# Support targets.
|
|
|
|
|
|
1997-03-14 15:13:58 +00:00
|
|
|
install: install-common $(SIM_EXTRA_INSTALL)
|
|
|
|
|
|
1997-04-15 19:13:56 +00:00
|
|
|
install-common: installdirs
|
|
|
|
|
n=`echo run | sed '$(program_transform_name)'`; \
|
|
|
|
|
$(INSTALL_PROGRAM) run $(bindir)/$$n
|
|
|
|
|
|
|
|
|
|
installdirs:
|
|
|
|
|
$(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
|
1997-03-14 15:13:58 +00:00
|
|
|
|
|
|
|
|
check:
|
|
|
|
|
|
|
|
|
|
info:
|
|
|
|
|
clean-info:
|
|
|
|
|
install-info:
|
|
|
|
|
|
|
|
|
|
.NOEXPORT:
|
|
|
|
|
MAKEOVERRIDES=
|
|
|
|
|
|
|
|
|
|
tags etags: TAGS
|
|
|
|
|
|
|
|
|
|
TAGS: force
|
|
|
|
|
etags *.c *.h
|
|
|
|
|
|
1997-04-30 18:35:58 +00:00
|
|
|
clean: $(SIM_EXTRA_CLEAN)
|
1997-03-14 15:13:58 +00:00
|
|
|
rm -f *.[oa] *~ core
|
|
|
|
|
rm -f run libsim.a
|
|
|
|
|
rm -f gentmap targ-map.c targ-vals.h
|
1997-04-15 19:13:56 +00:00
|
|
|
rm -f $(BUILT_SRC_FROM_COMMON)
|
1997-03-14 15:13:58 +00:00
|
|
|
|
1997-04-30 18:35:58 +00:00
|
|
|
distclean mostlyclean maintainer-clean realclean: clean
|
1997-03-14 15:13:58 +00:00
|
|
|
rm -f TAGS
|
|
|
|
|
rm -f Makefile config.cache config.log config.status
|
|
|
|
|
rm -f tconfig.h config.h stamp-h
|
1997-04-22 16:00:06 +00:00
|
|
|
rm -f targ-vals.def
|
1997-03-14 15:13:58 +00:00
|
|
|
|
|
|
|
|
.c.o:
|
|
|
|
|
$(CC) -c $(ALL_CFLAGS) $<
|
|
|
|
|
|
|
|
|
|
# Dummy target to force execution of dependent targets.
|
|
|
|
|
force:
|
|
|
|
|
|
|
|
|
|
Makefile: Makefile.in $(srcdir)/../common/Make-common.in config.status
|
|
|
|
|
CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
|
|
|
|
|
|
config.status: configure
|
|
|
|
|
$(SHELL) ./config.status --recheck
|
|
|
|
|
|
|
|
|
|
config.h: stamp-h ; @true
|
|
|
|
|
stamp-h: config.in config.status
|
|
|
|
|
CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
|
|
|
|
|
|
|
|
|
|
## End COMMON_POST_CONFIG_FRAG
|
