From patchwork Thu Feb 19 08:45:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5166 Received: (qmail 25434 invoked by alias); 19 Feb 2015 08:45:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 25423 invoked by uid 89); 19 Feb 2015 08:45:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 19 Feb 2015 08:45:06 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 573453408DF; Thu, 19 Feb 2015 08:45:03 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Cc: palves@redhat.com, tromey@redhat.com Subject: [PATCH] sim: microblaze: fix build failure after opcodes update Date: Thu, 19 Feb 2015 03:45:00 -0500 Message-Id: <1424335500-1232-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes 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. Committed as obvious/build breakage fix. --- 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 bed555f..c6b72b5 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 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;