From 35e35fc825ac1297ba5e1334ac177b0a40329110 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Wed, 2 Jun 2010 12:58:18 -0500
Subject: [PATCH] ARM: Make some of the trace code more compact

---
 src/arch/arm/insts/mem.cc | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/arch/arm/insts/mem.cc b/src/arch/arm/insts/mem.cc
index 3dde0aa35..552803b6a 100644
--- a/src/arch/arm/insts/mem.cc
+++ b/src/arch/arm/insts/mem.cc
@@ -60,18 +60,10 @@ MemoryReg::printOffset(std::ostream &os) const
             ccprintf(os, " LSL #%d", shiftAmt);
             break;
           case LSR:
-            if (shiftAmt == 0) {
-                ccprintf(os, " LSR #%d", 32);
-            } else {
-                ccprintf(os, " LSR #%d", shiftAmt);
-            }
+            ccprintf(os, " LSR #%d", (shiftAmt == 0) ? 32 : shiftAmt);
             break;
           case ASR:
-            if (shiftAmt == 0) {
-                ccprintf(os, " ASR #%d", 32);
-            } else {
-                ccprintf(os, " ASR #%d", shiftAmt);
-            }
+            ccprintf(os, " ASR #%d", (shiftAmt == 0) ? 32 : shiftAmt);
             break;
           case ROR:
             if (shiftAmt == 0) {