Add an index operand to some of the iq2000 co-processor instructions

3 files changed, 41 insertions, 50 deletions

diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index d28bcd5..b5e3764 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-27  Nick Clifton  <nickc@redhat.com>
+
+	* iq2000m.cpu (pkrlr1, pkrlr30, rbr1, rbr30, rxr1, rxr30, wbr1,
+	wbr1u, wbr30, wbr30u, wxr1, wxr1u, wxr30, wxr30u): Add an index
+	operand.
+	* iq2000.cpu (dnop index): Rename to _index to avoid complications
+	with guile.
+
 2004-08-27  Richard Sandiford  <rsandifo@redhat.com>
 
 	* frv.cpu (cfmovs): Change UNIT attribute to FMALL.
diff --git a/cpu/iq2000.cpu b/cpu/iq2000.cpu
index 2a34859..978108c 100644
--- a/cpu/iq2000.cpu
+++ b/cpu/iq2000.cpu
@@ -1,24 +1,7 @@
 ; IQ2000/IQ10 Common CPU description. -*- Scheme -*-
-;
-; Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
-;
-; Contributed by Red Hat Inc; developed under contract from Vitesse.
-;
-; This file is part of the GNU Binutils.
-;
-; 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
-; (at your option) any later version.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; 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.
+; Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
+; This file is part of CGEN.
+; See file COPYING.CGEN for details.
 
 (include "simplify.inc")
 
@@ -374,7 +357,7 @@
 (dnop maskq10  "iq10 mask"               () h-uint  f-maskq10)
 (dnop maskl    "mask left"               () h-uint  f-maskl)
 (dnop count    "count"                   () h-uint  f-count)
-(dnop index    "index"                   () h-uint  f-index)
+(dnop _index   "index"                   () h-uint  f-index)
 (dnop execode  "execcode"                () h-uint  f-excode)
 (dnop bytecount "byte count"             () h-uint  f-bytecount)
 (dnop cam-y     "cam global opn y"       () h-uint  f-cam-y)
diff --git a/cpu/iq2000m.cpu b/cpu/iq2000m.cpu
index a3a41d9..e602bd2 100644
--- a/cpu/iq2000m.cpu
+++ b/cpu/iq2000m.cpu
@@ -1,6 +1,6 @@
 ; IQ2000-only CPU description. -*- Scheme -*-
 ;
-; Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+; Copyright 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 ;
 ; Contributed by Red Hat Inc; developed under contract from Vitesse.
 ;
@@ -375,14 +375,14 @@
      ())
 
 (dni pkrlr1 "pkrlr1" (MACH2000 USES-RT YIELD-INSN)
-     "pkrlr1 $rt,$count"
-     (+ OP_COP3 (f-rs 29) rt count)
+     "pkrlr1 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 29) rt count _index)
      (unimp pkrlr1)
      ())
 
 (dni pkrlr30 "pkrlr30" (MACH2000 USES-RT YIELD-INSN)
-     "pkrlr30 $rt,$count"
-     (+ OP_COP3 (f-rs 31) rt count)
+     "pkrlr30 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 31) rt count _index)
      (unimp pkrlr30)
      ())
 
@@ -393,14 +393,14 @@
      ())
 
 (dni rbr1 "dma read bytes using r1" (MACH2000 USES-RT YIELD-INSN)
-     "rbr1 $rt,$count"
-     (+ OP_COP3 (f-rs 24) rt count)
+     "rbr1 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 24) rt count _index)
      (unimp rbr1)
      ())
 
 (dni rbr30 "dma read bytes using r30" (MACH2000 USES-RT YIELD-INSN)
-     "rbr30 $rt,$count"
-     (+ OP_COP3 (f-rs 26) rt count)
+     "rbr30 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 26) rt count _index)
      (unimp rbr30)
      ())
 
@@ -417,14 +417,14 @@
      ())
 
 (dni rxr1 "dma read word64s using r1" (MACH2000 USES-RT YIELD-INSN)
-     "rxr1 $rt,$count"
-     (+ OP_COP3 (f-rs 28) rt count)
+     "rxr1 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 28) rt count _index)
      (unimp rxr1)
      ())
 
 (dni rxr30 "dma read word 64s using r30" (MACH2000 USES-RT YIELD-INSN)
-     "rxr30 $rt,$count"
-     (+ OP_COP3 (f-rs 30) rt count)
+     "rxr30 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 30) rt count _index)
      (unimp rxr30)
      ())
 
@@ -495,26 +495,26 @@
      ())
 
 (dni wbr1 "dma write bytes using r1" (MACH2000 USES-RT YIELD-INSN)
-     "wbr1 $rt,$count"
-     (+ OP_COP3 (f-rs 16) rt count)
+     "wbr1 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 16) rt count _index)
      (unimp wbr1)
      ())
 
 (dni wbr1u "dma write bytes using r1 and unlock" (MACH2000 USES-RT YIELD-INSN)
-     "wbr1u $rt,$count"
-     (+ OP_COP3 (f-rs 17) rt count)
+     "wbr1u $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 17) rt count _index)
      (unimp wbr1u)
      ())
 
 (dni wbr30 "dma write bytes using r30" (MACH2000 USES-RT YIELD-INSN)
-     "wbr30 $rt,$count"
-     (+ OP_COP3 (f-rs 18) rt count)
+     "wbr30 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 18) rt count _index)
      (unimp wbr30)
      ())
 
 (dni wbr30u "dma write bytes using r30 and unlock" (MACH2000 USES-RT YIELD-INSN)
-     "wbr30u $rt,$count"
-     (+ OP_COP3 (f-rs 19) rt count)
+     "wbr30u $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 19) rt count _index)
      (unimp wbr30u)
      ())
 
@@ -531,26 +531,26 @@
      ())
 
 (dni wxr1 "dma write word64s using r1" (MACH2000 USES-RT YIELD-INSN)
-     "wxr1 $rt,$count"
-     (+ OP_COP3 (f-rs 20) rt count)
+     "wxr1 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 20) rt count _index)
      (unimp wxr1)
      ())
 
 (dni wxr1u "dma write word64s using r1 and unlock" (MACH2000 USES-RT YIELD-INSN)
-     "wxr1u $rt,$count"
-     (+ OP_COP3 (f-rs 21) rt count)
+     "wxr1u $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 21) rt count _index)
      (unimp wxr1u)
      ())
 
 (dni wxr30 "dma write word64s using r30" (MACH2000 USES-RT YIELD-INSN)
-     "wxr30 $rt,$count"
-     (+ OP_COP3 (f-rs 22) rt count)
+     "wxr30 $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 22) rt count _index)
      (unimp wxr30)
      ())
 
 (dni wxr30u "dma write word64s using r30 and unlock" (MACH2000 USES-RT YIELD-INSN)
-     "wxr30u $rt,$count"
-     (+ OP_COP3 (f-rs 23) rt count)
+     "wxr30u $rt,$_index,$count"
+     (+ OP_COP3 (f-rs 23) rt count _index)
      (unimp wxr30u)
      ())