From 20d25b9da77cc681ef7d5bb101438bc0b0c6827c Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Tue, 5 Jun 2012 13:52:30 -0400 Subject: ISA: Back-out NoopMachInst as a StaticInstPtr change. --- src/arch/arm/isa_traits.cc | 47 ---------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 src/arch/arm/isa_traits.cc (limited to 'src/arch/arm/isa_traits.cc') diff --git a/src/arch/arm/isa_traits.cc b/src/arch/arm/isa_traits.cc deleted file mode 100644 index 7a663751c..000000000 --- a/src/arch/arm/isa_traits.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2012 ARM Limited - * All rights reserved - * - * The license below extends only to copyright in the software and shall - * not be construed as granting a license to any other intellectual - * property including but not limited to intellectual property relating - * to a hardware implementation of the functionality of the software - * licensed hereunder. You may use the software subject to the license - * terms below provided that you ensure that this notice is replicated - * unmodified and in its entirety in all distributions of the software, - * modified or unmodified, in source code or in binary form. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Ali Saidi - */ -#include "arch/arm/generated/decoder.hh" -#include "arch/arm/isa_traits.hh" - -namespace ArmISA -{ -// no-op that is predicated true -const StaticInstPtr NoopStaticInst = new ArmISAInst::NopInst(0x01E320F000ULL); -} - -- cgit v1.2.3