41,42c41,42
< def newLoadStoreBase(name, Name, imm, eaCode, accCode, memFlags,
< instFlags, base = 'MemoryNew', execTemplateBase = ''):
---
> def loadStoreBase(name, Name, imm, eaCode, accCode, memFlags,
> instFlags, base = 'Memory', execTemplateBase = ''):
134c134
< base = "MemoryNewPostIndex<%s>" % base
---
> base = "MemoryPostIndex<%s>" % base
136c136
< base = "MemoryNewPreIndex<%s>" % base
---
> base = "MemoryPreIndex<%s>" % base
138c138
< base = "MemoryNewOffset<%s>" % base
---
> base = "MemoryOffset<%s>" % base