--- Gnu-Mach/ddb/db_sym.h	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/ddb/db_sym.h	2020/09/02 04:48:17	1.1.1.3
@@ -28,6 +28,9 @@
  *	Date:	8/90
  */
 
+#ifndef	_DDB_DB_SYM_H_
+#define	_DDB_DB_SYM_H_
+
 #include <mach/boolean.h>
 #include <mach/machine/vm_types.h>
 #include <machine/db_machdep.h>
@@ -43,6 +46,7 @@ typedef struct {
 #define	SYMTAB_AOUT	0
 #define	SYMTAB_COFF	1
 #define	SYMTAB_MACHDEP	2
+#define	SYMTAB_ELF	3
 	char		*start;		/* symtab location */
 	char		*end;
 	char		*private;	/* optional machdep pointer */
@@ -115,78 +119,106 @@ extern void	db_symbol_values( db_symtab_
 /* find name&value given approx val */
 
 #define db_find_sym_and_offset(val,namep,offp)	\
-	db_symbol_values(0, db_search_symbol(val,DB_STGY_ANY,offp),namep,0)
+        do {								\
+	  db_sym_t	s;						\
+	  db_symbol_values(0, s = db_search_symbol(val,DB_STGY_ANY,offp) \
+			   ,namep,0);					\
+	  db_free_symbol(s);						\
+	} while(0);
+
 
 /* ditto, but no locals */
 #define db_find_xtrn_sym_and_offset(val,namep,offp)	\
-	db_symbol_values(0, db_search_symbol(val,DB_STGY_XTRN,offp),namep,0)
+        do {								\
+	  db_sym_t	s;						\
+	  db_symbol_values(0, s = db_search_symbol(val,DB_STGY_XTRN,offp) \
+			   ,namep,0);					\
+	  db_free_symbol(s);						\
+	} while(0);
 
 /* find name&value given approx val */
 
 #define db_find_task_sym_and_offset(val,namep,offp,task)	\
-	db_symbol_values(0, db_search_task_symbol(val,DB_STGY_ANY,offp,task),  \
-			 namep, 0)
+        do {								\
+	  db_sym_t	s;						\
+	  db_symbol_values(0, s = db_search_task_symbol(val,DB_STGY_ANY \
+							,offp,task),	\
+			   namep, 0);					\
+	  db_free_symbol(s);						\
+	} while(0);
 
 /* ditto, but no locals */
 #define db_find_xtrn_task_sym_and_offset(val,namep,offp,task)	\
-	db_symbol_values(0, db_search_task_symbol(val,DB_STGY_XTRN,offp,task), \
-			 namep,0)
+        do {								\
+	  db_sym_t	s;						\
+	  db_symbol_values(0, s = db_search_task_symbol(val,DB_STGY_XTRN \
+							,offp,task),	\
+			   namep,0);					\
+	  db_free_symbol(s);						\
+	} while(0);
 
 /* find symbol in current task */
 #define db_search_symbol(val,strgy,offp)	\
 	db_search_task_symbol(val,strgy,offp,0)
 
 /* strcmp, modulo leading char */
-extern boolean_t	db_eqname( char* src, char* dst, char c );
+extern boolean_t	db_eqname( const char* src, const char* dst, char c );
 
 /* print closest symbol to a value */
-extern void	db_task_printsym( db_expr_t off,
+extern void	db_task_printsym( db_addr_t off,
 				  db_strategy_t strategy,
 				  task_t task);
 
 /* print closest symbol to a value */
 extern void	db_printsym( db_expr_t off, db_strategy_t strategy);
 
+/* free a symbol */
+extern void db_free_symbol(db_sym_t s);
+
+
 /*
  * Symbol table switch, defines the interface
  * to symbol-table specific routines.
- * [NOTE: incomplete prototypes cuz broken compiler]
  */
 
 extern struct db_sym_switch {
 
 	boolean_t	(*init)(
-/*				char *start,
+				char *start,
 				char *end,
 				char *name,
 				char *task_addr
-*/				);
+				);
 
 	db_sym_t	(*lookup)(
-/*				db_symtab_t *stab,
+				db_symtab_t *stab,
 				char *symstr
-*/				);
+				);
 	db_sym_t	(*search_symbol)(
-/*				db_symtab_t *stab,
+				db_symtab_t *stab,
 				db_addr_t off,
 				db_strategy_t strategy,
 				db_expr_t *diffp
-*/				);
+				);
 
 	boolean_t	(*line_at_pc)(
-/*				db_symtab_t	*stab,
+				db_symtab_t	*stab,
 				db_sym_t	sym,
 				char		**file,
 				int		*line,
-				db_expr_t	pc
-*/				);
+				db_addr_t	pc
+				);
 
 	void		(*symbol_values)(
-/*				db_sym_t	sym,
+				db_symtab_t	*stab,
+				db_sym_t	sym,
 				char		**namep,
 				db_expr_t	*valuep
-*/				);
+				);
 
+	void		(*free_symbol)(
+				db_sym_t	sym
+				);
 } x_db[];
 
 #ifndef	symtab_type
@@ -197,4 +229,42 @@ extern struct db_sym_switch {
 #define	X_db_lookup(s,n)		x_db[(s)->type].lookup(s,n)
 #define	X_db_search_symbol(s,o,t,d)	x_db[(s)->type].search_symbol(s,o,t,d)
 #define	X_db_line_at_pc(s,p,f,l,a)	x_db[(s)->type].line_at_pc(s,p,f,l,a)
-#define	X_db_symbol_values(s,p,n,v)	x_db[(s)->type].symbol_values(p,n,v)
+#define	X_db_symbol_values(s,p,n,v)	x_db[(s)->type].symbol_values(s,p,n,v)
+#define	X_db_free_symbol(s,m)		x_db[(s)->type].free_symbol(m)
+
+extern boolean_t db_line_at_pc(
+	db_sym_t sym,
+	char **filename,
+	int *linenum,
+	db_addr_t pc);
+
+extern boolean_t aout_db_sym_init(
+	char *symtab,
+	char *esymtab,
+	char *name,
+	char *task_addr);
+
+extern boolean_t elf_db_sym_init (
+	unsigned shdr_num,
+	vm_size_t shdr_size,
+	vm_offset_t shdr_addr,
+	unsigned shdr_shndx,
+	char *name,
+	char *task_addr);
+
+db_sym_t	db_lookup(char *);
+
+db_sym_t
+db_search_in_task_symbol(
+	db_addr_t		val,
+	db_strategy_t		strategy,
+	db_addr_t		*offp,
+	task_t			task);
+
+extern db_sym_t
+db_sym_parse_and_lookup(
+	db_sym_t	(*func)(),
+	db_symtab_t	*symtab,
+	char		*symstr);
+
+#endif /* _DDB_DB_SYM_H_ */