From 22a1ac22f4015bb3fd6450c2643d647d5df97db8 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 1 Jul 2009 22:16:05 -0700 Subject: ARM: Get rid of the val2 variable. --- src/arch/arm/isa/formats/pred.isa | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/arch/arm/isa/formats/pred.isa') diff --git a/src/arch/arm/isa/formats/pred.isa b/src/arch/arm/isa/formats/pred.isa index ef53843ae..dc115f588 100644 --- a/src/arch/arm/isa/formats/pred.isa +++ b/src/arch/arm/isa/formats/pred.isa @@ -102,10 +102,12 @@ let {{ }}; def format DataOp(code, icValue, ivValue) {{ - regCode = re.sub(r'op2', 'shift_rm_rs(Rm, Rs, \ - shift, Cpsr<29:0>)', code) - immCode = re.sub(r'op2', 'shift_rm_imm(Rm, shift_size, \ - shift, Cpsr<29:0>)', code) + regCode = '''uint32_t op2 = shift_rm_rs(Rm, Rs, + shift, Cpsr<29:0>); + op2 = op2;''' + code + immCode = '''uint32_t op2 = shift_rm_imm(Rm, shift_size, + shift, Cpsr<29:0>); + op2 = op2;''' + code regIop = InstObjParams(name, Name, 'PredIntOp', {"code": regCode, "predicate_test": predicateTest}) -- cgit v1.2.3