From 8a1eb7e8bec41d41daf3e35b30a11e04f6285f66 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 27 Feb 2009 09:25:16 -0800
Subject: [PATCH] X86: Take address size into account when computing an
 effective address.

---
 src/arch/x86/isa/microops/ldstop.isa | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/arch/x86/isa/microops/ldstop.isa b/src/arch/x86/isa/microops/ldstop.isa
index 834b3947f..af94cf31e 100644
--- a/src/arch/x86/isa/microops/ldstop.isa
+++ b/src/arch/x86/isa/microops/ldstop.isa
@@ -402,7 +402,9 @@ let {{
     decoder_output = ""
     exec_output = ""
 
-    calculateEA = "EA = SegBase + scale * Index + Base + disp;"
+    calculateEA = '''
+    EA = bits(SegBase + scale * Index + Base + disp, addressSize * 8 - 1, 0);
+    '''
 
     def defineMicroLoadOp(mnemonic, code, mem_flags="0"):
         global header_output