Copyright updates for 2007.

[deliverable/binutils-gdb.git] / sim / common / cgen-scache.h

diff --git a/sim/common/cgen-scache.h b/sim/common/cgen-scache.h
index e422859158414a3423ad7768d0927a93aeb5e344..d932e525c0fa06c50f6e51f03dd9c5ba934c2996 100644 (file)
--- a/sim/common/cgen-scache.h
+++ b/sim/common/cgen-scache.h
@@ -1,5 +1,5 @@
 /* Simulator header for cgen scache support.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
 This file is part of GDB, the GNU debugger.
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
    SCACHE_MAP is a hash table into these chains.  */
 
 typedef struct {
-  PCADDR pc;
+  IADDR pc;
   SCACHE *sc;
 } SCACHE_MAP;
 
@@ -69,12 +69,12 @@ typedef struct cpu_scache {
   SCACHE *next_free;
 #define CPU_SCACHE_NEXT_FREE(cpu) ((cpu) -> cgen_cpu.scache.next_free)
 
-  /* Address of cti-chain insn, only used by functional semantics,
-     not switch form.  */
-  SCACHE **pbb_br_npc_ptr;
-#define CPU_PBB_BR_NPC_PTR(cpu) ((cpu) -> cgen_cpu.scache.pbb_br_npc_ptr)
+  /* Kind of branch being taken.
+     Only used by functional semantics, not switch form.  */
+  SEM_BRANCH_TYPE pbb_br_type;
+#define CPU_PBB_BR_TYPE(cpu) ((cpu) -> cgen_cpu.scache.pbb_br_type)
   /* Target's branch address.  */
-  PCADDR pbb_br_npc;
+  IADDR pbb_br_npc;
 #define CPU_PBB_BR_NPC(cpu) ((cpu) -> cgen_cpu.scache.pbb_br_npc)
 #endif /* WITH_SCACHE_PBB */
 
@@ -114,9 +114,9 @@ typedef struct cpu_scache {
 MODULE_INSTALL_FN scache_install;
 
 /* Lookup a PC value in the scache [compilation only].  */
-extern SCACHE * scache_lookup (SIM_CPU *, PCADDR);
+extern SCACHE * scache_lookup (SIM_CPU *, IADDR);
 /* Return a pointer to at least N buffers.  */
-extern SCACHE *scache_lookup_or_alloc (SIM_CPU *, PCADDR, int, SCACHE **);
+extern SCACHE *scache_lookup_or_alloc (SIM_CPU *, IADDR, int, SCACHE **);
 /* Flush all cpu's scaches.  */
 extern void scache_flush (SIM_DESC);
 /* Flush a cpu's scache.  */