diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:01 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:01 -0500 |
| commit | 04300e33d49e5697565eb39956849a18ad74ea45 (patch) | |
| tree | f265420ef4bd8ac8284e03b8437d0c6da0af6728 /src/arch/arm/isa/insts/ldr.isa | |
| parent | deb6e8f805e162dd6a33b154e6a635acc0d7c132 (diff) | |
| download | gem5-04300e33d49e5697565eb39956849a18ad74ea45.tar.xz | |
ARM: Remove the special naming for the new memory instructions.
These are the only memory instructions now.
Diffstat (limited to 'src/arch/arm/isa/insts/ldr.isa')
| -rw-r--r-- | src/arch/arm/isa/insts/ldr.isa | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/arm/isa/insts/ldr.isa b/src/arch/arm/isa/insts/ldr.isa index 259a46fd9..86cb76383 100644 --- a/src/arch/arm/isa/insts/ldr.isa +++ b/src/arch/arm/isa/insts/ldr.isa @@ -64,10 +64,10 @@ let {{ (newHeader, newDecoder, - newExec) = newLoadStoreBase(name, Name, imm, - eaCode, accCode, - memFlags, instFlags, - base, execTemplateBase = 'Load') + newExec) = loadStoreBase(name, Name, imm, + eaCode, accCode, + memFlags, instFlags, + base, execTemplateBase = 'Load') header_output += newHeader decoder_output += newDecoder @@ -93,7 +93,7 @@ let {{ accCode = "Dest = Mem%s;\n" % buildMemSuffix(sign, size) if writeback: accCode += "Base = Base %s;\n" % offset - base = buildMemBase("MemoryNewImm", post, writeback) + base = buildMemBase("MemoryImm", post, writeback) emitLoad(name, Name, True, eaCode, accCode, [], [], base) @@ -118,7 +118,7 @@ let {{ accCode = "Dest = Mem%s;\n" % buildMemSuffix(sign, size) if writeback: accCode += "Base = Base %s;\n" % offset - base = buildMemBase("MemoryNewReg", post, writeback) + base = buildMemBase("MemoryReg", post, writeback) emitLoad(name, Name, False, eaCode, accCode, [], [], base) @@ -143,7 +143,7 @@ let {{ ''' if writeback: accCode += "Base = Base %s;\n" % offset - base = buildMemBase("MemoryNewImm", post, writeback) + base = buildMemBase("MemoryImm", post, writeback) emitLoad(name, Name, True, eaCode, accCode, [], [], base) @@ -169,7 +169,7 @@ let {{ ''' if writeback: accCode += "Base = Base %s;\n" % offset - base = buildMemBase("MemoryNewReg", post, writeback) + base = buildMemBase("MemoryReg", post, writeback) emitLoad(name, Name, False, eaCode, accCode, [], [], base) |