This patch looks up for GPC specific minimal symbols and assumes that if they are present, the executable was compiled by GPC. GPC used 'pascal_main_program' and now uses '_p__M0_main_program'.
Is there some other way to check that the program was really compiled by GPC? (Any C compiled program could have a 'pascal_main_program' function...)
Maybe by looking up some other symbol? I found 'GPC_init' as a possible candidate, but I am not sure that this symbol is defined for all versions of GPC, so I did not include it in the present RFC.
I tested the patch on Cygwin and it allows to use 'start' command and get directly at the right location.
This will also help to reduce the gap between GPC and FreePascal for the (not yet committed) gdb.pascal testsuite directory.
Any feedback from GPC users would be most helpful here.
Pierre Muller Pascal language maintainer.
ChangeLog entry:
2007-09-26 Pierre Muller muller@ics.u-strasbg.fr * p-lang.h (pascal_main_name): New function. p-lang.c (GPC_MAIN_PROGRAM_NAME_1, GPC_MAIN_PROGRAM_NAME_2): New char array constants corresponding to the two minimal symbols used by GPC compiler. (pascal_main_name): Try to find minimal symbol corresponding to the entry of GPC compiled programs. symtab.c (find_main_name): Try to find pascal specific main name by calling pascal_main_name.
$ cvs diff -up p-lang.h p-lang.c symtab.c Index: p-lang.h =================================================================== RCS file: /cvs/src/src/gdb/p-lang.h,v retrieving revision 1.12 diff -u -p -r1.12 p-lang.h --- p-lang.h 23 Aug 2007 18:08:36 -0000 1.12 +++ p-lang.h 26 Sep 2007 14:26:08 -0000 @@ -21,6 +21,8 @@
struct value;
+extern char *pascal_main_name (void); + extern int pascal_parse (void); /* Defined in p-exp.y */
$ Index: p-lang.c =================================================================== RCS file: /cvs/src/src/gdb/p-lang.c,v retrieving revision 1.33 diff -u -p -r1.33 p-lang.c --- p-lang.c 23 Sep 2007 16:25:05 -0000 1.33 +++ p-lang.c 26 Sep 2007 14:26:09 -0000 @@ -35,6 +35,43 @@ extern void _initialize_pascal_language (void);
+/* The name of the symbol used by GPC compiler. */ + +static const char GPC_MAIN_PROGRAM_NAME_1[] + = "pascal_main_program"; +static const char GPC_MAIN_PROGRAM_NAME_2[] + = "_p__M0_main_program"; + +char * +pascal_main_name (void) +{ + struct minimal_symbol *msym; + CORE_ADDR main_program_name_addr; + static char main_program_name[1024]; + + /* For GPC, main procedure s a special name. + . */ + + + msym = lookup_minimal_symbol (GPC_MAIN_PROGRAM_NAME_1, NULL, NULL); + + if (msym != NULL) + { + return (char *)GPC_MAIN_PROGRAM_NAME_1; + } + + msym = lookup_minimal_symbol (GPC_MAIN_PROGRAM_NAME_2, NULL, NULL); + + if (msym != NULL) + { + return (char *)GPC_MAIN_PROGRAM_NAME_2; + } + + /* The main procedure doesn't seem to be in GPC. + Thus default "main" should work. */ + return NULL; +} + /* Determines if type TYPE is a pascal string type. Returns 1 if the type is a known pascal type This function is used by p-valprint.c code to allow better string display. Index: symtab.c =================================================================== RCS file: /cvs/src/src/gdb/symtab.c,v retrieving revision 1.165 diff -u -p -r1.165 symtab.c --- symtab.c 24 Sep 2007 07:40:32 -0000 1.165 +++ symtab.c 26 Sep 2007 14:26:10 -0000 @@ -40,6 +40,7 @@ #include "filenames.h" /* for FILENAME_CMP */ #include "objc-lang.h" #include "ada-lang.h" +#include "p-lang.h"
#include "hashtab.h"
@@ -4151,6 +4152,13 @@ find_main_name (void) return; }
+ new_main_name = pascal_main_name (); + if (new_main_name != NULL) + { + set_main_name (new_main_name); + return; + } + /* The languages above didn't identify the name of the main procedure. Fallback to "main". */ set_main_name ("main");