From 30fe807316ebc4b6c37ca522b3cfd6c592ca9003 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Tue, 21 May 2013 11:34:41 -0500
Subject: x86: mark instructions for being function call/return Currently call
 and return instructions are marked as IsCall and IsReturn. Thus, the branch
 predictor does not use RAS for these instructions. Similarly, the number of
 function calls that took place is recorded as 0. This patch marks these
 instructions as they should be.

---
 src/arch/x86/isa/insts/general_purpose/control_transfer/call.py  | 4 ++++
 .../x86/isa/insts/general_purpose/control_transfer/xreturn.py    | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/arch/x86/isa/insts/general_purpose/control_transfer')

diff --git a/src/arch/x86/isa/insts/general_purpose/control_transfer/call.py b/src/arch/x86/isa/insts/general_purpose/control_transfer/call.py
index f18a062a6..eaaa18208 100644
--- a/src/arch/x86/isa/insts/general_purpose/control_transfer/call.py
+++ b/src/arch/x86/isa/insts/general_purpose/control_transfer/call.py
@@ -40,6 +40,7 @@ def macroop CALL_NEAR_I
 {
     # Make the default data size of calls 64 bits in 64 bit mode
     .adjust_env oszIn64Override
+    .function_call
 
     limm t1, imm
     rdip t7
@@ -53,6 +54,7 @@ def macroop CALL_NEAR_R
 {
     # Make the default data size of calls 64 bits in 64 bit mode
     .adjust_env oszIn64Override
+    .function_call
 
     rdip t1
     # Check target of call
@@ -65,6 +67,7 @@ def macroop CALL_NEAR_M
 {
     # Make the default data size of calls 64 bits in 64 bit mode
     .adjust_env oszIn64Override
+    .function_call
 
     rdip t7
     ld t1, seg, sib, disp
@@ -78,6 +81,7 @@ def macroop CALL_NEAR_P
 {
     # Make the default data size of calls 64 bits in 64 bit mode
     .adjust_env oszIn64Override
+    .function_call
 
     rdip t7
     ld t1, seg, riprel, disp
diff --git a/src/arch/x86/isa/insts/general_purpose/control_transfer/xreturn.py b/src/arch/x86/isa/insts/general_purpose/control_transfer/xreturn.py
index 7ebe22e78..f24b9d70e 100644
--- a/src/arch/x86/isa/insts/general_purpose/control_transfer/xreturn.py
+++ b/src/arch/x86/isa/insts/general_purpose/control_transfer/xreturn.py
@@ -40,6 +40,7 @@ def macroop RET_NEAR
 {
     # Make the default data size of rets 64 bits in 64 bit mode
     .adjust_env oszIn64Override
+    .function_return
 
     ld t1, ss, [1, t0, rsp]
     # Check address of return
@@ -51,6 +52,7 @@ def macroop RET_NEAR_I
 {
     # Make the default data size of rets 64 bits in 64 bit mode
     .adjust_env oszIn64Override
+    .function_return
 
     limm t2, imm
     ld t1, ss, [1, t0, rsp]
@@ -62,6 +64,7 @@ def macroop RET_NEAR_I
 
 def macroop RET_FAR {
     .adjust_env oszIn64Override
+    .function_return
 
     # Get the return RIP
     ld t1, ss, [1, t0, rsp]
@@ -99,10 +102,10 @@ processDescriptor:
     wrdl cs, t3, t2
     wrsel cs, t2
     wrip t0, t1
-    br label("end")
+#    br label("end")
 
     # Do other stuff if they're not.
-end:
-    fault "NoFault"
+#end:
+#    fault "NoFault"
 };
 '''
-- 
cgit v1.2.3