diff -urN ./clean/src/gdb/c-exp.y modified/src/gdb/c-exp.y --- ./clean/src/gdb/c-exp.y 2007-06-05 23:47:50.000000000 +0100 +++ modified/src/gdb/c-exp.y 2007-06-10 18:25:16.000000000 +0100 @@ -101,6 +101,9 @@ #define yytable c_yytable #define yycheck c_yycheck +/* Global variable denoting whether we are only interested in scope, not value */ +int check_scope = 0; + #ifndef YYDEBUG #define YYDEBUG 1 /* Default to yydebug support */ #endif @@ -201,6 +204,8 @@ %token TRUEKEYWORD %token FALSEKEYWORD +/* $in_scope opperator */ +%left IN_SCOPE %left ',' %left ABOVE_COMMA @@ -244,6 +249,11 @@ ; /* Expressions, not including the comma operator. */ +exp : IN_SCOPE + { check_scope = 1; } + '(' exp ')' + ; + exp : '*' exp %prec UNARY { write_exp_elt_opcode (UNOP_IND); } ; @@ -583,8 +593,25 @@ VAR_DOMAIN, (int *) NULL, (struct symtab **) NULL); if (sym == 0) - error ("No symbol \"%s\" in specified context.", + { + /* Case for scope checking. If scope is being checked and + the symbol is not in scope, return an expresison of + value 0. */ + if(check_scope == 0) + { + error ("No symbol \"%s\" in specified context.", copy_name ($3)); + } + else + { + YYSTYPE val; + parse_number ("0", 1, 0, &val); + write_exp_elt_opcode (OP_LONG); + write_exp_elt_type (val.typed_val_int.type); + write_exp_elt_longcst ((LONGEST)val.typed_val_int.val); + write_exp_elt_opcode (OP_LONG); + } + } write_exp_elt_opcode (OP_VAR_VALUE); /* block_found is set by lookup_symbol. */ @@ -663,8 +690,22 @@ if (!have_full_symbols () && !have_partial_symbols ()) error ("No symbol table is loaded. Use the \"file\" command."); else - error ("No symbol \"%s\" in current context.", name); - } + { + if(check_scope == 0) + { + error ("No symbol \"%s\" in current context.", name); + } + else + { + YYSTYPE val; + parse_number ("0", 1, 0, &val); + write_exp_elt_opcode (OP_LONG); + write_exp_elt_type (val.typed_val_int.type); + write_exp_elt_longcst ((LONGEST)val.typed_val_int.val); + write_exp_elt_opcode (OP_LONG); + } + } +} ; variable: name_not_typename @@ -718,8 +759,19 @@ else if (!have_full_symbols () && !have_partial_symbols ()) error ("No symbol table is loaded. Use the \"file\" command."); else - error ("No symbol \"%s\" in current context.", - copy_name ($1.stoken)); + { + if(check_scope == 0) + error ("No symbol \"%s\" in current context.", copy_name ($1.stoken)); + else + { + YYSTYPE val; + parse_number ("0", 1, 0, &val); + write_exp_elt_opcode (OP_LONG); + write_exp_elt_type (val.typed_val_int.type); + write_exp_elt_longcst ((LONGEST)val.typed_val_int.val); + write_exp_elt_opcode (OP_LONG); + } + } } } ; @@ -1258,6 +1310,11 @@ enum exp_opcode opcode; }; +static const struct token tokentab9[] = + { + {"$in_scope", IN_SCOPE, BINOP_END} + }; + static const struct token tokentab3[] = { {">>=", ASSIGN_MODIFY, BINOP_RSH}, @@ -1320,6 +1377,15 @@ prev_lexptr = lexptr; tokstart = lexptr; + /* Code for recognising the $in_scope token. */ + /* See if it is a special token of length 9. */ + for (i = 0; i < sizeof tokentab9 / sizeof tokentab9[0]; i++) + if (strncmp (tokstart, tokentab9[i].operator, 9) == 0) + { + lexptr += 9; + yylval.opcode = tokentab9[i].opcode; + return tokentab9[i].token; + } /* See if it is a special token of length 3. */ for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++) if (strncmp (tokstart, tokentab3[i].operator, 3) == 0) diff -urN ./clean/src/gdb/eval.c modified/src/gdb/eval.c --- ./clean/src/gdb/eval.c 2007-06-05 23:47:50.000000000 +0100 +++ modified/src/gdb/eval.c 2007-06-13 14:11:04.000000000 +0100 @@ -46,6 +46,9 @@ /* This is defined in valops.c */ extern int overload_resolution; +/* Variable denoting is scope is being checked */ +extern int check_scope; + /* JYG: lookup rtti type of STRUCTOP_PTR when this is set to continue on with successful lookup for member/method of the rtti type. */ extern int objectprint; @@ -164,7 +167,16 @@ evaluate_expression (struct expression *exp) { int pc = 0; - return evaluate_subexp (NULL_TYPE, exp, &pc, EVAL_NORMAL); + + /* Modifications so that if we are checking scope we can + reset the value of the variable to 0, so we don't check + scope when we don't want to */ + struct value *val = evaluate_subexp (NULL_TYPE, exp, &pc, EVAL_NORMAL); + + if(check_scope == 1) + check_scope = 0; + + return val; } /* Evaluate an expression, avoiding all memory references @@ -445,18 +457,36 @@ &exp->elts[pc + 3].string, 0, noside); if (arg1 == NULL) - error (_("There is no field named %s"), &exp->elts[pc + 3].string); + { + if (check_scope == 1) + return value_from_longest (builtin_type_int, (LONGEST) 1); + else + error (_("There is no field named %s"), &exp->elts[pc + 3].string); + } + return arg1; case OP_LONG: (*pos) += 3; - return value_from_longest (exp->elts[pc + 1].type, + + /* This is a special case, as if we are checking a variable is in scope + * and it isn't then the type of the expression returned is of type long + * and we end up here. + */ + if (check_scope == 1 && exp->elts[pc+2].longconst != 0) + return value_from_longest (builtin_type_int, (LONGEST) 1); + else + return value_from_longest (exp->elts[pc + 1].type, exp->elts[pc + 2].longconst); case OP_DOUBLE: (*pos) += 3; - return value_from_double (exp->elts[pc + 1].type, + + if (check_scope == 0) + return value_from_double (exp->elts[pc + 1].type, exp->elts[pc + 2].doubleconst); + else + return value_from_longest (builtin_type_int, (LONGEST) 1); case OP_VAR_VALUE: (*pos) += 3; @@ -472,6 +502,14 @@ value_rtti_target_type () if we are dealing with a pointer or reference to a base class and print object is on. */ + /* Special case, if we are checking scope and a variable is + in scope, return a expression of value 1. */ + if (check_scope == 0) + return value_of_variable (exp->elts[pc + 2].symbol, + exp->elts[pc + 1].block); + else + return value_from_longest (builtin_type_int, (LONGEST) 1); + { volatile struct gdb_exception except; struct value *ret = NULL; @@ -495,8 +533,11 @@ case OP_LAST: (*pos) += 2; - return - access_value_history (longest_to_int (exp->elts[pc + 1].longconst)); + if (check_scope == 0) + return + access_value_history (longest_to_int (exp->elts[pc + 1].longconst)); + else + return value_from_longest (builtin_type_int, (LONGEST) 1); case OP_REGISTER: { @@ -511,24 +552,38 @@ error (_("Value of register %s not available."), frame_map_regnum_to_name (get_selected_frame (NULL), regno)); else + if(check_scope == 0) return val; + else + return value_from_longest (builtin_type_int, (LONGEST) 1); } + case OP_BOOL: (*pos) += 2; - return value_from_longest (LA_BOOL_TYPE, - exp->elts[pc + 1].longconst); + if (check_scope == 0) + return value_from_longest (LA_BOOL_TYPE, + exp->elts[pc + 1].longconst); + else + return value_from_longest (builtin_type_int, (LONGEST) 1); + case OP_INTERNALVAR: (*pos) += 2; - return value_of_internalvar (exp->elts[pc + 1].internalvar); + return value_of_internalvar (exp->elts[pc + 1].internalvar); + case OP_STRING: tem = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1); if (noside == EVAL_SKIP) goto nosideret; - return value_string (&exp->elts[pc + 2].string, tem); + if (check_scope == 0) + return value_string (&exp->elts[pc + 2].string, tem); + else + return value_from_longest (builtin_type_int, (LONGEST) 1); + + case OP_OBJC_NSSTRING: /* Objective C Foundation Class NSString constant. */ tem = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1); @@ -1333,7 +1388,19 @@ case STRUCTOP_STRUCT: tem = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1); - arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + + /* Temporalily disable scope checking while we evaluate + the subexpression, so that the correct type of value + is returned */ + if(check_scope == 1) + { + check_scope = 0; + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + check_scope = 1; + } + else + arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -1434,8 +1501,12 @@ case BINOP_CONCAT: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); + + if (check_scope == 1) + return value_binop (arg1, arg2, BINOP_LOGICAL_AND); + if (noside == EVAL_SKIP) - goto nosideret; + goto nosideret; if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, op, OP_NULL, noside); else @@ -1446,32 +1517,36 @@ arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) - return arg1; + return arg1; if (binop_user_defined_p (op, arg1, arg2)) - return value_x_binop (arg1, arg2, op, OP_NULL, noside); + return value_x_binop (arg1, arg2, op, OP_NULL, noside); else return value_assign (arg1, arg2); - + + case BINOP_ASSIGN_MODIFY: (*pos) += 2; arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); + if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) - return arg1; + return arg1; + op = exp->elts[pc + 1].opcode; if (binop_user_defined_p (op, arg1, arg2)) - return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); + return value_x_binop (arg1, arg2, BINOP_ASSIGN_MODIFY, op, noside); else if (op == BINOP_ADD) - arg2 = value_add (arg1, arg2); + arg2 = value_add (arg1, arg2); else if (op == BINOP_SUB) - arg2 = value_sub (arg1, arg2); + arg2 = value_sub (arg1, arg2); else - arg2 = value_binop (arg1, arg2, op); + arg2 = value_binop (arg1, arg2, op); return value_assign (arg1, arg2); case BINOP_ADD: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; if (binop_user_defined_p (op, arg1, arg2)) @@ -1482,6 +1557,7 @@ case BINOP_SUB: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; if (binop_user_defined_p (op, arg1, arg2)) @@ -1501,6 +1577,7 @@ case BINOP_BITWISE_XOR: arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; if (binop_user_defined_p (op, arg1, arg2)) @@ -1514,6 +1591,7 @@ case BINOP_RANGE: arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside); arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; error (_("':' operator used in invalid context")); @@ -1521,6 +1599,7 @@ case BINOP_SUBSCRIPT: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; if (binop_user_defined_p (op, arg1, arg2)) @@ -1552,6 +1631,7 @@ case BINOP_IN: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); + if (noside == EVAL_SKIP) goto nosideret; return value_in (arg1, arg2); @@ -1737,10 +1817,25 @@ else { tem = value_logical_not (arg1); - arg2 = evaluate_subexp (NULL_TYPE, exp, pos, + + /* A special case. If we are checking scope, the result should be + * the logical AND, of the sub-expressions, not OR + */ + if (check_scope == 0) + { + arg2 = evaluate_subexp (NULL_TYPE, exp, pos, (!tem ? EVAL_SKIP : noside)); - return value_from_longest (LA_BOOL_TYPE, - (LONGEST) (!tem || !value_logical_not (arg2))); + + return value_from_longest (LA_BOOL_TYPE, + (LONGEST) (!tem || !value_logical_not (arg2))); + } + else + { + arg2 = evaluate_subexp (NULL_TYPE, exp, pos, + (tem ? EVAL_SKIP : noside)); + return value_from_longest (LA_BOOL_TYPE, + (LONGEST) (!tem && !value_logical_not (arg2))); + } } case BINOP_EQUAL: Binary files ./clean/src/gdb/.eval.c.swo and modified/src/gdb/.eval.c.swo differ Binary files ./clean/src/gdb/.eval.c.swp and modified/src/gdb/.eval.c.swp differ Binary files ./clean/src/gdb/testsuite/gdb.arch/i386-gnu-cfi and modified/src/gdb/testsuite/gdb.arch/i386-gnu-cfi differ Binary files ./clean/src/gdb/testsuite/gdb.arch/i386-size and modified/src/gdb/testsuite/gdb.arch/i386-size differ Binary files ./clean/src/gdb/testsuite/gdb.arch/i386-size-overlap and modified/src/gdb/testsuite/gdb.arch/i386-size-overlap differ Binary files ./clean/src/gdb/testsuite/gdb.arch/i386-sse and modified/src/gdb/testsuite/gdb.arch/i386-sse differ Binary files ./clean/src/gdb/testsuite/gdb.arch/i386-unwind and modified/src/gdb/testsuite/gdb.arch/i386-unwind differ Binary files ./clean/src/gdb/testsuite/gdb.base/advance and modified/src/gdb/testsuite/gdb.base/advance differ Binary files ./clean/src/gdb/testsuite/gdb.base/annota3 and modified/src/gdb/testsuite/gdb.base/annota3 differ Binary files ./clean/src/gdb/testsuite/gdb.base/args and modified/src/gdb/testsuite/gdb.base/args differ Binary files ./clean/src/gdb/testsuite/gdb.base/arrayidx and modified/src/gdb/testsuite/gdb.base/arrayidx differ Binary files ./clean/src/gdb/testsuite/gdb.base/async and modified/src/gdb/testsuite/gdb.base/async differ Binary files ./clean/src/gdb/testsuite/gdb.base/attach and modified/src/gdb/testsuite/gdb.base/attach differ Binary files ./clean/src/gdb/testsuite/gdb.base/attach2 and modified/src/gdb/testsuite/gdb.base/attach2 differ Binary files ./clean/src/gdb/testsuite/gdb.base/auxv and modified/src/gdb/testsuite/gdb.base/auxv differ Binary files ./clean/src/gdb/testsuite/gdb.base/auxv.gcore and modified/src/gdb/testsuite/gdb.base/auxv.gcore differ Binary files ./clean/src/gdb/testsuite/gdb.base/bang! and modified/src/gdb/testsuite/gdb.base/bang! differ Binary files ./clean/src/gdb/testsuite/gdb.base/bfp-test and modified/src/gdb/testsuite/gdb.base/bfp-test differ Binary files ./clean/src/gdb/testsuite/gdb.base/bigcore and modified/src/gdb/testsuite/gdb.base/bigcore differ Binary files ./clean/src/gdb/testsuite/gdb.base/bitfields2 and modified/src/gdb/testsuite/gdb.base/bitfields2 differ Binary files ./clean/src/gdb/testsuite/gdb.base/breako2 and modified/src/gdb/testsuite/gdb.base/breako2 differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-tc and modified/src/gdb/testsuite/gdb.base/call-sc-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-td and modified/src/gdb/testsuite/gdb.base/call-sc-td differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-te and modified/src/gdb/testsuite/gdb.base/call-sc-te differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-tf and modified/src/gdb/testsuite/gdb.base/call-sc-tf differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-ti and modified/src/gdb/testsuite/gdb.base/call-sc-ti differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-tl and modified/src/gdb/testsuite/gdb.base/call-sc-tl differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-tld and modified/src/gdb/testsuite/gdb.base/call-sc-tld differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-tll and modified/src/gdb/testsuite/gdb.base/call-sc-tll differ Binary files ./clean/src/gdb/testsuite/gdb.base/call-sc-ts and modified/src/gdb/testsuite/gdb.base/call-sc-ts differ Binary files ./clean/src/gdb/testsuite/gdb.base/charset and modified/src/gdb/testsuite/gdb.base/charset differ Binary files ./clean/src/gdb/testsuite/gdb.base/charsign and modified/src/gdb/testsuite/gdb.base/charsign differ Binary files ./clean/src/gdb/testsuite/gdb.base/checkpoint and modified/src/gdb/testsuite/gdb.base/checkpoint differ Binary files ./clean/src/gdb/testsuite/gdb.base/complex and modified/src/gdb/testsuite/gdb.base/complex differ Binary files ./clean/src/gdb/testsuite/gdb.base/consecutive and modified/src/gdb/testsuite/gdb.base/consecutive differ Binary files ./clean/src/gdb/testsuite/gdb.base/cursal and modified/src/gdb/testsuite/gdb.base/cursal differ Binary files ./clean/src/gdb/testsuite/gdb.base/cvexpr and modified/src/gdb/testsuite/gdb.base/cvexpr differ Binary files ./clean/src/gdb/testsuite/gdb.base/.debug/sepsymtab.debug and modified/src/gdb/testsuite/gdb.base/.debug/sepsymtab.debug differ Binary files ./clean/src/gdb/testsuite/gdb.base/del and modified/src/gdb/testsuite/gdb.base/del differ Binary files ./clean/src/gdb/testsuite/gdb.base/dump and modified/src/gdb/testsuite/gdb.base/dump differ Binary files ./clean/src/gdb/testsuite/gdb.base/fileio and modified/src/gdb/testsuite/gdb.base/fileio differ Binary files ./clean/src/gdb/testsuite/gdb.base/freebpcmd and modified/src/gdb/testsuite/gdb.base/freebpcmd differ Binary files ./clean/src/gdb/testsuite/gdb.base/gcore and modified/src/gdb/testsuite/gdb.base/gcore differ Binary files ./clean/src/gdb/testsuite/gdb.base/gcore.test and modified/src/gdb/testsuite/gdb.base/gcore.test differ Binary files ./clean/src/gdb/testsuite/gdb.base/gdb1090 and modified/src/gdb/testsuite/gdb.base/gdb1090 differ Binary files ./clean/src/gdb/testsuite/gdb.base/gdb1250 and modified/src/gdb/testsuite/gdb.base/gdb1250 differ Binary files ./clean/src/gdb/testsuite/gdb.base/gdb1555-main and modified/src/gdb/testsuite/gdb.base/gdb1555-main differ Binary files ./clean/src/gdb/testsuite/gdb.base/gdb1555.so and modified/src/gdb/testsuite/gdb.base/gdb1555.so differ Binary files ./clean/src/gdb/testsuite/gdb.base/gdb1821 and modified/src/gdb/testsuite/gdb.base/gdb1821 differ Binary files ./clean/src/gdb/testsuite/gdb.base/huge and modified/src/gdb/testsuite/gdb.base/huge differ Binary files ./clean/src/gdb/testsuite/gdb.base/included and modified/src/gdb/testsuite/gdb.base/included differ Binary files ./clean/src/gdb/testsuite/gdb.base/infnan and modified/src/gdb/testsuite/gdb.base/infnan differ Binary files ./clean/src/gdb/testsuite/gdb.base/lineinc and modified/src/gdb/testsuite/gdb.base/lineinc differ Binary files ./clean/src/gdb/testsuite/gdb.base/macscp and modified/src/gdb/testsuite/gdb.base/macscp differ Binary files ./clean/src/gdb/testsuite/gdb.base/multi-forks and modified/src/gdb/testsuite/gdb.base/multi-forks differ Binary files ./clean/src/gdb/testsuite/gdb.base/nofield and modified/src/gdb/testsuite/gdb.base/nofield differ Binary files ./clean/src/gdb/testsuite/gdb.base/pc-fp and modified/src/gdb/testsuite/gdb.base/pc-fp differ Binary files ./clean/src/gdb/testsuite/gdb.base/pending and modified/src/gdb/testsuite/gdb.base/pending differ Binary files ./clean/src/gdb/testsuite/gdb.base/pendshr.sl and modified/src/gdb/testsuite/gdb.base/pendshr.sl differ Binary files ./clean/src/gdb/testsuite/gdb.base/prelink.so and modified/src/gdb/testsuite/gdb.base/prelink.so differ Binary files ./clean/src/gdb/testsuite/gdb.base/prelinkt and modified/src/gdb/testsuite/gdb.base/prelinkt differ Binary files ./clean/src/gdb/testsuite/gdb.base/psymtab and modified/src/gdb/testsuite/gdb.base/psymtab differ Binary files ./clean/src/gdb/testsuite/gdb.base/ptr-typedef and modified/src/gdb/testsuite/gdb.base/ptr-typedef differ Binary files ./clean/src/gdb/testsuite/gdb.base/relativedebug and modified/src/gdb/testsuite/gdb.base/relativedebug differ Binary files ./clean/src/gdb/testsuite/gdb.base/return2 and modified/src/gdb/testsuite/gdb.base/return2 differ Binary files ./clean/src/gdb/testsuite/gdb.base/savedregs and modified/src/gdb/testsuite/gdb.base/savedregs differ Binary files ./clean/src/gdb/testsuite/gdb.base/sep and modified/src/gdb/testsuite/gdb.base/sep differ Binary files ./clean/src/gdb/testsuite/gdb.base/sepdebug and modified/src/gdb/testsuite/gdb.base/sepdebug differ Binary files ./clean/src/gdb/testsuite/gdb.base/sepdebug.debug and modified/src/gdb/testsuite/gdb.base/sepdebug.debug differ Binary files ./clean/src/gdb/testsuite/gdb.base/sepsymtab and modified/src/gdb/testsuite/gdb.base/sepsymtab differ Binary files ./clean/src/gdb/testsuite/gdb.base/shreloc and modified/src/gdb/testsuite/gdb.base/shreloc differ Binary files ./clean/src/gdb/testsuite/gdb.base/shreloc1.sl and modified/src/gdb/testsuite/gdb.base/shreloc1.sl differ Binary files ./clean/src/gdb/testsuite/gdb.base/shreloc2.sl and modified/src/gdb/testsuite/gdb.base/shreloc2.sl differ diff -urN ./clean/src/gdb/testsuite/gdb.base/shreloc.txt modified/src/gdb/testsuite/gdb.base/shreloc.txt --- ./clean/src/gdb/testsuite/gdb.base/shreloc.txt 2007-06-10 21:46:45.000000000 +0100 +++ modified/src/gdb/testsuite/gdb.base/shreloc.txt 2007-06-10 22:17:06.000000000 +0100 @@ -1,45 +1,45 @@ -Object file /home/rob/GDB/clean/src/gdb/testsuite/gdb.base/shreloc: +Object file /home/rob/GDB/src/gdb/testsuite/gdb.base/shreloc: -[ 0] T 0x8048404 _init section .init shreloc.c -[ 1] T 0x804842c fn_2@plt section .plt -[ 2] T 0x804843c __libc_start_main@plt section .plt -[ 3] T 0x804844c fn_1@plt section .plt -[ 4] T 0x804845c _start section .text shreloc.c -[ 5] t 0x8048480 call_gmon_start section .text /build/buildd/glibc-2.3.6/build-tree/i386-libc/csu/crti.S -[ 6] T 0x80484a4 __i686.get_pc_thunk.bx section .text shreloc.c -[ 7] t 0x80484a8 __do_global_dtors_aux section .text crtstuff.c -[ 8] t 0x80484d7 frame_dummy section .text crtstuff.c -[ 9] T 0x80484fc main section .text shreloc.c -[10] T 0x804853c __libc_csu_init section .text shreloc.c -[11] T 0x804858d __libc_csu_fini section .text shreloc.c -[12] t 0x80485d8 __do_global_ctors_aux section .text crtstuff.c -[13] T 0x8048604 _fini section .fini shreloc.c -[14] D 0x8048624 _fp_hw section .rodata shreloc.c -[15] D 0x8048628 _IO_stdin_used section .rodata shreloc.c -[16] d 0x804862c __FRAME_END__ section .eh_frame crtstuff.c -[17] d 0x8049630 __CTOR_LIST__ section .ctors crtstuff.c -[18] A 0x8049630 __fini_array_end section *ABS* shreloc.c -[19] A 0x8049630 __fini_array_start section *ABS* shreloc.c -[20] A 0x8049630 __init_array_end section *ABS* shreloc.c -[21] A 0x8049630 __init_array_start section *ABS* shreloc.c -[22] d 0x8049634 __CTOR_END__ section .ctors crtstuff.c -[23] d 0x8049638 __DTOR_LIST__ section .dtors crtstuff.c -[24] d 0x804963c __DTOR_END__ section .dtors crtstuff.c -[25] d 0x8049640 __JCR_END__ section .jcr crtstuff.c -[26] d 0x8049640 __JCR_LIST__ section .jcr crtstuff.c -[27] d 0x8049644 _DYNAMIC section .dynamic shreloc.c -[28] d 0x8049728 _GLOBAL_OFFSET_TABLE_ section .got.plt shreloc.c -[29] D 0x8049740 __data_start section .data shreloc.c -[30] D 0x8049740 data_start section .data shreloc.c -[31] D 0x8049744 __dso_handle section .data shreloc.c -[32] d 0x8049748 p.4462 section .data crtstuff.c -[33] A 0x804974c __bss_start section *ABS* shreloc.c -[34] A 0x804974c _edata section *ABS* shreloc.c -[35] B 0x804974c extern_var_2 section .bss shreloc.c -[36] B 0x8049750 extern_var_1 section .bss shreloc.c -[37] b 0x8049754 completed.4463 section .bss crtstuff.c -[38] A 0x8049758 _end section *ABS* shreloc.c +[ 0] T 0x80483f8 _init section .init shreloc.c +[ 1] T 0x8048420 fn_2@plt section .plt +[ 2] T 0x8048430 __libc_start_main@plt section .plt +[ 3] T 0x8048440 fn_1@plt section .plt +[ 4] T 0x8048450 _start section .text shreloc.c +[ 5] t 0x8048474 call_gmon_start section .text /build/buildd/glibc-2.3.6/build-tree/i386-libc/csu/crti.S +[ 6] T 0x8048498 __i686.get_pc_thunk.bx section .text shreloc.c +[ 7] t 0x804849c __do_global_dtors_aux section .text crtstuff.c +[ 8] t 0x80484cb frame_dummy section .text crtstuff.c +[ 9] T 0x80484f0 main section .text shreloc.c +[10] T 0x8048530 __libc_csu_init section .text shreloc.c +[11] T 0x8048581 __libc_csu_fini section .text shreloc.c +[12] t 0x80485cc __do_global_ctors_aux section .text crtstuff.c +[13] T 0x80485f8 _fini section .fini shreloc.c +[14] D 0x8048618 _fp_hw section .rodata shreloc.c +[15] D 0x804861c _IO_stdin_used section .rodata shreloc.c +[16] d 0x8048620 __FRAME_END__ section .eh_frame crtstuff.c +[17] d 0x8049624 __CTOR_LIST__ section .ctors crtstuff.c +[18] A 0x8049624 __fini_array_end section *ABS* shreloc.c +[19] A 0x8049624 __fini_array_start section *ABS* shreloc.c +[20] A 0x8049624 __init_array_end section *ABS* shreloc.c +[21] A 0x8049624 __init_array_start section *ABS* shreloc.c +[22] d 0x8049628 __CTOR_END__ section .ctors crtstuff.c +[23] d 0x804962c __DTOR_LIST__ section .dtors crtstuff.c +[24] d 0x8049630 __DTOR_END__ section .dtors crtstuff.c +[25] d 0x8049634 __JCR_END__ section .jcr crtstuff.c +[26] d 0x8049634 __JCR_LIST__ section .jcr crtstuff.c +[27] d 0x8049638 _DYNAMIC section .dynamic shreloc.c +[28] d 0x804971c _GLOBAL_OFFSET_TABLE_ section .got.plt shreloc.c +[29] D 0x8049734 __data_start section .data shreloc.c +[30] D 0x8049734 data_start section .data shreloc.c +[31] D 0x8049738 __dso_handle section .data shreloc.c +[32] d 0x804973c p.4462 section .data crtstuff.c +[33] A 0x8049740 __bss_start section *ABS* shreloc.c +[34] A 0x8049740 _edata section *ABS* shreloc.c +[35] B 0x8049740 extern_var_2 section .bss shreloc.c +[36] B 0x8049744 extern_var_1 section .bss shreloc.c +[37] b 0x8049748 completed.4463 section .bss crtstuff.c +[38] A 0x804974c _end section *ABS* shreloc.c Object file /lib/ld-linux.so.2: @@ -86,7 +86,7 @@ [ 3] T 0xffffe440 __kernel_rt_sigreturn section .text -Object file /home/rob/GDB/clean/src/gdb/testsuite/gdb.base/shreloc1.sl: +Object file /home/rob/GDB/src/gdb/testsuite/gdb.base/shreloc1.sl: [ 0] A 0x1510 _DYNAMIC section *ABS* shreloc1.c [ 1] A 0x15e4 _GLOBAL_OFFSET_TABLE_ section *ABS* shreloc1.c @@ -117,7 +117,7 @@ [26] b 0x40003604 static_var_1 section .bss shreloc1.c -Object file /home/rob/GDB/clean/src/gdb/testsuite/gdb.base/shreloc2.sl: +Object file /home/rob/GDB/src/gdb/testsuite/gdb.base/shreloc2.sl: [ 0] A 0x1510 _DYNAMIC section *ABS* shreloc2.c [ 1] A 0x15e4 _GLOBAL_OFFSET_TABLE_ section *ABS* shreloc2.c Binary files ./clean/src/gdb/testsuite/gdb.base/sigaltstack and modified/src/gdb/testsuite/gdb.base/sigaltstack differ Binary files ./clean/src/gdb/testsuite/gdb.base/sigbpt and modified/src/gdb/testsuite/gdb.base/sigbpt differ Binary files ./clean/src/gdb/testsuite/gdb.base/siginfo and modified/src/gdb/testsuite/gdb.base/siginfo differ Binary files ./clean/src/gdb/testsuite/gdb.base/signull and modified/src/gdb/testsuite/gdb.base/signull differ Binary files ./clean/src/gdb/testsuite/gdb.base/sigrepeat and modified/src/gdb/testsuite/gdb.base/sigrepeat differ Binary files ./clean/src/gdb/testsuite/gdb.base/sigstep and modified/src/gdb/testsuite/gdb.base/sigstep differ Binary files ./clean/src/gdb/testsuite/gdb.base/sizeof and modified/src/gdb/testsuite/gdb.base/sizeof differ Binary files ./clean/src/gdb/testsuite/gdb.base/solib-weak and modified/src/gdb/testsuite/gdb.base/solib-weak differ Binary files ./clean/src/gdb/testsuite/gdb.base/start and modified/src/gdb/testsuite/gdb.base/start differ Binary files ./clean/src/gdb/testsuite/gdb.base/step-bt and modified/src/gdb/testsuite/gdb.base/step-bt differ Binary files ./clean/src/gdb/testsuite/gdb.base/store and modified/src/gdb/testsuite/gdb.base/store differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc and modified/src/gdb/testsuite/gdb.base/structs-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-td and modified/src/gdb/testsuite/gdb.base/structs-tc-td differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-tf and modified/src/gdb/testsuite/gdb.base/structs-tc-tf differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-ti and modified/src/gdb/testsuite/gdb.base/structs-tc-ti differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-tl and modified/src/gdb/testsuite/gdb.base/structs-tc-tl differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-tld and modified/src/gdb/testsuite/gdb.base/structs-tc-tld differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-tll and modified/src/gdb/testsuite/gdb.base/structs-tc-tll differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tc-ts and modified/src/gdb/testsuite/gdb.base/structs-tc-ts differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-td and modified/src/gdb/testsuite/gdb.base/structs-td differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-td-tc and modified/src/gdb/testsuite/gdb.base/structs-td-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-td-tf and modified/src/gdb/testsuite/gdb.base/structs-td-tf differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tf and modified/src/gdb/testsuite/gdb.base/structs-tf differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tf-tc and modified/src/gdb/testsuite/gdb.base/structs-tf-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tf-td and modified/src/gdb/testsuite/gdb.base/structs-tf-td differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-ti and modified/src/gdb/testsuite/gdb.base/structs-ti differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-ti-tc and modified/src/gdb/testsuite/gdb.base/structs-ti-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tl and modified/src/gdb/testsuite/gdb.base/structs-tl differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tld and modified/src/gdb/testsuite/gdb.base/structs-tld differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tld-tc and modified/src/gdb/testsuite/gdb.base/structs-tld-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tll and modified/src/gdb/testsuite/gdb.base/structs-tll differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tll-tc and modified/src/gdb/testsuite/gdb.base/structs-tll-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-tl-tc and modified/src/gdb/testsuite/gdb.base/structs-tl-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-ts and modified/src/gdb/testsuite/gdb.base/structs-ts differ Binary files ./clean/src/gdb/testsuite/gdb.base/structs-ts-tc and modified/src/gdb/testsuite/gdb.base/structs-ts-tc differ Binary files ./clean/src/gdb/testsuite/gdb.base/type-opaque-lib.so and modified/src/gdb/testsuite/gdb.base/type-opaque-lib.so differ Binary files ./clean/src/gdb/testsuite/gdb.base/type-opaque-main and modified/src/gdb/testsuite/gdb.base/type-opaque-main differ Binary files ./clean/src/gdb/testsuite/gdb.base/unload and modified/src/gdb/testsuite/gdb.base/unload differ Binary files ./clean/src/gdb/testsuite/gdb.base/unloadshr.sl and modified/src/gdb/testsuite/gdb.base/unloadshr.sl differ Binary files ./clean/src/gdb/testsuite/gdb.base/weaklib1.sl and modified/src/gdb/testsuite/gdb.base/weaklib1.sl differ Binary files ./clean/src/gdb/testsuite/gdb.base/weaklib2.sl and modified/src/gdb/testsuite/gdb.base/weaklib2.sl differ Binary files ./clean/src/gdb/testsuite/gdb.cp/annota3 and modified/src/gdb/testsuite/gdb.cp/annota3 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/bool and modified/src/gdb/testsuite/gdb.cp/bool differ Binary files ./clean/src/gdb/testsuite/gdb.cp/breakpoint and modified/src/gdb/testsuite/gdb.cp/breakpoint differ Binary files ./clean/src/gdb/testsuite/gdb.cp/bs15503 and modified/src/gdb/testsuite/gdb.cp/bs15503 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/call-c and modified/src/gdb/testsuite/gdb.cp/call-c differ Binary files ./clean/src/gdb/testsuite/gdb.cp/casts and modified/src/gdb/testsuite/gdb.cp/casts differ Binary files ./clean/src/gdb/testsuite/gdb.cp/class2 and modified/src/gdb/testsuite/gdb.cp/class2 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/classes and modified/src/gdb/testsuite/gdb.cp/classes differ Binary files ./clean/src/gdb/testsuite/gdb.cp/exception and modified/src/gdb/testsuite/gdb.cp/exception differ Binary files ./clean/src/gdb/testsuite/gdb.cp/gdb1355 and modified/src/gdb/testsuite/gdb.cp/gdb1355 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/hang and modified/src/gdb/testsuite/gdb.cp/hang differ Binary files ./clean/src/gdb/testsuite/gdb.cp/m-data and modified/src/gdb/testsuite/gdb.cp/m-data differ Binary files ./clean/src/gdb/testsuite/gdb.cp/m-static and modified/src/gdb/testsuite/gdb.cp/m-static differ Binary files ./clean/src/gdb/testsuite/gdb.cp/pr-1023 and modified/src/gdb/testsuite/gdb.cp/pr-1023 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/pr-1210 and modified/src/gdb/testsuite/gdb.cp/pr-1210 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/pr-574 and modified/src/gdb/testsuite/gdb.cp/pr-574 differ Binary files ./clean/src/gdb/testsuite/gdb.cp/printmethod and modified/src/gdb/testsuite/gdb.cp/printmethod differ Binary files ./clean/src/gdb/testsuite/gdb.cp/psmang and modified/src/gdb/testsuite/gdb.cp/psmang differ Binary files ./clean/src/gdb/testsuite/gdb.cp/rtti and modified/src/gdb/testsuite/gdb.cp/rtti differ Binary files ./clean/src/gdb/testsuite/gdb.cp/try_catch and modified/src/gdb/testsuite/gdb.cp/try_catch differ Binary files ./clean/src/gdb/testsuite/gdb.mi/gdb669-pthreads and modified/src/gdb/testsuite/gdb.mi/gdb669-pthreads differ Binary files ./clean/src/gdb/testsuite/gdb.mi/gdb701 and modified/src/gdb/testsuite/gdb.mi/gdb701 differ Binary files ./clean/src/gdb/testsuite/gdb.mi/gdb792 and modified/src/gdb/testsuite/gdb.mi/gdb792 differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi2-pthreads and modified/src/gdb/testsuite/gdb.mi/mi2-pthreads differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-console and modified/src/gdb/testsuite/gdb.mi/mi-console differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-pthreads and modified/src/gdb/testsuite/gdb.mi/mi-pthreads differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-read-memory and modified/src/gdb/testsuite/gdb.mi/mi-read-memory differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-stack and modified/src/gdb/testsuite/gdb.mi/mi-stack differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-syn-frame and modified/src/gdb/testsuite/gdb.mi/mi-syn-frame differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-var-child and modified/src/gdb/testsuite/gdb.mi/mi-var-child differ Binary files ./clean/src/gdb/testsuite/gdb.mi/mi-var-cp and modified/src/gdb/testsuite/gdb.mi/mi-var-cp differ Binary files ./clean/src/gdb/testsuite/gdb.mi/until and modified/src/gdb/testsuite/gdb.mi/until differ Binary files ./clean/src/gdb/testsuite/gdb.mi/var-cmd_bis and modified/src/gdb/testsuite/gdb.mi/var-cmd_bis differ Binary files ./clean/src/gdb/testsuite/gdb.server/server and modified/src/gdb/testsuite/gdb.server/server differ Binary files ./clean/src/gdb/testsuite/gdb.stabs/exclfwd and modified/src/gdb/testsuite/gdb.stabs/exclfwd differ Binary files ./clean/src/gdb/testsuite/gdb.threads/bp_in_thread and modified/src/gdb/testsuite/gdb.threads/bp_in_thread differ Binary files ./clean/src/gdb/testsuite/gdb.threads/gcore-pthreads and modified/src/gdb/testsuite/gdb.threads/gcore-pthreads differ Binary files ./clean/src/gdb/testsuite/gdb.threads/gcore.test and modified/src/gdb/testsuite/gdb.threads/gcore.test differ Binary files ./clean/src/gdb/testsuite/gdb.threads/killed and modified/src/gdb/testsuite/gdb.threads/killed differ Binary files ./clean/src/gdb/testsuite/gdb.threads/linux-dp and modified/src/gdb/testsuite/gdb.threads/linux-dp differ Binary files ./clean/src/gdb/testsuite/gdb.threads/manythreads and modified/src/gdb/testsuite/gdb.threads/manythreads differ Binary files ./clean/src/gdb/testsuite/gdb.threads/print-threads and modified/src/gdb/testsuite/gdb.threads/print-threads differ Binary files ./clean/src/gdb/testsuite/gdb.threads/pthread_cond_wait and modified/src/gdb/testsuite/gdb.threads/pthread_cond_wait differ Binary files ./clean/src/gdb/testsuite/gdb.threads/schedlock and modified/src/gdb/testsuite/gdb.threads/schedlock differ Binary files ./clean/src/gdb/testsuite/gdb.threads/sigthread and modified/src/gdb/testsuite/gdb.threads/sigthread differ Binary files ./clean/src/gdb/testsuite/gdb.threads/staticthreads and modified/src/gdb/testsuite/gdb.threads/staticthreads differ Binary files ./clean/src/gdb/testsuite/gdb.threads/switch-threads and modified/src/gdb/testsuite/gdb.threads/switch-threads differ Binary files ./clean/src/gdb/testsuite/gdb.threads/threadapply and modified/src/gdb/testsuite/gdb.threads/threadapply differ Binary files ./clean/src/gdb/testsuite/gdb.threads/thread_check and modified/src/gdb/testsuite/gdb.threads/thread_check differ Binary files ./clean/src/gdb/testsuite/gdb.threads/thread-specific and modified/src/gdb/testsuite/gdb.threads/thread-specific differ Binary files ./clean/src/gdb/testsuite/gdb.threads/tls and modified/src/gdb/testsuite/gdb.threads/tls differ Binary files ./clean/src/gdb/testsuite/gdb.threads/tls-main and modified/src/gdb/testsuite/gdb.threads/tls-main differ Binary files ./clean/src/gdb/testsuite/gdb.threads/tls-shared.so and modified/src/gdb/testsuite/gdb.threads/tls-shared.so differ Binary files ./clean/src/gdb/testsuite/gdb.threads/watchthreads and modified/src/gdb/testsuite/gdb.threads/watchthreads differ