From e633e23a3ab32dda963746bea43147d54599c01c Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 6 Apr 2007 15:16:36 +0000
Subject: [PATCH] Add in a stub merging function

--HG--
extra : convert_revision : 15e3cdb4ebcd31bc44204687ba59dde00c56c6be
---
 src/arch/x86/isa/base.isa | 7 +++++++
 1 file changed, 7 insertions(+)

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;
+            }
+
         };
 }};