You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
83 lines
4.4 KiB
83 lines
4.4 KiB
6 years ago
|
Index: gdb-7.5.50.20130118/gdb/gdbtypes.h
|
||
|
|
===================================================================
|
||
|
|
--- gdb-7.5.50.20130118.orig/gdb/gdbtypes.h 2013-01-18 23:07:03.488358315 +0100
|
||
|
|
+++ gdb-7.5.50.20130118/gdb/gdbtypes.h 2013-01-18 23:08:10.286451570 +0100
|
||
|
|
@@ -420,6 +420,7 @@ enum field_loc_kind
|
||
|
|
{
|
||
|
|
FIELD_LOC_KIND_BITPOS, /* bitpos */
|
||
|
|
FIELD_LOC_KIND_ENUMVAL, /* enumval */
|
||
|
|
+ /* This address is unrelocated by the objfile's ANOFFSET. */
|
||
|
|
FIELD_LOC_KIND_PHYSADDR, /* physaddr */
|
||
|
|
FIELD_LOC_KIND_PHYSNAME, /* physname */
|
||
|
|
FIELD_LOC_KIND_DWARF_BLOCK /* dwarf_block */
|
||
|
|
@@ -614,6 +615,7 @@ struct main_type
|
||
|
|
is the location (in the target) of the static field.
|
||
|
|
Otherwise, physname is the mangled label of the static field. */
|
||
|
|
|
||
|
|
+ /* This address is unrelocated by the objfile's ANOFFSET. */
|
||
|
|
CORE_ADDR physaddr;
|
||
|
|
const char *physname;
|
||
|
|
|
||
|
|
@@ -1237,6 +1239,7 @@ extern void allocate_gnat_aux_type (stru
|
||
|
|
#define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval)
|
||
|
|
#define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0)
|
||
|
|
#define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
|
||
|
|
+/* This address is unrelocated by the objfile's ANOFFSET. */
|
||
|
|
#define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
|
||
|
|
#define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
|
||
|
|
#define SET_FIELD_BITPOS(thisfld, bitpos) \
|
||
|
|
@@ -1248,6 +1251,7 @@ extern void allocate_gnat_aux_type (stru
|
||
|
|
#define SET_FIELD_PHYSNAME(thisfld, name) \
|
||
|
|
(FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME, \
|
||
|
|
FIELD_STATIC_PHYSNAME (thisfld) = (name))
|
||
|
|
+/* This address is unrelocated by the objfile's ANOFFSET. */
|
||
|
|
#define SET_FIELD_PHYSADDR(thisfld, addr) \
|
||
|
|
(FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR, \
|
||
|
|
FIELD_STATIC_PHYSADDR (thisfld) = (addr))
|
||
|
|
@@ -1264,6 +1268,7 @@ extern void allocate_gnat_aux_type (stru
|
||
|
|
#define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
|
||
|
|
#define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (TYPE_FIELD (thistype, n))
|
||
|
|
#define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
|
||
|
|
+/* This address is unrelocated by the objfile's ANOFFSET. */
|
||
|
|
#define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n))
|
||
|
|
#define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))
|
||
|
|
#define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))
|
||
|
|
Index: gdb-7.5.50.20130118/gdb/jv-lang.c
|
||
|
|
===================================================================
|
||
|
|
--- gdb-7.5.50.20130118.orig/gdb/jv-lang.c 2013-01-18 23:07:03.488358315 +0100
|
||
|
|
+++ gdb-7.5.50.20130118/gdb/jv-lang.c 2013-01-18 23:08:10.286451570 +0100
|
||
|
|
@@ -430,7 +430,8 @@ java_link_class_type (struct gdbarch *gd
|
||
|
|
|
||
|
|
fields = NULL;
|
||
|
|
nfields--; /* First set up dummy "class" field. */
|
||
|
|
- SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas));
|
||
|
|
+ SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas)
|
||
|
|
+ - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
|
||
|
|
TYPE_FIELD_NAME (type, nfields) = "class";
|
||
|
|
TYPE_FIELD_TYPE (type, nfields) = value_type (clas);
|
||
|
|
SET_TYPE_FIELD_PRIVATE (type, nfields);
|
||
|
|
@@ -478,7 +479,8 @@ java_link_class_type (struct gdbarch *gd
|
||
|
|
SET_TYPE_FIELD_PROTECTED (type, i);
|
||
|
|
}
|
||
|
|
if (accflags & 0x0008) /* ACC_STATIC */
|
||
|
|
- SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset);
|
||
|
|
+ SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset
|
||
|
|
+ - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
|
||
|
|
else
|
||
|
|
SET_FIELD_BITPOS (TYPE_FIELD (type, i), 8 * boffset);
|
||
|
|
if (accflags & 0x8000) /* FIELD_UNRESOLVED_FLAG */
|
||
|
|
Index: gdb-7.5.50.20130118/gdb/value.c
|
||
|
|
===================================================================
|
||
|
|
--- gdb-7.5.50.20130118.orig/gdb/value.c 2013-01-18 23:07:03.490358319 +0100
|
||
|
|
+++ gdb-7.5.50.20130118/gdb/value.c 2013-01-18 23:08:10.287451543 +0100
|
||
|
|
@@ -2624,7 +2624,8 @@ value_static_field (struct type *type, i
|
||
|
|
{
|
||
|
|
case FIELD_LOC_KIND_PHYSADDR:
|
||
|
|
retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno),
|
||
|
|
- TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
|
||
|
|
+ TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
|
||
|
|
+ + (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
|
||
|
|
break;
|
||
|
|
case FIELD_LOC_KIND_PHYSNAME:
|
||
|
|
{
|