X86: Implement and hook up STI and CLI instructions.

1 files changed, 15 insertions, 7 deletions

diff --git a/src/arch/x86/isa/insts/general_purpose/flags/set_and_clear.py b/src/arch/x86/isa/insts/general_purpose/flags/set_and_clear.py
index 4c655e0b2..e151dc61d 100644
--- a/src/arch/x86/isa/insts/general_purpose/flags/set_and_clear.py
+++ b/src/arch/x86/isa/insts/general_purpose/flags/set_and_clear.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2007 The Hewlett-Packard Development Company
+# Copyright (c) 2007-2008 The Hewlett-Packard Development Company
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
@@ -84,10 +84,18 @@ def macroop CMC {
     ruflags t1
     wruflagsi t1, "CFBit"
 };
+
+def macroop STI {
+    rflags t1
+    limm t2, "IFBit"
+    or t1, t1, t2
+    wrflags t1, t0
+};
+
+def macroop CLI {
+    rflags t1
+    limm t2, "~IFBit"
+    and t1, t1, t2
+    wrflags t1, t0
+};
 '''
-#let {{
-#    class CLI(Inst):
-#	"GenFault ${new UnimpInstFault}"
-#    class STI(Inst):
-#	"GenFault ${new UnimpInstFault}"
-#}};