summaryrefslogtreecommitdiff
path: root/src/arch/x86/isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-11-10 21:12:53 -0800
committerGabe Black <gblack@eecs.umich.edu>2009-11-10 21:12:53 -0800
commit850eb54a7c3408b887a0f6663c021fd61f227204 (patch)
tree5412bd92b00a61c4e622819d9b823589b9c5e4a8 /src/arch/x86/isa
parentb8120f6c38f212acbfd246a3081842a9e3d06eb3 (diff)
parent2e28da5583814efe1e0a09718f6a674f983d12d1 (diff)
downloadgem5-850eb54a7c3408b887a0f6663c021fd61f227204.tar.xz
Merge with the head.
Diffstat (limited to 'src/arch/x86/isa')
-rw-r--r--src/arch/x86/isa/insts/general_purpose/data_transfer/move.py4
-rw-r--r--src/arch/x86/isa/microops/mediaop.isa2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py b/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py
index 7aee3fec1..51f5ad23b 100644
--- a/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py
+++ b/src/arch/x86/isa/insts/general_purpose/data_transfer/move.py
@@ -357,7 +357,7 @@ def macroop MOVNTI_P_R {
};
def macroop MOVD_XMM_R {
- mov2fp xmml, regm, srcSize=dsz, destSize=dsz
+ mov2fp xmml, regm, srcSize=dsz, destSize=8
lfpimm xmmh, 0
};
@@ -373,7 +373,7 @@ def macroop MOVD_XMM_P {
};
def macroop MOVD_R_XMM {
- mov2int reg, xmml, size=dsz
+ mov2int reg, xmmlm, size=dsz
};
def macroop MOVD_M_XMM {
diff --git a/src/arch/x86/isa/microops/mediaop.isa b/src/arch/x86/isa/microops/mediaop.isa
index 9c53fa0fb..fa32583b0 100644
--- a/src/arch/x86/isa/microops/mediaop.isa
+++ b/src/arch/x86/isa/microops/mediaop.isa
@@ -1237,7 +1237,7 @@ let {{
}
if (destSize == 4) {
- argBits = (uint32_t)(float)arg;
+ argBits = (uint32_t)arg;
} else {
argBits = (uint64_t)arg;
}