diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-04-18 09:27:22 -0400 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-04-18 09:27:22 -0400 |
commit | 3d99b4a5447abb1ccca552cee281137e2b11a674 (patch) | |
tree | b2c5fe75b956939247339e44cc546eb71393f9d5 /arch/sparc/isa/formats/mem.isa | |
parent | 832311a17094501a6883100ac9dba8c781211782 (diff) | |
download | gem5-3d99b4a5447abb1ccca552cee281137e2b11a674.tar.xz |
Fixes to SPARC syscall emulation mode.
arch/sparc/isa/base.isa:
Added a set of abbreviations for the different condition tests.
arch/sparc/isa/decoder.isa:
Fixes and additions to get syscall emulation closer to working.
arch/sparc/isa/formats/branch.isa:
Fixed branches so that the immediate version actually uses the immediate value
arch/sparc/isa/formats/integerop.isa:
Compute the condition codes -before- writing to the state of the machine.
arch/sparc/isa/formats/mem.isa:
An attempt to fix up the output of the disassembly of loads and stores.
arch/sparc/isa/formats/trap.isa:
Added code to disassemble a trap instruction. This probably needs to be fixed up so there are immediate and register versions.
arch/sparc/isa/operands.isa:
Added an R1 operand, and fixed up the numbering
arch/sparc/isa_traits.hh:
SyscallNumReg is no longer needed, the max number of sources and destinations are fixed up, and the syscall return uses xcc instead of icc.
arch/sparc/linux/process.cc:
arch/sparc/linux/process.hh:
Added a getresuidFunc syscall implementation. This isn't actually used, but I thought it was and will leave it in.
arch/sparc/process.cc:
arch/sparc/process.hh:
Fixed up how the initial stack frame is set up.
arch/sparc/regfile.hh:
Changed the number of windows from 6 to 32 so we don't have to worry about spill and fill traps for now, and commented out the register file setting itself up.
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.hh:
sim/process.cc:
sim/process.hh:
Changed the syscall mechanism to pass down the syscall number directly.
--HG--
extra : convert_revision : 15723b949a0ddb3d24e68c079343b4dba2439f43
Diffstat (limited to 'arch/sparc/isa/formats/mem.isa')
-rw-r--r-- | arch/sparc/isa/formats/mem.isa | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/sparc/isa/formats/mem.isa b/arch/sparc/isa/formats/mem.isa index db2a4aaaa..e15349c7b 100644 --- a/arch/sparc/isa/formats/mem.isa +++ b/arch/sparc/isa/formats/mem.isa @@ -47,17 +47,18 @@ output decoder {{ { std::stringstream response; bool load = flags[IsLoad]; + bool save = flags[IsStore]; printMnemonic(response, mnemonic); - if(!load) + if(save) { printReg(response, _srcRegIdx[0]); ccprintf(response, ", "); } ccprintf(response, "[ "); - printReg(response, _srcRegIdx[load ? 0 : 1]); + printReg(response, _srcRegIdx[!save ? 0 : 1]); ccprintf(response, " + "); - printReg(response, _srcRegIdx[load ? 1 : 2]); + printReg(response, _srcRegIdx[!save ? 1 : 2]); ccprintf(response, " ]"); if(load) { @@ -73,15 +74,16 @@ output decoder {{ { std::stringstream response; bool load = flags[IsLoad]; + bool save = flags[IsStore]; printMnemonic(response, mnemonic); - if(!load) + if(save) { printReg(response, _srcRegIdx[0]); ccprintf(response, ", "); } ccprintf(response, "[ "); - printReg(response, _srcRegIdx[load ? 0 : 1]); + printReg(response, _srcRegIdx[!save ? 0 : 1]); ccprintf(response, " + 0x%x ]", imm); if(load) { |