Regenerate cgen files, update copyright year.

[pf3gnuchains/pf3gnuchains3x.git] / sid / component / cgen-cpu / arm7t / arm-desc.h

diff --git a/sid/component/cgen-cpu/arm7t/arm-desc.h b/sid/component/cgen-cpu/arm7t/arm-desc.h
index ade7724..0163bb0 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/arm-desc.h
+++ b/sid/component/cgen-cpu/arm7t/arm-desc.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
+Copyright (C) 2000-2010 Red Hat, Inc.
 
 This file is part of the Red Hat simulators.
 
@@ -12,6 +12,8 @@ This file is part of the Red Hat simulators.
 #ifndef DESC_ARM_H
 #define DESC_ARM_H
 
+#include "cgen/bitset.h"
+
 namespace arm {
 
 // Enums.
@@ -71,7 +73,7 @@ typedef enum cc_tests {
 /* Enum declaration for cgen_insn attrs.  */
 typedef enum cgen_insn_attr {
   CGEN_INSN_ALIAS, CGEN_INSN_VIRTUAL, CGEN_INSN_UNCOND_CTI, CGEN_INSN_COND_CTI
- , CGEN_INSN_SKIP_CTI, CGEN_INSN_DELAY_SLOT, CGEN_INSN_RELAXABLE, CGEN_INSN_RELAX
+ , CGEN_INSN_SKIP_CTI, CGEN_INSN_DELAY_SLOT, CGEN_INSN_RELAXABLE, CGEN_INSN_RELAXED
  , CGEN_INSN_NO_DIS, CGEN_INSN_PBB, CGEN_INSN_END_BOOLS, CGEN_INSN_START_NBOOLS = 31
  , CGEN_INSN_MACH, CGEN_INSN_ISA, CGEN_INSN_R15_OFFSET, CGEN_INSN_END_NBOOLS
 } CGEN_INSN_ATTR;
@@ -96,10 +98,10 @@ typedef enum isa_attr {
 struct arm_insn_attr {
   unsigned int bools;
   unsigned int mach;
-  unsigned int isa;
+  CGEN_BITSET isa;
   int r15_offset;
   inline unsigned int get_mach_attr () { return mach; }
-  inline unsigned int get_isa_attr () { return isa; }
+  inline CGEN_BITSET get_isa_attr () { return isa; }
   inline int get_r15_offset_attr () { return r15_offset; }
   inline int get_alias_attr () { return (bools & (1<<CGEN_INSN_ALIAS)) != 0; }
   inline int get_virtual_attr () { return (bools & (1<<CGEN_INSN_VIRTUAL)) != 0; }
@@ -108,7 +110,7 @@ struct arm_insn_attr {
   inline int get_skip_cti_attr () { return (bools & (1<<CGEN_INSN_SKIP_CTI)) != 0; }
   inline int get_delay_slot_attr () { return (bools & (1<<CGEN_INSN_DELAY_SLOT)) != 0; }
   inline int get_relaxable_attr () { return (bools & (1<<CGEN_INSN_RELAXABLE)) != 0; }
-  inline int get_relax_attr () { return (bools & (1<<CGEN_INSN_RELAX)) != 0; }
+  inline int get_relaxed_attr () { return (bools & (1<<CGEN_INSN_RELAXED)) != 0; }
   inline int get_no_dis_attr () { return (bools & (1<<CGEN_INSN_NO_DIS)) != 0; }
   inline int get_pbb_attr () { return (bools & (1<<CGEN_INSN_PBB)) != 0; }
 };