From: Gabe Black <gblack@eecs.umich.edu> Date: Fri, 6 Apr 2007 15:16:36 +0000 (+0000) Subject: Add in a stub merging function X-Git-Tag: m5_2.0_beta3~49^2~3 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e633e23a3ab32dda963746bea43147d54599c01c;p=gem5.git Add in a stub merging function --HG-- extra : convert_revision : 15e3cdb4ebcd31bc44204687ba59dde00c56c6be --- 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; + } + }; }};