diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-09 16:17:10 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-09 16:17:10 -0500 |
| commit | 7b283dbc090d1197593b00fd1279b92f7c2e693e (patch) | |
| tree | b3e0badd1408f7dddcffbf1dbafbe52f70206f75 /cpu/base.hh | |
| parent | 56cc760f6f53138c133c5d4e1f9d3e3199965d99 (diff) | |
| download | gem5-7b283dbc090d1197593b00fd1279b92f7c2e693e.tar.xz | |
fix merging issues
arch/alpha/isa_traits.hh:
arch/sparc/linux/process.cc:
fix merging problem
sim/syscall_emul.cc:
use setIntReg
--HG--
extra : convert_revision : e88d72e415493cd17d7b88c22c7e995f3199e396
Diffstat (limited to 'cpu/base.hh')
0 files changed, 0 insertions, 0 deletions