changeset 2f1a0f6d5d77 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=2f1a0f6d5d77
description:
x86: implements x87 mult/div instructions
diffstat:
src/arch/x86/isa/decoder/x87.isa | 23 ++++--
src/arch/x86/isa/insts/x87/arithmetic/division.py | 59 ++++++++++++++++-
src/arch/x86/isa/insts/x87/arithmetic/multiplication.py | 59 ++++++++++++++++-
3 files changed, 130 insertions(+), 11 deletions(-)
diffs (207 lines):
diff -r 631e736554c9 -r 2f1a0f6d5d77 src/arch/x86/isa/decoder/x87.isa
--- a/src/arch/x86/isa/decoder/x87.isa Mon Apr 13 17:33:57 2015 -0500
+++ b/src/arch/x86/isa/decoder/x87.isa Mon Apr 13 17:33:57 2015 -0500
@@ -45,7 +45,10 @@
// 32-bit memory operand
default: Inst::FADD1(Md);
}
- 0x1: fmul();
+ 0x1: decode MODRM_MOD {
+ 0x3: Inst::FMUL1(Eq);
+ default: Inst::FMUL1(Md);
+ }
0x2: fcom();
0x3: fcomp();
0x4: decode MODRM_MOD {
@@ -53,7 +56,10 @@
default: Inst::FSUB1(Md);
}
0x5: fsubr();
- 0x6: fdiv();
+ 0x6: decode MODRM_MOD {
+ 0x3: Inst::FDIV1(Eq);
+ default: Inst::FDIV1(Md);
+ }
0x7: fdivr();
}
0x1: decode MODRM_REG {
@@ -210,7 +216,10 @@
0x3: Inst::FADD2(Eq);
default: Inst::FADD2(Mq);
}
- 0x1: fmul();
+ 0x1: decode MODRM_MOD {
+ 0x3: Inst::FMUL2(Eq);
+ default: Inst::FMUL2(Mq);
+ }
0x2: decode MODRM_MOD {
0x3: Inst::UD2();
default: fcom();
@@ -229,10 +238,10 @@
}
0x6: decode MODRM_MOD {
0x3: fdivr();
- default: fdiv();
+ default: Inst::FDIV2(Mq);
}
0x7: decode MODRM_MOD {
- 0x3: fdiv();
+ 0x3: Inst::FDIV2(Eq);
default: fdivr();
}
}
@@ -282,7 +291,7 @@
default: fiadd();
}
0x1: decode MODRM_MOD {
- 0x3: fmulp();
+ 0x3: Inst::FMULP(Eq);
default: fimul();
}
0x2: decode MODRM_MOD {
@@ -312,7 +321,7 @@
default: fidiv();
}
0x7: decode MODRM_MOD {
- 0x3: fdivp();
+ 0x3: Inst::FDIVP(Eq);
default: fidivr();
}
}
diff -r 631e736554c9 -r 2f1a0f6d5d77
src/arch/x86/isa/insts/x87/arithmetic/division.py
--- a/src/arch/x86/isa/insts/x87/arithmetic/division.py Mon Apr 13 17:33:57
2015 -0500
+++ b/src/arch/x86/isa/insts/x87/arithmetic/division.py Mon Apr 13 17:33:57
2015 -0500
@@ -36,8 +36,63 @@
# Authors: Gabe Black
microcode = '''
-# FDIV
-# FDIVP
+def macroop FDIV1_R
+{
+ divfp st(0), st(0), sti
+};
+
+
+def macroop FDIV1_M
+{
+ ldfp87 ufp1, seg, sib, disp
+ divfp st(0), st(0), ufp1
+};
+
+def macroop FDIV1_P
+{
+ rdip t7
+ ldfp87 ufp1, seg, riprel, disp
+ divfp st(0), st(0), ufp1
+};
+
+def macroop FDIV2_R
+{
+ divfp sti, sti, st(0)
+};
+
+def macroop FDIV2_M
+{
+ ldfp87 ufp1, seg, sib, disp
+ divfp st(0), st(0), ufp1
+};
+
+def macroop FDIV2_P
+{
+ rdip t7
+ ldfp87 ufp1, seg, riprel, disp
+ divfp st(0), st(0), ufp1
+};
+
+def macroop FDIVP
+{
+ divfp st(1), st(1), st(0), spm=1
+};
+
+def macroop FDIVP_R
+{
+ divfp sti, sti, st(0), spm=1
+};
+
+def macroop FDIVP_M
+{
+ fault "std::make_shared<UnimpInstFault>()"
+};
+
+def macroop FDIVP_P
+{
+ fault "std::make_shared<UnimpInstFault>()"
+};
+
# FIDIV
# FDIVR
# FDIVRP
diff -r 631e736554c9 -r 2f1a0f6d5d77
src/arch/x86/isa/insts/x87/arithmetic/multiplication.py
--- a/src/arch/x86/isa/insts/x87/arithmetic/multiplication.py Mon Apr 13
17:33:57 2015 -0500
+++ b/src/arch/x86/isa/insts/x87/arithmetic/multiplication.py Mon Apr 13
17:33:57 2015 -0500
@@ -36,7 +36,62 @@
# Authors: Gabe Black
microcode = '''
-# FMUL
-# FMULP
+def macroop FMUL1_R
+{
+ mulfp st(0), sti, st(0)
+};
+
+
+def macroop FMUL1_M
+{
+ ldfp87 ufp1, seg, sib, disp
+ mulfp st(0), st(0), ufp1
+};
+
+def macroop FMUL1_P
+{
+ rdip t7
+ ldfp87 ufp1, seg, riprel, disp
+ mulfp st(0), st(0), ufp1
+};
+
+def macroop FMUL2_R
+{
+ mulfp sti, sti, st(0)
+};
+
+def macroop FMUL2_M
+{
+ ldfp87 ufp1, seg, sib, disp
+ mulfp st(0), st(0), ufp1
+};
+
+def macroop FMUL2_P
+{
+ rdip t7
+ ldfp87 ufp1, seg, riprel, disp
+ mulfp st(0), st(0), ufp1
+};
+
+def macroop FMULP
+{
+ mulfp st(1), st(0), st(1), spm=1
+};
+
+def macroop FMULP_R
+{
+ mulfp sti, sti, st(0), spm=1
+};
+
+def macroop FMULP_M
+{
+ fault "std::make_shared<UnimpInstFault>()"
+};
+
+def macroop FMULP_P
+{
+ fault "std::make_shared<UnimpInstFault>()"
+};
+
# FIMUL
'''
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
