2005-10-28 Dave Brolley <brolley@redhat.com>

        Contribute the following changes:
        2003-10-07  Dave Brolley  <brolley@redhat.com>

        * tracedis.cxx (cgen_disassemble): Rename isa_mask to isas. Now
        (CGEN_ISA_MASK*).
        * tracedis.h (opcode/cgen-bitset.h): #include it.
        (cgen_disassemble): Rename isa_mask to isas. Now
        (CGEN_ISA_MASK*).
        (cgen_bi_endian_cpu::disassemble): 'isas' now (CGEN_ISA_MASK *).
        * cgen-cpu.h (opcode/cgen-bitset.h): #include it.
        (cgen_bi_endian_cpu::disassemble): 'isas' now (CGEN_ISA_MASK *).
        * compCGEN.cxx (cgen_disassemble): Rename isa_mask to isas. Now
        (CGEN_ISA_MASK*).

diff --git a/sid/component/cgen-cpu/ChangeLog b/sid/component/cgen-cpu/ChangeLog
index 480371f..5e5c935 100644 (file)
--- a/sid/component/cgen-cpu/ChangeLog
+++ b/sid/component/cgen-cpu/ChangeLog
@@ -1,3 +1,19 @@
+2005-10-28  Dave Brolley  <brolley@redhat.com>
+
+       Contribute the following changes:
+       2003-10-07  Dave Brolley  <brolley@redhat.com>
+
+       * tracedis.cxx (cgen_disassemble): Rename isa_mask to isas. Now
+       (CGEN_ISA_MASK*).
+       * tracedis.h (opcode/cgen-bitset.h): #include it.
+       (cgen_disassemble): Rename isa_mask to isas. Now
+       (CGEN_ISA_MASK*).
+       (cgen_bi_endian_cpu::disassemble): 'isas' now (CGEN_ISA_MASK *).
+       * cgen-cpu.h (opcode/cgen-bitset.h): #include it.
+       (cgen_bi_endian_cpu::disassemble): 'isas' now (CGEN_ISA_MASK *).
+       * compCGEN.cxx (cgen_disassemble): Rename isa_mask to isas. Now
+       (CGEN_ISA_MASK*).
+
 2005-08-19  Dave Brolley  <brolley@redhat.com>
 
        * Contribute the following changes:

diff --git a/sid/component/cgen-cpu/cgen-cpu.h b/sid/component/cgen-cpu/cgen-cpu.h
index 03e4252..d8c62b4 100644 (file)
--- a/sid/component/cgen-cpu/cgen-cpu.h
+++ b/sid/component/cgen-cpu/cgen-cpu.h
@@ -25,6 +25,7 @@
 
 #include "bfd.h"
 #include "dis-asm.h"
+#include "opcode/cgen-bitset.h"
 
 // ansidecl.h interferes with this perfectly ordinary word
 #undef AND
@@ -68,7 +69,7 @@ public:
   // Disassembly tracing support
   void disassemble (PCADDR pc, disassembler_ftype printfn,
                    enum bfd_flavour flavour, enum bfd_architecture arch,
-                   enum bfd_endian endian, const char *name, unsigned long isa_mask = 0, int machine = 0);
+                   enum bfd_endian endian, const char *name, CGEN_BITSET *isas = 0, int machine = 0);
   struct disassemble_info info;
 protected:
   static int cgen_read_memory (bfd_vma memaddr, bfd_byte *myaddr,

diff --git a/sid/component/cgen-cpu/compCGEN.cxx b/sid/component/cgen-cpu/compCGEN.cxx
index 59531dc..9530fa6 100644 (file)
--- a/sid/component/cgen-cpu/compCGEN.cxx
+++ b/sid/component/cgen-cpu/compCGEN.cxx
@@ -158,7 +158,7 @@ cgen::cgen_bi_endian_cpu::disassemble (PCADDR pc,
   enum bfd_architecture arch,
   enum bfd_endian endian,
   const char *name,
-  unsigned long isa_mask,
+  CGEN_BITSET *isas,
   int machine)
 {
   cgen_disassemble((bfd_vma)pc, &this->info, this,
@@ -172,7 +172,7 @@ cgen::cgen_bi_endian_cpu::disassemble (PCADDR pc,
                   machine,
                    endian,
                   name,
-                  isa_mask);
+                  isas);
 }
 
 int

diff --git a/sid/component/cgen-cpu/tracedis.cxx b/sid/component/cgen-cpu/tracedis.cxx
index bd80c2b..798f396 100644 (file)
--- a/sid/component/cgen-cpu/tracedis.cxx
+++ b/sid/component/cgen-cpu/tracedis.cxx
@@ -44,13 +44,13 @@ cgen_disassemble(bfd_vma pc,
                 int machine,
                 enum bfd_endian endian,
                 const char *name,
-                unsigned long isa_mask)
+                CGEN_BITSET *isas)
 {
   register_name(arch, name, machine);
   INIT_DISASSEMBLE_INFO(*info, this_ptr, trace_printf);
   info->application_data = this_ptr;
   info->flavour = flavour;
-  info->insn_sets = isa_mask; /* may be 0 */
+  info->insn_sets = isas; /* may be NULL */
   info->arch = arch;
   info->mach = machine;
   info->endian = endian;

diff --git a/sid/component/cgen-cpu/tracedis.h b/sid/component/cgen-cpu/tracedis.h
index 6ff1f20..c70f16c 100644 (file)
--- a/sid/component/cgen-cpu/tracedis.h
+++ b/sid/component/cgen-cpu/tracedis.h
@@ -1,5 +1,6 @@
 #include "bfd.h"
 #include "dis-asm.h"
+#include "opcode/cgen-bitset.h"
 
 // ansidecl.h interferes with this perfectly ordinary word
 #undef AND
@@ -9,4 +10,4 @@ typedef void (*MEMERR)(int status, bfd_vma memaddr, struct disassemble_info *inf
 typedef void (*PRINTADDR)(bfd_vma addr, struct disassemble_info *info);
 typedef int (*SYMATADDR)(bfd_vma addr, struct disassemble_info * info);
 
-void cgen_disassemble(bfd_vma, disassemble_info *, void *, READMEM, MEMERR, PRINTADDR, SYMATADDR, disassembler_ftype, enum bfd_flavour, enum bfd_architecture, int machine, enum bfd_endian, const char *, unsigned long isa_mask);
+void cgen_disassemble(bfd_vma, disassemble_info *, void *, READMEM, MEMERR, PRINTADDR, SYMATADDR, disassembler_ftype, enum bfd_flavour, enum bfd_architecture, int machine, enum bfd_endian, const char *, CGEN_BITSET *isas);