PATCH: some cleanups in cgen-cpu

Jim Blandy <[email protected]>
Newsgroups gmane.comp.emulators.sid.devel
Message-ID <[email protected]>
I've committed the following patches, to fix a few build problems:

2005-06-02  Jim Blandy  <[email protected]>

	* cgen-cpu.h: Remove references to CGEN bitset type.

	* configure.in: Don't forget to AC_SUBST the value of cpu_defs.
	* configure: Regenerated.

Index: sid/component/cgen-cpu/cgen-cpu.h
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/cgen-cpu.h,v
retrieving revision 1.12
diff -c -p -r1.12 cgen-cpu.h
*** sid/component/cgen-cpu/cgen-cpu.h	10 May 2005 15:46:16 -0000	1.12
--- sid/component/cgen-cpu/cgen-cpu.h	3 Jun 2005 20:24:42 -0000
***************
*** 25,31 ****
  
  #include "bfd.h"
  #include "dis-asm.h"
- #include "opcode/cgen-bitset.h"
  
  // ansidecl.h interferes with this perfectly ordinary word
  #undef AND
--- 25,30 ----
*************** public:
*** 69,75 ****
    // 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, CGEN_BITSET *isas = NULL, int machine = 0);
    struct disassemble_info info;
  protected:
    static int cgen_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
--- 68,74 ----
    // 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);
    struct disassemble_info info;
  protected:
    static int cgen_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
Index: sid/component/cgen-cpu/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/configure.in,v
retrieving revision 1.6
diff -c -p -r1.6 configure.in
*** sid/component/cgen-cpu/configure.in	10 May 2005 15:46:16 -0000	1.6
--- sid/component/cgen-cpu/configure.in	3 Jun 2005 20:24:43 -0000
*************** AC_CONFIG_SUBDIRS($cpu_subdirs)
*** 65,70 ****
--- 65,71 ----
  AC_SUBST(cpu_subdirs)
  AC_SUBST(cpu_incl)
  AC_SUBST(cpu_libs)
+ AC_SUBST(cpu_defs)
  AC_SUBST(INTLLIBS)
  
  dnl Look for GUILE in install tree
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.