From 04300e33d49e5697565eb39956849a18ad74ea45 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 2 Jun 2010 12:58:01 -0500 Subject: ARM: Remove the special naming for the new memory instructions. These are the only memory instructions now. --- src/arch/arm/isa/insts/mem.isa | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/arch/arm/isa/insts/mem.isa') diff --git a/src/arch/arm/isa/insts/mem.isa b/src/arch/arm/isa/insts/mem.isa index 698f95adb..a7aa0b2ed 100644 --- a/src/arch/arm/isa/insts/mem.isa +++ b/src/arch/arm/isa/insts/mem.isa @@ -38,8 +38,8 @@ // Authors: Gabe Black let {{ - def newLoadStoreBase(name, Name, imm, eaCode, accCode, memFlags, - instFlags, base = 'MemoryNew', execTemplateBase = ''): + def loadStoreBase(name, Name, imm, eaCode, accCode, memFlags, + instFlags, base = 'Memory', execTemplateBase = ''): # Make sure flags are in lists (convert to lists if not). memFlags = makeList(memFlags) instFlags = makeList(instFlags) @@ -131,11 +131,11 @@ let {{ def buildMemBase(base, post, writeback): if post and writeback: - base = "MemoryNewPostIndex<%s>" % base + base = "MemoryPostIndex<%s>" % base elif not post and writeback: - base = "MemoryNewPreIndex<%s>" % base + base = "MemoryPreIndex<%s>" % base elif not post and not writeback: - base = "MemoryNewOffset<%s>" % base + base = "MemoryOffset<%s>" % base else: raise Exception, "Illegal combination of post and writeback" return base -- cgit v1.2.3