projects / gem5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 56cc760) | patch
fix merging issues
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 9 Mar 2006 21:17:10 +0000 (16:17 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 9 Mar 2006 21:17:10 +0000 (16:17 -0500)
commit7b283dbc090d1197593b00fd1279b92f7c2e693e
treeb3e0badd1408f7dddcffbf1dbafbe52f70206f75tree
parent56cc760f6f53138c133c5d4e1f9d3e3199965d99commit | diff
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
arch/alpha/isa_traits.hh diff | blob | history
arch/sparc/linux/process.cc diff | blob | history
sim/syscall_emul.cc diff | blob | history