This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Use libunwind cursor to get at CFA.
- From: mark at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 3 Dec 2007 10:59:46 -0000
- Subject: [SCM] master: Use libunwind cursor to get at CFA.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 5dbdfcd15da720f823e0e6f5065b5165e9d83fd5 (commit)
via 907f99d9aef2ae1774e699e30a6ee1aaaf468d13 (commit)
via 9364da606530820347ff611348231a798eaa2183 (commit)
from a4b70c53de603ba83d69ce0b6594597dbbb2bddf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 5dbdfcd15da720f823e0e6f5065b5165e9d83fd5
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Sun Dec 2 14:35:41 2007 +0100
Use libunwind cursor to get at CFA.
frysk-core/frysk/stack/ChangeLog
2007-12-03 Mark Wielaard <mwielaard@redhat.com>
* LibunwindFrame.java (getFrameIdentifier): Get CFA from cursor.
frysk-sys/lib/unwind/ChangeLog
2007-12-03 Mark Wielaard <mwielaard@redhat.com>
* Cursor.java (getCFA): New method.
* Unwind.java (getCFA): Likewise.
* cni/UnwindH.hxx (getCFA): Likewise.
commit 907f99d9aef2ae1774e699e30a6ee1aaaf468d13
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Sat Dec 1 22:52:32 2007 +0100
Cleanup unused libunwind callbacks.
frysk-core/frysk/stack/ChangeLog
2007-11-30 Mark Wielaard <mwielaard@redhat.com>
* LibunwindAddressSpace.java (getDynInfoListAddr): Removed.
(resume): Likewise.
frysk-sys/lib/unwind/ChangeLog
2007-11-30 Mark Wielaard <mwielaard@redhat.com>
* AddressSpace.java (getDynInfoListAddr): Removed.
(resume): Likewise.
* cni/UnwindH.hxx (get_dyn_info_list_addr): Return -UNW_ENOINFO.
(resume): return -UNW_EINVAL.
commit 9364da606530820347ff611348231a798eaa2183
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Sat Dec 1 21:26:49 2007 +0100
Don't use libunwind ProcInfo, but normal Symbol lookup for stack.
frysk-core/frysk/stack/ChangeLog
2007-11-30 Mark Wielaard <mwielaard@redhat.com>
* LibunwindFrame (getProcInfo): Removed.
(getFrameIdentifier): Use Symbol.getAddress(), not ProcInfo.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/stack/ChangeLog | 14 ++++++++
frysk-core/frysk/stack/LibunwindAddressSpace.java | 13 -------
frysk-core/frysk/stack/LibunwindFrame.java | 24 +++----------
frysk-sys/lib/unwind/AddressSpace.java | 4 --
frysk-sys/lib/unwind/ChangeLog | 13 +++++++
frysk-sys/lib/unwind/Cursor.java | 4 ++
frysk-sys/lib/unwind/Unwind.java | 1 +
frysk-sys/lib/unwind/cni/UnwindH.hxx | 38 +++++++++++++++++----
8 files changed, 69 insertions(+), 42 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/stack/ChangeLog b/frysk-core/frysk/stack/ChangeLog
index 15ce0a1..2755651 100644
--- a/frysk-core/frysk/stack/ChangeLog
+++ b/frysk-core/frysk/stack/ChangeLog
@@ -1,3 +1,17 @@
+2007-12-03 Mark Wielaard <mwielaard@redhat.com>
+
+ * LibunwindFrame.java (getFrameIdentifier): Get CFA from cursor.
+
+2007-11-30 Mark Wielaard <mwielaard@redhat.com>
+
+ * LibunwindAddressSpace.java (getDynInfoListAddr): Removed.
+ (resume): Likewise.
+
+2007-11-30 Mark Wielaard <mwielaard@redhat.com>
+
+ * LibunwindFrame.java (getProcInfo): Removed.
+ (getFrameIdentifier): Use Symbol.getAddress(), not ProcInfo.
+
2007-11-29 Andrew Cagney <cagney@redhat.com>
* TestRegs.java (testFloatRegisters())
diff --git a/frysk-core/frysk/stack/LibunwindAddressSpace.java b/frysk-core/frysk/stack/LibunwindAddressSpace.java
index 0027b0c..5369fd5 100644
--- a/frysk-core/frysk/stack/LibunwindAddressSpace.java
+++ b/frysk-core/frysk/stack/LibunwindAddressSpace.java
@@ -49,12 +49,10 @@ import frysk.dwfl.DwflFactory;
import frysk.isa.ISA;
import frysk.proc.MemoryMap;
import frysk.proc.Task;
-import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
import lib.unwind.AddressSpace;
import lib.unwind.ByteOrder;
-import lib.unwind.Cursor;
import lib.unwind.ElfImage;
import lib.unwind.ProcInfo;
import frysk.isa.RegisterMap;
@@ -138,22 +136,11 @@ class LibunwindAddressSpace extends AddressSpace {
return procInfo;
}
- public int getDynInfoListAddr (byte[] dilap) {
- //XXX: Todo.
- Arrays.fill(dilap, (byte) 0);
- return - lib.unwind.Error.UNW_ENOINFO_;
- }
-
public void putUnwindInfo (final ProcInfo procInfo) {
// No longer need to hold procInfo.
this.procInfo = null;
}
- public int resume (final Cursor cursor) {
- //XXX: Todo.
- return - lib.unwind.Error.UNW_EUNSPEC_;
- }
-
private ElfImage getElfImage (long addr) {
logger.log(Level.FINE, "{0} Entering getElfImage, addr: 0x{1}\n",
new Object [] {this, Long.toHexString(addr)} );
diff --git a/frysk-core/frysk/stack/LibunwindFrame.java b/frysk-core/frysk/stack/LibunwindFrame.java
index 64e9c28..6d8f09e 100644
--- a/frysk-core/frysk/stack/LibunwindFrame.java
+++ b/frysk-core/frysk/stack/LibunwindFrame.java
@@ -43,7 +43,6 @@ import java.util.logging.Level;
import frysk.isa.Register;
import java.util.logging.Logger;
import lib.unwind.Cursor;
-import lib.unwind.ProcInfo;
import frysk.isa.ISA;
import frysk.proc.Task;
import frysk.symtab.Symbol;
@@ -81,13 +80,6 @@ class LibunwindFrame extends Frame
}
/**
- * Returns the ProcInfo object for this Frame.
- */
- public ProcInfo getProcInfo () {
- return cursor.getProcInfo();
- }
-
- /**
* Returns the current program counter of this Frame.
*/
public long getAddress() {
@@ -140,19 +132,15 @@ class LibunwindFrame extends Frame
/**
* Return this frame's FrameIdentifier.
+ * The frame identifier is the combination of the current
+ * symbols (function) start address and the call frame address
+ * of the cursor (frame).
*/
public FrameIdentifier getFrameIdentifier () {
if (frameIdentifier == null) {
- ProcInfo myInfo = getProcInfo();
- long cfa = 0;
- Frame outer = getOuter();
- if (outer != null)
- // The previous frame's SP makes for a good CFA for
- // this frame. It's a value that needs to be constant
- // through out the life-time of this frame, and hence
- // this frame's SP (which changes) is no good.
- cfa = ((LibunwindFrame)outer).cursor.getSP();
- frameIdentifier = new FrameIdentifier(myInfo.getStartIP(), cfa);
+ long functionAddress = getSymbol().getAddress();
+ long cfa = cursor.getCFA();
+ frameIdentifier = new FrameIdentifier(functionAddress, cfa);
}
return this.frameIdentifier;
}
diff --git a/frysk-sys/lib/unwind/AddressSpace.java b/frysk-sys/lib/unwind/AddressSpace.java
index fafd777..1fdeff3 100644
--- a/frysk-sys/lib/unwind/AddressSpace.java
+++ b/frysk-sys/lib/unwind/AddressSpace.java
@@ -88,8 +88,6 @@ public abstract class AddressSpace
*/
public abstract void putUnwindInfo (ProcInfo procInfo);
- public abstract int getDynInfoListAddr (byte[] dilap);
-
public abstract int accessMem (long addr, byte[] valp, boolean write);
/**
@@ -107,6 +105,4 @@ public abstract class AddressSpace
* Access LIBUNWIND Register REGNUM.
*/
public abstract int accessReg(Number regnum, byte[] val, boolean write);
-
- public abstract int resume (Cursor cursor);
}
diff --git a/frysk-sys/lib/unwind/ChangeLog b/frysk-sys/lib/unwind/ChangeLog
index 3ec704a..8ade7ea 100644
--- a/frysk-sys/lib/unwind/ChangeLog
+++ b/frysk-sys/lib/unwind/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-03 Mark Wielaard <mwielaard@redhat.com>
+
+ * Cursor.java (getCFA): New method.
+ * Unwind.java (getCFA): Likewise.
+ * cni/UnwindH.hxx (getCFA): Likewise.
+
+2007-11-30 Mark Wielaard <mwielaard@redhat.com>
+
+ * AddressSpace.java (getDynInfoListAddr): Removed.
+ (resume): Likewise.
+ * cni/UnwindH.hxx (get_dyn_info_list_addr): Return -UNW_ENOINFO.
+ (resume): return -UNW_EINVAL.
+
2007-11-29 Andrew Cagney <cagney@redhat.com>
* AddressSpace.java (getReg(Number)): Replace getReg(int).
diff --git a/frysk-sys/lib/unwind/Cursor.java b/frysk-sys/lib/unwind/Cursor.java
index f12156d..2192322 100644
--- a/frysk-sys/lib/unwind/Cursor.java
+++ b/frysk-sys/lib/unwind/Cursor.java
@@ -87,6 +87,10 @@ public class Cursor
return unwinder.getSP(cursor);
}
+ public long getCFA() {
+ return unwinder.getCFA(cursor);
+ }
+
public int step() {
return unwinder.step(cursor);
}
diff --git a/frysk-sys/lib/unwind/Unwind.java b/frysk-sys/lib/unwind/Unwind.java
index 27bfaa3..8c8cdfd 100644
--- a/frysk-sys/lib/unwind/Unwind.java
+++ b/frysk-sys/lib/unwind/Unwind.java
@@ -70,6 +70,7 @@ public abstract class Unwind
public abstract long getIP(RawDataManaged cursor);
public abstract long getSP(RawDataManaged cursor);
+ public abstract long getCFA(RawDataManaged cursor);
abstract RawDataManaged copyCursor(RawDataManaged cursor);
abstract int getContext(RawDataManaged context);
diff --git a/frysk-sys/lib/unwind/cni/UnwindH.hxx b/frysk-sys/lib/unwind/cni/UnwindH.hxx
index 2580365..4b59aa5 100644
--- a/frysk-sys/lib/unwind/cni/UnwindH.hxx
+++ b/frysk-sys/lib/unwind/cni/UnwindH.hxx
@@ -119,16 +119,13 @@ put_unwind_info (::unw_addr_space_t as, ::unw_proc_info_t *proc_info,
/*
* Get the head of the dynamic unwind registration list.
+ * There is never any dynamic info in our case.
*/
static int
get_dyn_info_list_addr (::unw_addr_space_t as, ::unw_word_t *dilap,
void *arg)
{
- jbyteArray tmp = JvNewByteArray(sizeof (unw_word_t));
- memcpy (elements(tmp), dilap, sizeof (unw_word_t));
- int ret = addressSpace(arg)->getDynInfoListAddr (tmp);
- memcpy(dilap, elements(tmp), sizeof (unw_word_t));
- return ret;
+ return -UNW_ENOINFO;
}
/*
@@ -181,12 +178,13 @@ access_fpreg(::unw_addr_space_t as, ::unw_regnum_t regnum,
}
/*
- * Resumes the process at the provided stack level
+ * Resumes the process at the provided stack level.
+ * We never resume a process through libunwind.
*/
static int
resume(::unw_addr_space_t as, ::unw_cursor_t *cp, void *arg)
{
- return (int) addressSpace(arg)->resume ((lib::unwind::Cursor *) cp);
+ return -UNW_EINVAL;
}
/*
@@ -368,6 +366,32 @@ lib::unwind::TARGET::getIP(gnu::gcj::RawDataManaged* cursor)
return ip;
}
+jlong
+lib::unwind::TARGET::getCFA(gnu::gcj::RawDataManaged* cursor)
+{
+#ifdef UNW_TARGET_X86
+#define FRYSK_UNW_REG_CFA UNW_X86_CFA
+#else
+#ifdef UNW_TARGET_X86_64
+#define FRYSK_UNW_REG_CFA UNW_X86_64_CFA
+#else
+// This is wasteful, but there is no generic UNW_REG_CFA.
+// So just unwind and return the stack pointer.
+#define FRYSK_UNW_REG_CFA UNW_REG_SP
+cursor = copyCursor (cursor);
+if (unw_step((unw_cursor_t *) cursor) < 0)
+ return 0;
+#endif
+#endif
+
+ unw_word_t cfa;
+ int status = unw_get_reg((::unw_cursor_t *) cursor, FRYSK_UNW_REG_CFA, &cfa);
+ if (status < 0)
+ return 0; // bottom of stack.
+ else
+ return cfa;
+}
+
jint
lib::unwind::TARGET::getContext(gnu::gcj::RawDataManaged* context)
hooks/post-receive
--
frysk system monitor/debugger