changes from mergedmem
authorKorey Sewell <ksewell@umich.edu>
Sat, 18 Feb 2006 19:38:23 +0000 (14:38 -0500)
committerKorey Sewell <ksewell@umich.edu>
Sat, 18 Feb 2006 19:38:23 +0000 (14:38 -0500)
commitbd175809286e8da64176da977aeb27fc6ff6d272
treed6c9d1fc0388e730a73408c483789ef88fa51b0e
parent159e3345314b921f05f808ace06d62adf79f095a
changes from mergedmem

arch/mips/isa/formats/branch.isa:
    add branch_likely member functions
cpu/base.hh:
cpu/exec_context.hh:
cpu/static_inst.hh:
    change from mergedmem

--HG--
extra : convert_revision : d6ad6943e2ef09eac91a466fc5c9bd8e66bf319a
arch/mips/isa/formats/branch.isa
cpu/base.hh
cpu/exec_context.hh
cpu/static_inst.hh