From 9498e536c0231b808669f2bacb4c0628d1ec309a Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 12 Oct 2007 16:37:55 -0700
Subject: X86: Implement MSR reads and writes and the wrsmr and rdmsr
 instructions. There are no priviledge checks, so these instructions will all
 work in all modes.

--HG--
extra : convert_revision : ff893eb569313d8aecbfffb47bcbd1c2d65cd393
---
 src/arch/x86/isa/microops/ldstop.isa | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/arch/x86/isa/microops')

diff --git a/src/arch/x86/isa/microops/ldstop.isa b/src/arch/x86/isa/microops/ldstop.isa
index 106a8a0fe..32fefb5fa 100644
--- a/src/arch/x86/isa/microops/ldstop.isa
+++ b/src/arch/x86/isa/microops/ldstop.isa
@@ -325,13 +325,13 @@ def template MicroLdStOpConstructor {{
 
 let {{
     class LdStOp(X86Microop):
-        def __init__(self, data, segment, addr, disp, dataSize):
+        def __init__(self, data, segment, addr, disp, dataSize, addressSize):
             self.data = data
             [self.scale, self.index, self.base] = addr
             self.disp = disp
             self.segment = segment
             self.dataSize = dataSize
-            self.addressSize = "env.addressSize"
+            self.addressSize = addressSize
 
         def getAllocator(self, *microFlags):
             allocator = '''new %(class_name)s(machInst, mnemonic
@@ -378,10 +378,10 @@ let {{
         exec_output += MicroLoadCompleteAcc.subst(iop)
 
         class LoadOp(LdStOp):
-            def __init__(self, data, segment, addr,
-                    disp = 0, dataSize="env.dataSize"):
+            def __init__(self, data, segment, addr, disp = 0,
+                    dataSize="env.dataSize", addressSize="env.addressSize"):
                 super(LoadOp, self).__init__(data, segment,
-                        addr, disp, dataSize)
+                        addr, disp, dataSize, addressSize)
                 self.className = Name
                 self.mnemonic = name
 
@@ -411,10 +411,10 @@ let {{
         exec_output += MicroStoreCompleteAcc.subst(iop)
 
         class StoreOp(LdStOp):
-            def __init__(self, data, segment, addr,
-                    disp = 0, dataSize="env.dataSize"):
+            def __init__(self, data, segment, addr, disp = 0,
+                    dataSize="env.dataSize", addressSize="env.addressSize"):
                 super(StoreOp, self).__init__(data, segment,
-                        addr, disp, dataSize)
+                        addr, disp, dataSize, addressSize)
                 self.className = Name
                 self.mnemonic = name
 
@@ -432,10 +432,10 @@ let {{
     exec_output += MicroLeaExecute.subst(iop)
 
     class LeaOp(LdStOp):
-        def __init__(self, data, segment, addr,
-                disp = 0, dataSize="env.dataSize"):
+        def __init__(self, data, segment, addr, disp = 0,
+                dataSize="env.dataSize", addressSize="env.addressSize"):
             super(LeaOp, self).__init__(data, segment,
-                    addr, disp, dataSize)
+                    addr, disp, dataSize, addressSize)
             self.className = "Lea"
             self.mnemonic = "lea"
 
-- 
cgit v1.2.3