aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/microblaze/ChangeLog4
-rw-r--r--sim/microblaze/microblaze.isa6
2 files changed, 7 insertions, 3 deletions
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index bed555f..c6b72b5 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-19 Mike Frysinger <vapier@gentoo.org>
+
+ * microblaze.isa: Add "microblaze_" prefix to "or", "and", and "xor".
+
2014-08-19 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/sim/microblaze/microblaze.isa b/sim/microblaze/microblaze.isa
index 0856c2b..4ad5692 100644
--- a/sim/microblaze/microblaze.isa
+++ b/sim/microblaze/microblaze.isa
@@ -261,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;