From 6780dcde86b72d360dc07c759a371fc70bad5050 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Thu, 1 Jul 2004 21:34:02 +0000 Subject: [PATCH] 2004-07-01 Michael Snyder * win32-nat.c (core_dll_symbols_add): Re-indent a small section that seems to have gotten whacked out of line. --- gdb/ChangeLog | 7 +++- gdb/win32-nat.c | 104 +++++++++++++++++++++++----------------------- gdb/windows-nat.c | 104 +++++++++++++++++++++++----------------------- 3 files changed, 110 insertions(+), 105 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 54d969507b..941cb9089a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-07-01 Michael Snyder + + * win32-nat.c (core_dll_symbols_add): Re-indent a small section + that seems to have gotten whacked out of line. + 2004-07-01 Mark Kettenis * dbxread.c (process_one_symbol) [PCC_SOL_BROKEN]: Remove dead @@ -61,7 +66,7 @@ 2004-06-29 Corinna Vinschen * win32-nat.c (child_pid_to_exec_file): New function. - (init_child_ops): Add child_pid_to_exec_file as to_pid_to_exec_file + (init_child_ops): Add child_pid_to_exec_file as to_pid_to_exec_file functionality. 2004-06-28 Andrew Cagney diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index e1e865b587..cdaac2df2a 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -2267,65 +2267,65 @@ core_dll_symbols_add (char *dll_name, DWORD base_addr) } } - register_loaded_dll (dll_name, base_addr + 0x1000); - solib_symbols_add (dll_name, 0, (CORE_ADDR) base_addr + 0x1000); + register_loaded_dll (dll_name, base_addr + 0x1000); + solib_symbols_add (dll_name, 0, (CORE_ADDR) base_addr + 0x1000); - out: - return 1; - } + out: + return 1; +} - typedef struct - { - struct target_ops *target; - bfd_vma addr; - } map_code_section_args; +typedef struct +{ + struct target_ops *target; + bfd_vma addr; +} map_code_section_args; - static void - map_single_dll_code_section (bfd * abfd, asection * sect, void *obj) - { - int old; - int update_coreops; - struct section_table *new_target_sect_ptr; +static void +map_single_dll_code_section (bfd * abfd, asection * sect, void *obj) +{ + int old; + int update_coreops; + struct section_table *new_target_sect_ptr; - map_code_section_args *args = (map_code_section_args *) obj; - struct target_ops *target = args->target; - if (sect->flags & SEC_CODE) - { - update_coreops = core_ops.to_sections == target->to_sections; + map_code_section_args *args = (map_code_section_args *) obj; + struct target_ops *target = args->target; + if (sect->flags & SEC_CODE) + { + update_coreops = core_ops.to_sections == target->to_sections; - if (target->to_sections) - { - old = target->to_sections_end - target->to_sections; - target->to_sections = (struct section_table *) - xrealloc ((char *) target->to_sections, - (sizeof (struct section_table)) * (1 + old)); - } - else - { - old = 0; - target->to_sections = (struct section_table *) - xmalloc ((sizeof (struct section_table))); - } - target->to_sections_end = target->to_sections + (1 + old); + if (target->to_sections) + { + old = target->to_sections_end - target->to_sections; + target->to_sections = (struct section_table *) + xrealloc ((char *) target->to_sections, + (sizeof (struct section_table)) * (1 + old)); + } + else + { + old = 0; + target->to_sections = (struct section_table *) + xmalloc ((sizeof (struct section_table))); + } + target->to_sections_end = target->to_sections + (1 + old); - /* Update the to_sections field in the core_ops structure - if needed. */ - if (update_coreops) - { - core_ops.to_sections = target->to_sections; - core_ops.to_sections_end = target->to_sections_end; - } - new_target_sect_ptr = target->to_sections + old; - new_target_sect_ptr->addr = args->addr + bfd_section_vma (abfd, sect); - new_target_sect_ptr->endaddr = args->addr + bfd_section_vma (abfd, sect) + - bfd_section_size (abfd, sect);; - new_target_sect_ptr->the_bfd_section = sect; - new_target_sect_ptr->bfd = abfd; - } - } + /* Update the to_sections field in the core_ops structure + if needed. */ + if (update_coreops) + { + core_ops.to_sections = target->to_sections; + core_ops.to_sections_end = target->to_sections_end; + } + new_target_sect_ptr = target->to_sections + old; + new_target_sect_ptr->addr = args->addr + bfd_section_vma (abfd, sect); + new_target_sect_ptr->endaddr = args->addr + bfd_section_vma (abfd, sect) + + bfd_section_size (abfd, sect);; + new_target_sect_ptr->the_bfd_section = sect; + new_target_sect_ptr->bfd = abfd; + } +} - static int - dll_code_sections_add (const char *dll_name, int base_addr, struct target_ops *target) +static int +dll_code_sections_add (const char *dll_name, int base_addr, struct target_ops *target) { bfd *dll_bfd; map_code_section_args map_args; diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index e1e865b587..cdaac2df2a 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2267,65 +2267,65 @@ core_dll_symbols_add (char *dll_name, DWORD base_addr) } } - register_loaded_dll (dll_name, base_addr + 0x1000); - solib_symbols_add (dll_name, 0, (CORE_ADDR) base_addr + 0x1000); + register_loaded_dll (dll_name, base_addr + 0x1000); + solib_symbols_add (dll_name, 0, (CORE_ADDR) base_addr + 0x1000); - out: - return 1; - } + out: + return 1; +} - typedef struct - { - struct target_ops *target; - bfd_vma addr; - } map_code_section_args; +typedef struct +{ + struct target_ops *target; + bfd_vma addr; +} map_code_section_args; - static void - map_single_dll_code_section (bfd * abfd, asection * sect, void *obj) - { - int old; - int update_coreops; - struct section_table *new_target_sect_ptr; +static void +map_single_dll_code_section (bfd * abfd, asection * sect, void *obj) +{ + int old; + int update_coreops; + struct section_table *new_target_sect_ptr; - map_code_section_args *args = (map_code_section_args *) obj; - struct target_ops *target = args->target; - if (sect->flags & SEC_CODE) - { - update_coreops = core_ops.to_sections == target->to_sections; + map_code_section_args *args = (map_code_section_args *) obj; + struct target_ops *target = args->target; + if (sect->flags & SEC_CODE) + { + update_coreops = core_ops.to_sections == target->to_sections; - if (target->to_sections) - { - old = target->to_sections_end - target->to_sections; - target->to_sections = (struct section_table *) - xrealloc ((char *) target->to_sections, - (sizeof (struct section_table)) * (1 + old)); - } - else - { - old = 0; - target->to_sections = (struct section_table *) - xmalloc ((sizeof (struct section_table))); - } - target->to_sections_end = target->to_sections + (1 + old); + if (target->to_sections) + { + old = target->to_sections_end - target->to_sections; + target->to_sections = (struct section_table *) + xrealloc ((char *) target->to_sections, + (sizeof (struct section_table)) * (1 + old)); + } + else + { + old = 0; + target->to_sections = (struct section_table *) + xmalloc ((sizeof (struct section_table))); + } + target->to_sections_end = target->to_sections + (1 + old); - /* Update the to_sections field in the core_ops structure - if needed. */ - if (update_coreops) - { - core_ops.to_sections = target->to_sections; - core_ops.to_sections_end = target->to_sections_end; - } - new_target_sect_ptr = target->to_sections + old; - new_target_sect_ptr->addr = args->addr + bfd_section_vma (abfd, sect); - new_target_sect_ptr->endaddr = args->addr + bfd_section_vma (abfd, sect) + - bfd_section_size (abfd, sect);; - new_target_sect_ptr->the_bfd_section = sect; - new_target_sect_ptr->bfd = abfd; - } - } + /* Update the to_sections field in the core_ops structure + if needed. */ + if (update_coreops) + { + core_ops.to_sections = target->to_sections; + core_ops.to_sections_end = target->to_sections_end; + } + new_target_sect_ptr = target->to_sections + old; + new_target_sect_ptr->addr = args->addr + bfd_section_vma (abfd, sect); + new_target_sect_ptr->endaddr = args->addr + bfd_section_vma (abfd, sect) + + bfd_section_size (abfd, sect);; + new_target_sect_ptr->the_bfd_section = sect; + new_target_sect_ptr->bfd = abfd; + } +} - static int - dll_code_sections_add (const char *dll_name, int base_addr, struct target_ops *target) +static int +dll_code_sections_add (const char *dll_name, int base_addr, struct target_ops *target) { bfd *dll_bfd; map_code_section_args map_args;