Commit 9e916de7 by Tristan Gingold Committed by Tristan Gingold

unwind-ia64.h: Declare unw_word and unw_sword.

2012-03-26  Tristan Gingold  <gingold@adacore.com>

        * config/ia64/unwind-ia64.h: Declare unw_word and unw_sword.
        (unw_table_entry): Use unw_word instead of unsigned long.
        (_Unwind_FindTableEntry): Likewise.
        * config/ia64/fde-glibc.c (_Unwind_FindTableEntry): Likewise.
        * config/ia64/fde-vms.c (vms_unwtable_entry): Likewise.
        (_Unwind_FindTableEntry): Likewise.
        * config/ia64/unwind-ia64.c (unw_reg_info, unw_reg_state)
        (unw_labeled_state, unw_state_record, unw_stack, _Uwind_Context)
        (set_reg, alloc_spill_area, finish_prologue, ia64_rse_slot_num)
        (ia64_rse_is_rnat_slot, ia64_rse_rnat_addr, ia64_rse_num_regs)
        (ia64_rse_skip_regs, ia64_copy_rbs, unw_access_gr)
        (uw_frame_state_for, uw_update_reg_address, uw_update_context)
        (uw_init_context_1, uw_install_context): Likewise.
        (unw_word): Move to unwind-ia64.h

From-SVN: r185852
parent 2283164d
2012-03-26 Tristan Gingold <gingold@adacore.com>
* config/ia64/unwind-ia64.h: Declare unw_word and unw_sword.
(unw_table_entry): Use unw_word instead of unsigned long.
(_Unwind_FindTableEntry): Likewise.
* config/ia64/fde-glibc.c (_Unwind_FindTableEntry): Likewise.
* config/ia64/fde-vms.c (vms_unwtable_entry): Likewise.
(_Unwind_FindTableEntry): Likewise.
* config/ia64/unwind-ia64.c (unw_reg_info, unw_reg_state)
(unw_labeled_state, unw_state_record, unw_stack, _Uwind_Context)
(set_reg, alloc_spill_area, finish_prologue, ia64_rse_slot_num)
(ia64_rse_is_rnat_slot, ia64_rse_rnat_addr, ia64_rse_num_regs)
(ia64_rse_skip_regs, ia64_copy_rbs, unw_access_gr)
(uw_frame_state_for, uw_update_reg_address, uw_update_context)
(uw_init_context_1, uw_install_context): Likewise.
(unw_word): Move to unwind-ia64.h
2012-03-26 Tristan Gingold <gingold@adacore.com>
* config/vms/vms-ucrt0.c: Update copyright years.
Add a sanity check.
(___gcc_main_flags): Declare.
......
......@@ -144,8 +144,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
containing PC. */
struct unw_table_entry *
_Unwind_FindTableEntry (void *pc, unsigned long *segment_base,
unsigned long *gp,
_Unwind_FindTableEntry (void *pc, unw_word *segment_base, unw_word *gp,
struct unw_table_entry *ent ATTRIBUTE_UNUSED)
{
struct unw_ia64_callback_data data;
......
......@@ -35,8 +35,7 @@
#include <stdio.h>
#include "unwind-ia64.h"
#define __int64 long
#include <vms/ossddef.h>
#include <ossddef.h>
#ifndef SS$_NORMAL
#define SS$_NORMAL 1
#endif
......@@ -45,10 +44,10 @@
typedef struct
{
unsigned long start_offset;
unsigned long end_offset;
unsigned long info_offset;
unsigned long gp_value;
unw_word start_offset;
unw_word end_offset;
unw_word info_offset;
unw_word gp_value;
} vms_unw_table_entry;
typedef unsigned long long uqword;
......@@ -133,8 +132,8 @@ force_fallback_processing_for (void * pc, vms_unw_table_entry * entry)
calls for fallback processing. */
struct unw_table_entry *
_Unwind_FindTableEntry (void *pc, unsigned long *segment_base,
unsigned long *gp, struct unw_table_entry *ent)
_Unwind_FindTableEntry (void *pc, unw_word *segment_base,
unw_word *gp, struct unw_table_entry *ent)
{
vms_unw_table_entry vueblock;
......
......@@ -18,11 +18,20 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#ifdef __VMS__
/* On VMS, long is a 32 bit type. */
typedef unsigned long long unw_word;
typedef long long unw_sword;
#else
typedef unsigned long unw_word;
typedef long unw_sword;
#endif
struct unw_table_entry
{
unsigned long start_offset;
unsigned long end_offset;
unsigned long info_offset;
unw_word start_offset;
unw_word end_offset;
unw_word info_offset;
};
/* Accessors to fields of an unwind info block header. In this common file to
......@@ -38,6 +47,6 @@ struct unw_table_entry
#endif
extern struct unw_table_entry *
_Unwind_FindTableEntry (void *pc, unsigned long *segment_base,
unsigned long *gp, struct unw_table_entry *ent)
_Unwind_FindTableEntry (void *pc, unw_word *segment_base,
unw_word *gp, struct unw_table_entry *ent)
__attribute__ ((__visibility__ ("hidden")));
......@@ -22,12 +22,11 @@
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
#include <vms/libicb.h>
#include <vms/chfdef.h>
#include <vms/chfctxdef.h>
#define __int64 long long
#include <vms/intstkdef.h>
#define __NEW_STARLET
#include <libicb.h>
#include <chfdef.h>
#include <lib_c/chfctxdef.h>
#include <lib_c/intstkdef.h>
#include <stdio.h>
#include <string.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment