ARM: Move the CP15 decode block into a function.

1 files changed, 14 insertions, 2 deletions

diff --git a/src/arch/arm/isa/formats/misc.isa b/src/arch/arm/isa/formats/misc.isa
index 9ce199637..03fb86287 100644
--- a/src/arch/arm/isa/formats/misc.isa
+++ b/src/arch/arm/isa/formats/misc.isa
@@ -78,8 +78,14 @@ def format ArmMsrMrs() {{
     '''
 }};
 
-def format McrMrc15() {{
-    decode_block = '''
+let {{
+    header_output = '''
+    StaticInstPtr
+    decodeMcrMrc15(ExtMachInst machInst);
+    '''
+    decoder_output = '''
+    StaticInstPtr
+    decodeMcrMrc15(ExtMachInst machInst)
     {
         const uint32_t opc1 = bits(machInst, 23, 21);
         const uint32_t crn = bits(machInst, 19, 16);
@@ -180,3 +186,9 @@ def format McrMrc15() {{
     }
     '''
 }};
+
+def format McrMrc15() {{
+    decode_block = '''
+    return decodeMcrMrc15(machInst);
+    '''
+}};