ARM: Make LDM that loads the PC perform an interworking branch.

2010-06-02 12:58:05 -05:00
parent 1344fc2668
commit 57443a2144
2 changed files with 3 additions and 1 deletions
--- a/src/arch/arm/isa/insts/macromem.isa
+++ b/src/arch/arm/isa/insts/macromem.isa
@@ -53,7 +53,7 @@ let {{
 let {{
    microLdrUopIop = InstObjParams('ldr_uop', 'MicroLdrUop',
                                   'MicroMemOp',
-                                   {'memacc_code': 'Ra = Mem;',
+                                   {'memacc_code': 'IWRa = Mem;',
                                    'ea_code': 'EA = Rb + (up ? imm : -imm);',
                                    'predicate_test': predicateTest},
                                   ['IsMicroop'])
--- a/src/arch/arm/isa/operands.isa
+++ b/src/arch/arm/isa/operands.isa
@@ -129,6 +129,8 @@ def operands {{

    #Register fields for microops
    'Ra' : ('IntReg', 'uw', 'ura', 'IsInteger', 11, maybePCRead, maybePCWrite),
+    'IWRa' : ('IntReg', 'uw', 'ura', 'IsInteger', 11,
+            maybePCRead, maybeIWPCWrite),
    'Fa' : ('FloatReg', 'sf', 'ura', 'IsFloating', 11),
    'Rb' : ('IntReg', 'uw', 'urb', 'IsInteger', 12, maybePCRead, maybePCWrite),