X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fppc%2Fidecode_fields.h;h=cf8826deefb9440b1f2a57a2ccbcd8f67e26cf8a;hb=5fd104addfddb68844fb8df67be832ee98ad9888;hp=8d65b17bebeca775de29258f449529ff4fdc7ef7;hpb=cb7a68927ab066fb794ed40ad38f601845516fe4;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/ppc/idecode_fields.h b/sim/ppc/idecode_fields.h
index 8d65b17beb..cf8826deef 100644
--- a/sim/ppc/idecode_fields.h
+++ b/sim/ppc/idecode_fields.h
@@ -4,7 +4,7 @@
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
  
     */
 
@@ -30,8 +29,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 +65,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 +81,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 +99,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)