gas: sparc: fix collision of registers and pseudo-ops.

[deliverable/binutils-gdb.git] / sim / microblaze / microblaze.isa

diff --git a/sim/microblaze/microblaze.isa b/sim/microblaze/microblaze.isa
index d1369b2eaf6b59fc01360516829318b33c6d4c75..75dccadddebb44b2522e4fd693dce6604405310b 100644 (file)
--- a/sim/microblaze/microblaze.isa
+++ b/sim/microblaze/microblaze.isa
@@ -1,4 +1,4 @@
-/* Copyright 2009 Free Software Foundation, Inc.
+/* Copyright 2009-2016 Free Software Foundation, Inc.
 
    This file is part of the Xilinx MicroBlaze simulator.
 
@@ -13,9 +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., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /*
  *  MICROBLAZE Instruction Set Architecture
@@ -263,19 +261,19 @@ INSTRUCTION(ncput,
             INST_TYPE_R1_IMM12,
             PC += INST_SIZE) 
 
-INSTRUCTION(or,
+INSTRUCTION(microblaze_or,
            0x20,
             INST_TYPE_RD_RA_RB,
            RD = RA | RB;
            PC += INST_SIZE)
 
-INSTRUCTION(and,
+INSTRUCTION(microblaze_and,
            0x21,
             INST_TYPE_RD_RA_RB,
            RD = RA & RB;
            PC += INST_SIZE)
 
-INSTRUCTION(xor,
+INSTRUCTION(microblaze_xor,
            0x22,
             INST_TYPE_RD_RA_RB,
            RD = RA ^ RB;