From 3026a116baf0dd31ba42f6aa4027e314f9a00905 Mon Sep 17 00:00:00 2001 From: Nathanael Premillieu Date: Wed, 12 Dec 2012 09:50:33 -0600 Subject: arm: set uopSet_uop as conditional or unconditional control uopSet_uop is microop instruction that has the IsControl flags set, but the IsCondControl or IsUncondControl flags seems not to be set, neither in the construction nor where the microop is used. This patch adds the the flags in the constructor of the instruction (MicroUopSetPCCPSR). Committed by: Nilay Vaish --- src/arch/arm/isa/templates/macromem.isa | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/arch/arm/isa/templates') diff --git a/src/arch/arm/isa/templates/macromem.isa b/src/arch/arm/isa/templates/macromem.isa index a62dec5cf..195204a95 100644 --- a/src/arch/arm/isa/templates/macromem.isa +++ b/src/arch/arm/isa/templates/macromem.isa @@ -135,9 +135,12 @@ def template MicroSetPCCPSRConstructor {{ { %(constructor)s; if (!(condCode == COND_AL || condCode == COND_UC)) { + flags[IsCondControl] = true; for (int x = 0; x < _numDestRegs; x++) { _srcRegIdx[_numSrcRegs++] = _destRegIdx[x]; } + } else { + flags[IsUncondControl] = true; } } }}; -- cgit v1.2.3