diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-06 16:39:47 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-06 16:39:47 +0000 |
| commit | a3ed19f82a34626231ae7b5a024331b24645c01c (patch) | |
| tree | e5b0f9ce26c276998f64dd4d66aa6d81d5fb466c /src/arch/x86/isa/base.isa | |
| parent | 3c9768e6448b72689e9edb250dd0ee3e5eadb9d7 (diff) | |
| parent | 59df95c7e6e5d1e0bee48946aea08e436785b298 (diff) | |
| download | gem5-a3ed19f82a34626231ae7b5a024331b24645c01c.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 8e624bb95cb9f478ca7ac1dbbd64e20674e3e224
Diffstat (limited to 'src/arch/x86/isa/base.isa')
| -rw-r--r-- | src/arch/x86/isa/base.isa | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/arch/x86/isa/base.isa b/src/arch/x86/isa/base.isa index 4776f7a7e..cd166b306 100644 --- a/src/arch/x86/isa/base.isa +++ b/src/arch/x86/isa/base.isa @@ -79,6 +79,13 @@ output header {{ void printReg(std::ostream &os, int reg) const; void printSrcReg(std::ostream &os, int reg) const; void printDestReg(std::ostream &os, int reg) const; + + inline uint64_t merge(uint64_t into, uint64_t val, int size) const + { + //FIXME This needs to be significantly more sophisticated + return val; + } + }; }}; |