From e44c9a01679e444b29ef9d15bcb91b952d4c2876 Mon Sep 17 00:00:00 2001 From: Soren Sandmann Date: Sat, 26 Aug 2006 23:01:07 +0000 Subject: [PATCH] Update to new API 2006-08-26 Soren Sandmann * elfparser.c: Update to new API * binparser.h: Delete commented out declarations. Add new functions. * binparser.c: Delete ParserFrame, replace with one current offset. (convert_uint): Make static (bin_parser_get_uint): Delete this function (bin_parser_get_string): Change this function to use current offset instead of frame offset. (bin_parser_goto): New function (bin_parser_align): New function (bin_parser_get_uint32): New function (bin_parser_begin): Delete this function (bin_parser_end): Delete this function (bin_parser_index): Delete this function (bin_record_get_string_indirect): Make this function use _goto() instead of _begin()/_end() (bin_parser_get_offset): Make this function return current offset --- ChangeLog | 23 +++++++++++ binparser.c | 116 ++++++++++++++++++---------------------------------- binparser.h | 14 +++---- elfparser.c | 21 +++------- 4 files changed, 72 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0b3e93a..b8de03fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2006-08-26 Soren Sandmann + + * elfparser.c: Update to new API + + * binparser.h: Delete commented out declarations. Add new + functions. + + * binparser.c: Delete ParserFrame, replace with one current + offset. + (convert_uint): Make static + (bin_parser_get_uint): Delete this function + (bin_parser_get_string): Change this function to use current + offset instead of frame offset. + (bin_parser_goto): New function + (bin_parser_align): New function + (bin_parser_get_uint32): New function + (bin_parser_begin): Delete this function + (bin_parser_end): Delete this function + (bin_parser_index): Delete this function + (bin_record_get_string_indirect): Make this function use _goto() + instead of _begin()/_end() + (bin_parser_get_offset): Make this function return current offset + 2006-08-26 Soren Sandmann * binparser.[ch]: Add new struct BinRecord. Comment out functions diff --git a/binparser.c b/binparser.c index 9f2c2e07..56817dbf 100644 --- a/binparser.c +++ b/binparser.c @@ -6,15 +6,6 @@ typedef struct ParserFrame ParserFrame; -struct ParserFrame -{ - BinFormat * format; - int index; - gsize offset; - - ParserFrame * next; -}; - struct BinRecord { BinFormat * format; @@ -41,7 +32,7 @@ struct BinFormat struct BinParser { - ParserFrame * frame; + gsize offset; const guchar * data; gsize length; }; @@ -52,7 +43,7 @@ bin_parser_new (const guchar *data, { BinParser *parser = g_new0 (BinParser, 1); - parser->frame = NULL; + parser->offset = 0; parser->data = data; parser->length = length; @@ -173,7 +164,7 @@ get_field (BinFormat *format, return NULL; } -guint64 +static guint64 convert_uint (const guchar *data, gboolean big_endian, int width) @@ -225,37 +216,23 @@ convert_uint (const guchar *data, } } - -guint64 -bin_parser_get_uint (BinParser *parser, - const gchar *name) +guint32 +bin_parser_get_uint32 (BinParser *parser) { - const BinField *field; - const guint8 *pos; - BinFormat *format; - const guchar *data; + guint32 result; + + /* FIXME: This is broken for two reasons: + * + * (1) It assumes file_endian==machine_endian + * + * (2) It doesn't check for file overrun. + * + */ + result = *(guint32 *)(parser->data + parser->offset); - g_return_val_if_fail (parser->frame != NULL, 0); - - format = parser->frame->format; - data = parser->data + parser->frame->offset; + parser->offset += 4; - field = get_field (format, name); - - g_return_val_if_fail (field != NULL, (guint64)-1); - - pos = data + field->offset; - - if (field->offset + field->width > parser->length) - { - /* FIXME: generate error */ - return 0; - } - - return convert_uint (pos, format->big_endian, field->width); - - g_assert_not_reached(); - return 0; + return result; } static BinField * @@ -296,46 +273,29 @@ bin_field_new_uint64 (void) const gchar * bin_parser_get_string (BinParser *parser) { + const char *result; + /* FIXME: check that the string is within the file */ - return (gchar *)parser->data + parser->frame->offset; + + result = (const char *)parser->data + parser->offset; + + parser->offset += strlen (result) + 1; + + return result; } void -bin_parser_begin (BinParser *parser, - BinFormat *format, - gsize offset) +bin_parser_align (BinParser *parser, + gsize byte_width) { - ParserFrame *frame = g_new0 (ParserFrame, 1); - - frame->format = format; - frame->offset = offset; - frame->index = 0; - - frame->next = parser->frame; - parser->frame = frame; + parser->offset = align (parser->offset, 4); } void -bin_parser_end (BinParser *parser) +bin_parser_goto (BinParser *parser, + gsize offset) { - ParserFrame *frame; - - frame = parser->frame; - parser->frame = frame->next; - - g_free (frame); -} - -void -bin_parser_index (BinParser *parser, - int index) -{ - gsize format_size = bin_format_get_size (parser->frame->format); - - parser->frame->offset -= parser->frame->index * format_size; - parser->frame->offset += index * format_size; - - parser->frame->index = index; + parser->offset = offset; } BinParser * @@ -352,15 +312,18 @@ bin_record_get_string_indirect (BinRecord *record, BinParser *parser = record->parser; const char *result = NULL; gsize index; + gsize saved_offset; + + saved_offset = bin_parser_get_offset (record->parser); index = bin_record_get_uint (record, name); - bin_parser_begin (parser, record->format, str_table + index); + bin_parser_goto (record->parser, str_table + index); result = bin_parser_get_string (parser); - - bin_parser_end (record->parser); - + + bin_parser_goto (record->parser, saved_offset); + return result; } @@ -368,9 +331,8 @@ gsize bin_parser_get_offset (BinParser *parser) { g_return_val_if_fail (parser != NULL, 0); - g_return_val_if_fail (parser->frame != NULL, 0); - return parser->frame->offset; + return parser->offset; } const guchar * diff --git a/binparser.h b/binparser.h index 527d9be7..84df506c 100644 --- a/binparser.h +++ b/binparser.h @@ -11,16 +11,12 @@ BinParser *bin_parser_new (const guchar *data, const guchar *bin_parser_get_data (BinParser *parser); gsize bin_parser_get_length (BinParser *parser); gsize bin_parser_get_offset (BinParser *parser); -#if 0 -void bin_parser_index (BinParser *parser, int index); -void bin_parser_begin (BinParser *parser, - BinFormat *format, - gsize offset); -void bin_parser_end (BinParser *parser); -guint64 bin_parser_get_uint (BinParser *parser, - const gchar *name); -#endif +void bin_parser_align (BinParser *parser, + gsize byte_width); +void bin_parser_goto (BinParser *parser, + gsize offset); const char *bin_parser_get_string (BinParser *parser); +guint32 bin_parser_get_uint32 (BinParser *parser); /* Record */ BinRecord *bin_parser_get_record (BinParser *parser, diff --git a/elfparser.c b/elfparser.c index aa68c1b8..b6c0ca68 100644 --- a/elfparser.c +++ b/elfparser.c @@ -483,29 +483,18 @@ elf_parser_get_debug_link (ElfParser *parser, guint32 *crc32) { const Section *debug_link = find_section (parser, ".gnu_debuglink"); const gchar *result; - gsize crc_offset; if (!debug_link) return NULL; - bin_parser_begin (parser->parser, NULL, debug_link->offset); + bin_parser_goto (parser->parser, debug_link->offset); + result = bin_parser_get_string (parser->parser); - bin_parser_end (parser->parser); - crc_offset = strlen (result) + 1; - crc_offset = (crc_offset + 3) & ~3; + bin_parser_align (parser->parser, 4); - /* FIXME: This is broken for two reasons: - * - * (1) It assumes file_endian==machine_endian - * - * (2) It doesn't check for file overrun. - * - * The fix is to make binparser capable of dealing with stuff - * outside of records. - */ - - *crc32 = *(guint32 *)(result + crc_offset); + *crc32 = bin_parser_get_uint32 (parser->parser); + return result; }