summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2008-01-12 06:37:35 -0500
committerGabe Black <gblack@eecs.umich.edu>2008-01-12 06:37:35 -0500
commit0e394fdfa43ea3b50691402e1345e27ad6d011da (patch)
tree811a9b03778270b4c7c16b248260704d772be47f
parentf9c54d5a4b31b19809d75390a37c80cf6a15b428 (diff)
downloadgem5-0e394fdfa43ea3b50691402e1345e27ad6d011da.tar.xz
X86: Fix the general IO instructions dataSize.
--HG-- extra : convert_revision : 9774a52cb6a8e7632d1b1dc0706e5791cc18d238
-rw-r--r--src/arch/x86/isa/insts/general_purpose/input_output/general_io.py40
1 files changed, 34 insertions, 6 deletions
diff --git a/src/arch/x86/isa/insts/general_purpose/input_output/general_io.py b/src/arch/x86/isa/insts/general_purpose/input_output/general_io.py
index 75a361eb7..1986a322e 100644
--- a/src/arch/x86/isa/insts/general_purpose/input_output/general_io.py
+++ b/src/arch/x86/isa/insts/general_purpose/input_output/general_io.py
@@ -1,4 +1,32 @@
-# Copyright (c) 2007 The Hewlett-Packard Development Company
+# Copyright (c) 2008 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Gabe Black
+
+# Copyright (c) 2007-2008 The Hewlett-Packard Development Company
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms,
@@ -56,24 +84,24 @@
microcode = '''
def macroop IN_R_I {
.adjust_imm trimImm(8)
- limm t1, "IntAddrPrefixIO"
- ld reg, intseg, [1, t1, t0], imm, addressSize=2
+ limm t1, "IntAddrPrefixIO", dataSize=8
+ ld reg, intseg, [1, t1, t0], imm, addressSize=8
};
def macroop IN_R_R {
- limm t1, "IntAddrPrefixIO"
+ limm t1, "IntAddrPrefixIO", dataSize=8
zexti t2, regm, 15, dataSize=2
ld reg, intseg, [1, t1, t2], addressSize=8
};
def macroop OUT_I_R {
.adjust_imm trimImm(8)
- limm t1, "IntAddrPrefixIO"
+ limm t1, "IntAddrPrefixIO", dataSize=8
st reg, intseg, [1, t1, t0], imm, addressSize=8
};
def macroop OUT_R_R {
- limm t1, "IntAddrPrefixIO"
+ limm t1, "IntAddrPrefixIO", dataSize=8
zexti t2, reg, 15, dataSize=2
st regm, intseg, [1, t1, t2], addressSize=8
};