From dfaf2c472c619338d2dbf4e3a72a251dd45c34c0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 19 Feb 2015 03:41:36 -0500 Subject: [PATCH] sim: microblaze: fix build failure after opcodes update Commit 07774fccc3280323f43db9ed204f628503b34663 update the microblaze opcodes table to avoid C++ collisions, but missed updating the sim. That caused it to fail to build due to missing keywords. --- sim/microblaze/ChangeLog | 4 ++++ sim/microblaze/microblaze.isa | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index bed555ffdb4..c6b72b5de96 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2015-02-19 Mike Frysinger + + * microblaze.isa: Add "microblaze_" prefix to "or", "and", and "xor". + 2014-08-19 Alan Modra * configure: Regenerate. diff --git a/sim/microblaze/microblaze.isa b/sim/microblaze/microblaze.isa index 0856c2b1aa4..4ad5692e777 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; -- 2.30.2