summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorJason Molenda <jsm@bugshack.cygnus.com>1999-06-28 16:00:01 +0000
committerJason Molenda <jsm@bugshack.cygnus.com>1999-06-28 16:00:01 +0000
commite4ac0f1d9dea7845c0d0c5706071d4c56dbd42f2 (patch)
treefcdd6689b72a05be54537f587fa5f27bf6a38150 /sim
parent1300a17a73c6af5f031f35f7e95c734415a6302b (diff)
downloadgdb-e4ac0f1d9dea7845c0d0c5706071d4c56dbd42f2.tar.gz
import gdb-1999-06-28 snapshot
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog7
-rw-r--r--sim/common/cgen-engine.h2
-rw-r--r--sim/common/genmloop.sh9
-rw-r--r--sim/mcore/ChangeLog5
-rw-r--r--sim/mcore/sysdep.h4
5 files changed, 20 insertions, 7 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 26bd2359dc7..d585aa6dbb6 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+1999-06-23 Doug Evans <devans@casey.cygnus.com>
+
+ * cgen-engine.h (TARGET_SEM_BRANCH_FINI): Remove cruft at end of
+ ifndef.
+ * genmloop.sh (@cpu@_scache_lookup): Delete unused local var.
+ (@cpu@_pbb_cti_chain): Minor clean up.
+
1999-05-08 Felix Lee <flee@cygnus.com>
* aclocal.m4: Use AC_EXEEXT instead of AM_EXEEXT. Delete defn of
diff --git a/sim/common/cgen-engine.h b/sim/common/cgen-engine.h
index 9421332b439..e7d27e03588 100644
--- a/sim/common/cgen-engine.h
+++ b/sim/common/cgen-engine.h
@@ -279,7 +279,7 @@ do { \
#define SEM_BRANCH_INIT \
int taken_p = 0;
-#ifndef TARGET_SEM_BRANCH_FINI(pcvar, taken_p)
+#ifndef TARGET_SEM_BRANCH_FINI
#define TARGET_SEM_BRANCH_FINI(pcvar, taken_p)
#endif
#define SEM_BRANCH_FINI(pcvar) \
diff --git a/sim/common/genmloop.sh b/sim/common/genmloop.sh
index 865fe7242f5..6720799a3ef 100644
--- a/sim/common/genmloop.sh
+++ b/sim/common/genmloop.sh
@@ -463,8 +463,6 @@ static INLINE SCACHE *
fetch and decode the instruction. */
if (sc->argbuf.addr != vpc)
{
- insn_t insn;
-
if (FAST_P)
PROFILE_COUNT_SCACHE_MISS (current_cpu);
@@ -771,7 +769,8 @@ cat << EOF
++sc;
}
- /* Update the pointer to the next free entry. */
+ /* Update the pointer to the next free entry, may not have used as
+ many entries as was asked for. */
CPU_SCACHE_NEXT_FREE (current_cpu) = sc;
/* Record length of chain if profiling.
This includes virtual insns since they count against
@@ -827,8 +826,6 @@ INLINE SEM_PC
@cpu@_pbb_cti_chain (SIM_CPU *current_cpu, SEM_ARG sem_arg,
SEM_PC *new_vpc_ptr, PCADDR new_pc)
{
- ARGBUF *abuf;
-
PBB_UPDATE_INSN_COUNT (current_cpu, sem_arg);
/* If not running forever, exit back to main loop. */
@@ -854,7 +851,7 @@ INLINE SEM_PC
next chain ptr. */
if (new_vpc_ptr == SEM_BRANCH_UNTAKEN)
{
- abuf = SEM_ARGBUF (sem_arg);
+ ARGBUF *abuf = SEM_ARGBUF (sem_arg);
SET_H_PC (abuf->addr);
new_vpc_ptr = &abuf->fields.chain.next;
}
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index f8b9d93c104..7bb8877c38d 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-23 Nick Clifton <nickc@cygnus.com>
+
+ * sysdep.h: Do not define prototypes for memcpy and strchr if they
+ are macros.
+
1999-05-21 Nick Clifton <nickc@cygnus.com>
* interp.c (sim_resume): Add more tracing output.
diff --git a/sim/mcore/sysdep.h b/sim/mcore/sysdep.h
index adf9b5e277f..e2e92e140f1 100644
--- a/sim/mcore/sysdep.h
+++ b/sim/mcore/sysdep.h
@@ -46,7 +46,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/*#include <string.h>*/
#else
extern char * mktemp ();
+#ifndef memset
extern PTR memset ();
+#endif
#ifndef DONTDECLARE_MALLOC
extern PTR malloc ();
@@ -65,7 +67,9 @@ extern void free ();
extern int free();
#endif
+#ifndef strchr
extern char * strchr();
+#endif
extern char * getenv();
extern PTR memchr();
extern char * strrchr();