2 files changed, 10 insertions, 4 deletions
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 504e9ab0a..f4f856974 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
@@ -61,8 +61,9 @@ def macroop CALL_NEAR_I
 
     limm t1, imm
     rdip t7
+    # Check target of call
+    st t7, ss, [0, t0, rsp], "-env.dataSize"
     subi rsp, rsp, dsz
-    st t7, ss, [0, t0, rsp]
     wrip t7, t1
 };
 
@@ -72,8 +73,9 @@ def macroop CALL_NEAR_R
     .adjust_env oszIn64Override
 
     rdip t1
+    # Check target of call
+    st t1, ss, [0, t0, rsp], "-env.dataSize"
     subi rsp, rsp, dsz
-    st t1, ss, [0, t0, rsp]
     wripi reg, 0
 };
 
@@ -84,8 +86,9 @@ def macroop CALL_NEAR_M
 
     rdip t7
     ld t1, seg, sib, disp
+    # Check target of call
+    st t7, ss, [0, t0, rsp], "-env.dataSize"
     subi rsp, rsp, dsz
-    st t7, ss, [0, t0, rsp]
     wripi t1, 0
 };
 
@@ -96,8 +99,9 @@ def macroop CALL_NEAR_P
 
     rdip t7
     ld t1, seg, riprel, disp
+    # Check target of call
+    st t7, ss, [0, t0, rsp], "-env.dataSize"
     subi rsp, rsp, dsz
-    st t7, ss, [0, t0, rsp]
     wripi t1, 0
 };
 '''
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 1efddf1d2..8993f5ac4 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
@@ -60,6 +60,7 @@ def macroop RET_NEAR
     .adjust_env oszIn64Override
 
     ld t1, ss, [1, t0, rsp]
+    # Check address of return
     addi rsp, rsp, dsz
     wripi t1, 0
 };
@@ -71,6 +72,7 @@ def macroop RET_NEAR_I
 
     limm t2, imm
     ld t1, ss, [1, t0, rsp]
+    # Check address of return
     addi rsp, rsp, dsz
     add rsp, rsp, t2
     wripi t1, 0