3,30d2
< // Copyright (c) 2003-2006 The Regents of The University of Michigan
< // All rights reserved.
< //
< // 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: Korey Sewell
<
76c48,49
< MipsStaticInst *nop = new Nop(inst->disassemble(0), inst->machInst);
---
> std::string nop_str = "(" + inst->disassemble(0) + ")";
> MipsStaticInst *nop = new Nop(nop_str, inst->machInst);
90,92c63,65
< // integer & FP operate instructions use RT as dest, so check for
< // RT == 0 to detect nops
< def template OperateNopCheckDecode {{
---
> // Int & FP operate instructions use RD as dest, so check for
> // RD == 0 to detect nops
> def template RegNopCheckDecode {{
94a68,73
> //if (RD == 0) {
> //i = makeNop(i);
> //}
> return i;
> }
> }};
95a75,77
> def template OperateNopCheckDecode {{
> {
> MipsStaticInst *i = new %(class_name)s(machInst);
97c79
< // i = makeNop(i);
---
> // i = makeNop(i);
98a81,83
> return i;
> }
> }};
99a85,92
> // IntImm & Memory instructions use Rt as dest, so check for
> // Rt == 0 to detect nops
> def template ImmNopCheckDecode {{
> {
> MipsStaticInst *i = new %(class_name)s(machInst);
> //if (RT == 0) {
> // i = makeNop(i);
> // }