summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/isa')
-rw-r--r--src/arch/arm/isa/formats/misc.isa2
-rw-r--r--src/arch/arm/isa/insts/m5ops.isa4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/arm/isa/formats/misc.isa b/src/arch/arm/isa/formats/misc.isa
index 3865cffe2..00a37d17b 100644
--- a/src/arch/arm/isa/formats/misc.isa
+++ b/src/arch/arm/isa/formats/misc.isa
@@ -81,7 +81,7 @@ def format ArmMsrMrs() {{
let {{
header_output = '''
StaticInstPtr
- decodeMcrMrc15(ExtMachInst machInst);
+ decodeMcrMrc14(ExtMachInst machInst);
'''
decoder_output = '''
StaticInstPtr
diff --git a/src/arch/arm/isa/insts/m5ops.isa b/src/arch/arm/isa/insts/m5ops.isa
index a32bf6dfc..272f16b17 100644
--- a/src/arch/arm/isa/insts/m5ops.isa
+++ b/src/arch/arm/isa/insts/m5ops.isa
@@ -38,7 +38,9 @@
let {{
- header_output = ""
+ header_output = '''
+ uint64_t join32to64(uint32_t r1, uint32_t r0);
+ '''
decoder_output = '''
uint64_t join32to64(uint32_t r1, uint32_t r0)
{