diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-06 15:16:36 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-06 15:16:36 +0000 |
| commit | e633e23a3ab32dda963746bea43147d54599c01c (patch) | |
| tree | f94c530a5a1ff1dc12f8d1b845923dc8a5747879 /src/arch | |
| parent | 47c24ff07ae3dccff92646ad72d62c4ee48fed20 (diff) | |
| download | gem5-e633e23a3ab32dda963746bea43147d54599c01c.tar.xz | |
Add in a stub merging function
--HG--
extra : convert_revision : 15e3cdb4ebcd31bc44204687ba59dde00c56c6be
Diffstat (limited to 'src/arch')
| -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; + } + }; }}; |