From 5cad2d3b056059758d44b4dd56abe37ca9c841a6 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 30 Mar 2009 17:23:42 -0400
Subject: PR9998: adapt tapset/i686/registers.stp to latest kernel

* buildrun.cxx (compile_pass): Add autoconf-x86-gs.c.
* tapset/i686/registers.stp (_stp_register_regs): Update offsets.
  (test_x86_gs): Auxiliary function.
* runtime/autoconf-x86-gs.c : New file.
* testsuite/systemtap.base/x86_gs.exp : New test case.
* testsuite/systemtap.base/x86_gs.stp : Ditto.
---
 tapset/i686/registers.stp | 50 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 18 deletions(-)

(limited to 'tapset/i686')

diff --git a/tapset/i686/registers.stp b/tapset/i686/registers.stp
index a6e5694e..997376dc 100644
--- a/tapset/i686/registers.stp
+++ b/tapset/i686/registers.stp
@@ -1,25 +1,39 @@
 global _reg_offsets, _stp_regs_registered, _sp_offset, _ss_offset
 
+function test_x86_gs:long() %{ /* pure */
+#ifdef STAPCONF_X86_GS
+	THIS->__retvalue = 1;
+#else
+	THIS->__retvalue = 0;
+#endif
+%}
+
 function _stp_register_regs() {
+
 	/* Same order as pt_regs */
-	_reg_offsets["ebx"] =  0	_reg_offsets["bx"] =  0
-	_reg_offsets["ecx"] =  4	_reg_offsets["cx"] =  4
-	_reg_offsets["edx"] =  8	_reg_offsets["dx"] =  8
-	_reg_offsets["esi"] = 12	_reg_offsets["si"] = 12
-	_reg_offsets["edi"] = 16	_reg_offsets["di"] = 16
-	_reg_offsets["ebp"] = 20	_reg_offsets["bp"] = 20
-	_reg_offsets["eax"] = 24	_reg_offsets["ax"] = 24
-	_reg_offsets["xds"] = 28	_reg_offsets["ds"] = 28
-	_reg_offsets["xes"] = 32	_reg_offsets["es"] = 32
-	_reg_offsets["xfs"] = 36	_reg_offsets["fs"] = 36
-	_reg_offsets["orig_eax"] = 40	_reg_offsets["orig_ax"] = 40
-	_reg_offsets["eip"] = 44	_reg_offsets["ip"] = 44
-	_reg_offsets["xcs"] = 48	_reg_offsets["cs"] = 48
-	_reg_offsets["eflags"] = 52	_reg_offsets["flags"] = 52
-	_reg_offsets["esp"] = 56	_reg_offsets["sp"] = 56
-	_reg_offsets["xss"] = 60	_reg_offsets["ss"] = 60
-	_sp_offset = 56
-	_ss_offset = 60
+	_reg_offsets["ebx"] =  0		_reg_offsets["bx"] =  0
+	_reg_offsets["ecx"] =  4		_reg_offsets["cx"] =  4
+	_reg_offsets["edx"] =  8		_reg_offsets["dx"] =  8
+	_reg_offsets["esi"] = 12		_reg_offsets["si"] = 12
+	_reg_offsets["edi"] = 16		_reg_offsets["di"] = 16
+	_reg_offsets["ebp"] = 20		_reg_offsets["bp"] = 20
+	_reg_offsets["eax"] = 24		_reg_offsets["ax"] = 24
+	_reg_offsets["xds"] = 28		_reg_offsets["ds"] = 28
+	_reg_offsets["xes"] = 32		_reg_offsets["es"] = 32
+	_reg_offsets["xfs"] = 36		_reg_offsets["fs"] = 36
+	gs_incr = 0
+if (test_x86_gs()) {
+	gs_incr = 4
+	_reg_offsets["xgs"] = 40		_reg_offsets["gs"] = 40
+}
+	_reg_offsets["orig_eax"] = 40 + gs_incr	_reg_offsets["orig_ax"] = 40 + gs_incr
+	_reg_offsets["eip"] = 44 + gs_incr	_reg_offsets["ip"] = 44 + gs_incr
+	_reg_offsets["xcs"] = 48 + gs_incr	_reg_offsets["cs"] = 48 + gs_incr
+	_reg_offsets["eflags"] = 52 + gs_incr	_reg_offsets["flags"] = 52 + gs_incr
+	_reg_offsets["esp"] = 56 + gs_incr	_reg_offsets["sp"] = 56 + gs_incr
+	_reg_offsets["xss"] = 60 + gs_incr	_reg_offsets["ss"] = 60 + gs_incr
+	_sp_offset = 56 + gs_incr
+	_ss_offset = 60 + gs_incr
 
 	_stp_regs_registered = 1
 }
-- 
cgit 


From ae65abfb3d6c807f63adb11c060b1ca56b779c02 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 1 Apr 2009 17:20:05 -0400
Subject: PR10020 sys_sigaltstack param change

The new code uses a %( kernel_v < "2.6.29" %) conditional to look at
the passed pt_regs instead of named *bx parameters.  A more general
solution will be needed at some point.
---
 tapset/i686/syscalls.stp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tapset/i686')

diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index 8e69f622..2a89c19d 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -119,7 +119,7 @@ probe syscall.set_zone_reclaim.return =
 #
 probe syscall.sigaltstack = kernel.function("sys_sigaltstack") {
 	name = "sigaltstack"
-	ussp = %( kernel_vr < "2.6.25" %? $ebx %: $bx %)
+	ussp = %( kernel_vr < "2.6.25" %? $ebx %: %( kernel_vr < "2.6.29" %? $bx %: $regs->bx %) %)
 	argstr = sprintf("%p", ussp)
 }
 probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
-- 
cgit