This commit was manufactured by cvs2svn to create branch 'gdb_7_0-branch'.

[external/binutils.git] / sim / ppc / idecode_fields.h

diff --git a/sim/ppc/idecode_fields.h b/sim/ppc/idecode_fields.h
index 8d65b17..1c449bc 100644 (file)
--- a/sim/ppc/idecode_fields.h
+++ b/sim/ppc/idecode_fields.h
@@ -30,8 +30,7 @@
 
 /* map some statements and variables directly across */
 
-#define then                    /*then*/
-#define is_64bit_implementation WITH_64BIT_TARGET
+#define is_64bit_implementation (WITH_TARGET_WORD_BITSIZE == 64)
 #define is_64bit_mode           IS_64BIT_MODE(processor)
 
 #define NIA nia
@@ -67,9 +66,9 @@
 
 /* the spr field as it normally is used */
 
-#define spr_5_9_ (spr & 0x1f)
-#define spr_0_4_ (spr >> 5)
-#define spr_0_ ((spr & BIT10(0)) != 0)
+#define SPR_5_9_ (SPR & 0x1f)
+#define SPR_0_4_ (SPR >> 5)
+#define SPR_0_ ((SPR & BIT10(0)) != 0)
 
 #define tbr_5_9_ (tbr & 0x1f)
 #define tbr_0_4_ (tbr >> 5)
@@ -83,7 +82,7 @@
 #define LR_0b00                (LR & ~3)
 #define CTR_0b00       (CTR & ~3)
 
-#define CR_BI_      ((CR & BIT32_BI) != 0)
+#define CR_BI_  ((CR & BIT32_BI) != 0)
 #define CR_BA_ ((CR & BIT32_BA) != 0)
 #define CR_BB_ ((CR & BIT32_BB) != 0)
 
@@ -101,3 +100,6 @@
 #define BO_2_ ((BO & BIT5(2)) != 0)
 #define BO_3_ ((BO & BIT5(3)) != 0)
 #define BO_4_ ((BO & BIT5(4)) != 0)
+
+#define GOTO(dest)   goto XCONCAT4(label__,dest,__,MY_PREFIX)
+#define LABEL(dest)  XCONCAT4(label__,dest,__,MY_PREFIX)