2013-02-11  Sergio Durigan Junior  <sergiodj@redhat.com>

	* valops.c (value_assign): Handling bitfield offset in
	`lval_internalvar_component' case.

gdb/testsuite/:
2013-02-11  Sergio Durigan Junior  <sergiodj@redhat.com>

	* gdb.base/bitfields.c (struct internalvartest): New declaration.
	* gdb.base/bitfields.exp (bitfield_internalvar): New function.
This commit is contained in:
Sergio Durigan Junior 2013-02-11 18:05:35 +00:00
parent ee227692d7
commit d9e983823a
5 changed files with 73 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2013-02-11 Sergio Durigan Junior <sergiodj@redhat.com>
* valops.c (value_assign): Handling bitfield offset in
`lval_internalvar_component' case.
2013-02-08 Doug Evans <dje@google.com>
* common/format.c (parse_format_string): Fix whitespace.

View File

@ -1,3 +1,8 @@
2013-02-11 Sergio Durigan Junior <sergiodj@redhat.com>
* gdb.base/bitfields.c (struct internalvartest): New declaration.
* gdb.base/bitfields.exp (bitfield_internalvar): New function.
2013-02-10 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.python/py-prompt.exp: Add to the end a kill of $testpid.

View File

@ -23,6 +23,22 @@ struct fields
signed char sc ;
} flags;
struct internalvartest
{
unsigned int a : 1;
struct
{
unsigned int b : 1;
struct
{
unsigned int c : 1;
signed int d : 1;
} deep;
signed int e : 1;
} inner;
signed int f : 1;
} dummy_internalvartest;
void break1 ()
{
}

View File

@ -245,6 +245,31 @@ proc bitfield_at_offset {} {
gdb_test "print container.two.u3" ".* = 3"
}
proc bitfield_internalvar {} {
global gdb_prompt
# First, we create an internal var holding an instance of
# the struct (zeroed out).
gdb_test "set \$myvar = (struct internalvartest) \{0\}" "" \
"set internal var"
# Now, we set the proper bits.
gdb_test_no_output "set \$myvar.a = 0"
gdb_test_no_output "set \$myvar.inner.b = 1"
gdb_test_no_output "set \$myvar.inner.deep.c = 0"
gdb_test_no_output "set \$myvar.inner.deep.d = -1"
gdb_test_no_output "set \$myvar.inner.e = 1"
gdb_test_no_output "set \$myvar.f = 1"
# Here comes the true testing.
gdb_test "print \$myvar.a" "\\$\[0-9\]\+ = 0"
gdb_test "print \$myvar.inner.b" "\\$\[0-9\]\+ = 1"
gdb_test "print \$myvar.inner.deep.c" "\\$\[0-9\]\+ = 0"
gdb_test "print \$myvar.inner.deep.d" "\\$\[0-9\]\+ = -1"
gdb_test "print \$myvar.inner.e" "\\$\[0-9\]\+ = -1"
gdb_test "print \$myvar.f" "\\$\[0-9\]\+ = -1"
}
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
@ -256,3 +281,4 @@ bitfield_containment
bitfield_unsignedness
bitfield_signedness
bitfield_at_offset
bitfield_internalvar

View File

@ -1233,11 +1233,27 @@ value_assign (struct value *toval, struct value *fromval)
VALUE_INTERNALVAR (toval));
case lval_internalvar_component:
set_internalvar_component (VALUE_INTERNALVAR (toval),
value_offset (toval),
value_bitpos (toval),
value_bitsize (toval),
fromval);
{
int offset = value_offset (toval);
/* Are we dealing with a bitfield?
It is important to mention that `value_parent (toval)' is
non-NULL iff `value_bitsize (toval)' is non-zero. */
if (value_bitsize (toval))
{
/* VALUE_INTERNALVAR below refers to the parent value, while
the offset is relative to this parent value. */
gdb_assert (value_parent (value_parent (toval)) == NULL);
offset += value_offset (value_parent (toval));
}
set_internalvar_component (VALUE_INTERNALVAR (toval),
offset,
value_bitpos (toval),
value_bitsize (toval),
fromval);
}
break;
case lval_memory: