Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

1 files changed, 4 insertions, 8 deletions

diff --git a/loc2c.h b/loc2c.h
index 449d4499..becf2d85 100644
--- a/loc2c.h
+++ b/loc2c.h
@@ -12,7 +12,9 @@ struct location;		/* Opaque */
    as the starting location, begin from scratch if *INPUT is null.
    If DW_OP_fbreg is used, it may have a subfragment computing from
    the FB_ATTR location expression. The call_frame might need to be
-   calculated by the cfa_ops for the given pc_address.
+   calculated by the cfa_ops for the given pc_address. If known the
+   locattr provides the attribute from which the locexpr array was
+   retrieved.
 
    On errors, call FAIL, which should not return.  Any later errors will use
    FAIL and FAIL_ARG from the first c_translate_location call.
@@ -32,6 +34,7 @@ struct location *c_translate_location (struct obstack *,
 				       int indent,
 				       Dwarf_Addr bias,
 				       Dwarf_Addr pc_address,
+				       Dwarf_Attribute *attr,
 				       const Dwarf_Op *locexpr,
 				       size_t locexprlen,
 				       struct location **input,
@@ -87,13 +90,6 @@ c_translate_pointer_store (struct obstack *pool, int indent,
                            Dwarf_Die *typedie, struct location **input,
                            const char *rvalue);
 
-/* Translate a fragment to add an offset to the currently calculated
-   address of the input location. Used for struct fields. Only works
-   when location is already an actual base address. */
-void
-c_translate_add_offset (struct obstack *pool, int indent, const char *comment,
-			Dwarf_Sword off, struct location **input);
-
 /* Translate a C fragment for a direct argument VALUE.  On errors, call FAIL,
    which should not return.  Any later errors will use FAIL and FAIL_ARG from
    this translate call.  On success, return the fragment created. */