diff options
| author | Kevin Lim <ktlim@umich.edu> | 2004-05-28 11:41:52 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2004-05-28 11:41:52 -0400 |
| commit | 67b5f6afc10a87a5942d24ad503f3e6b9358580c (patch) | |
| tree | 9cf28cf00687b98d3e818b4a72b8ed583d7061e2 /cpu/simple_cpu/simple_cpu.cc | |
| parent | 4f34dda81cf26340b9446e5a15bbbcd8840b92a2 (diff) | |
| parent | a896960cbfce76a0e0c8cfb5cbdfc805ce72577b (diff) | |
| download | gem5-67b5f6afc10a87a5942d24ad503f3e6b9358580c.tar.xz | |
Merged in new FastCPU stuff with existing code.
arch/alpha/ev5.cc:
Added templatized processInterrupts() function that can be used by all of the CPU models.
arch/alpha/isa_desc:
Merged in changes to remove CPU dependence.
arch/isa_parser.py:
Merged in changes.
cpu/static_inst.hh:
Includes FastCPU execute methods.
--HG--
extra : convert_revision : fcaa1dca35a9b316c73982bec8680df564f50bd8
Diffstat (limited to 'cpu/simple_cpu/simple_cpu.cc')
| -rw-r--r-- | cpu/simple_cpu/simple_cpu.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc index 1ade235ed..e1a861ad8 100644 --- a/cpu/simple_cpu/simple_cpu.cc +++ b/cpu/simple_cpu/simple_cpu.cc @@ -714,8 +714,7 @@ SimpleCPU::tick() xc->regs.pc); #ifdef FULL_SYSTEM - xc->regs.opcode = (inst >> 26) & 0x3f; - xc->regs.ra = (inst >> 21) & 0x1f; + xc->setInst(inst); #endif // FULL_SYSTEM xc->func_exe_inst++; |