OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb: 

* dwarf2read.c (read_tag_const_type): Handle const arrays.
gdb/testsuite:
	* gdb.base/constvars.c (logical, lugged, luck, lunar, lumen, lurk,
	lush, lynx) New constant.
	* gdb.base/constvars.exp: Test const array types.
	* gdb.dwarf2/dw2-strp.exp: Add const qualifier for ptype tests.
This commit is contained in:
Ken Werner 2010-10-06 16:13:35 +00:00
parent aa2e2d8d77
commit 2f608a3a97
6 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2010-10-06 Ken Werner <ken.werner@de.ibm.com>
* dwarf2read.c (read_tag_const_type): Handle const arrays.
2010-10-06 Doug Evans <dje@google.com>
Create subdir data-directory.

23
gdb/dwarf2read.c
View File

@ -7607,6 +7607,29 @@ read_tag_const_type (struct die_info *die, struct dwarf2_cu *cu)
if (cv_type)
return cv_type;
/* In case the const qualifier is applied to an array type, the element type
is so qualified, not the array type (section 6.7.3 of C99). */
if (TYPE_CODE (base_type) == TYPE_CODE_ARRAY)
{
struct type *el_type, *inner_array;
base_type = copy_type (base_type);
inner_array = base_type;
while (TYPE_CODE (TYPE_TARGET_TYPE (inner_array)) == TYPE_CODE_ARRAY)
{
TYPE_TARGET_TYPE (inner_array) =
copy_type (TYPE_TARGET_TYPE (inner_array));
inner_array = TYPE_TARGET_TYPE (inner_array);
}
el_type = TYPE_TARGET_TYPE (inner_array);
TYPE_TARGET_TYPE (inner_array) =
make_cv_type (1, TYPE_VOLATILE (el_type), el_type, NULL);
return set_die_type (die, base_type, cu);
}
cv_type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0);
return set_die_type (die, cv_type, cu);
}

7
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2010-10-06 Ken Werner <ken.werner@de.ibm.com>
* gdb.base/constvars.c (logical, lugged, luck, lunar, lumen, lurk,
lush, lynx) New constant.
* gdb.base/constvars.exp: Test const array types.
* gdb.dwarf2/dw2-strp.exp: Add const qualifier for ptype tests.
2010-10-06 Doug Evans <dje@google.com>
* gdb.base/catch-syscall.exp (do_syscall_tests): Update location

10
gdb/testsuite/gdb.base/constvars.c
View File

@ -84,6 +84,16 @@ main (void)
float *const lissome = &leeway;
double *const locust = &legacy;
/* constant arrays */
const char logical[2] = {laconic, laconic};
const unsigned char lugged[2] = {laggard, laggard};
const short luck[2] = {lagoon, lagoon};
const unsigned short lunar[2] = {laity, laity};
const long lumen[2] = {lambent, lambent};
const unsigned long lurk[2] = {laminated, laminated};
const float lush[2] = {lampoon, lampoon};
const double lynx[2] = {languid, languid};
/* volatile variables */
volatile char vox = 'X';

17
gdb/testsuite/gdb.base/constvars.exp
View File

@ -252,6 +252,23 @@ proc do_constvar_tests {} {
local_compiler_xfail_check
gdb_test "ptype locust" "type = double \\* const"
local_compiler_xfail_check
gdb_test "ptype logical" "type = const char \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype lugged" "type = const unsigned char \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype luck" "type = const short( int)? \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype lunar" "type = const (unsigned short|short unsigned)( int)? \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype lumen" "type = const long( int)? \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype lurk" "type = const (unsigned long|long unsigned)( int)? \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype lush" "type = const float \\\[2\\\]"
local_compiler_xfail_check
gdb_test "ptype lynx" "type = const double \\\[2\\\]"
local_compiler_xfail_check
local_compiler_xfail_check_2
gdb_test "ptype crass" "type = struct crass \{\[\r\n\]+\[\ \t\]+char \\* const ptr;\[\r\n\]+\}"

4
gdb/testsuite/gdb.dwarf2/dw2-strp.exp
View File

@ -49,7 +49,7 @@ gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
gdb_test "p a_string" " = \"hello world!\\\\n\""
gdb_test "ptype a_string" "type = char \\\[14\\\]"
gdb_test "ptype a_string" "type = const char \\\[14\\\]"
gdb_test "p a_string2" " = \"hello world2\\\\n\""
gdb_test "ptype a_string2" "type = char \\\[14\\\]"
gdb_test "ptype a_string2" "type = const char \\\[14\\\]"