From df60e12104932e6b4b920d3892b75eb2ee3ac502 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 13 Dec 2011 22:03:05 +0000 Subject: [PATCH] lto-streamer-out.c (write_symbol): Use proper 64-bit host type. * lto-streamer-out.c (write_symbol): Use proper 64-bit host type. * lto-cgraph.c (input_cgraph_opt_section): Use 'int' for offsets. * lto-streamer-in.c (lto_read_body): Likewise. (lto_input_toplevel_asms): Likewise. * lto-section-in.c (lto_create_simple_input_block): Likewise. * lto-opts.c (lto_read_file_options): Likewise. * ipa-prop.c (ipa_prop_read_section): Likewise. * df.h (DF_NOTE): Fix typo in comment. lto/ * lto.h (lto_parse_hex): Delete. * lto.c (lto_read_decls): Use 'int' for offsets. (lto_parse_hex): Make static and return proper 64-bit host type. (lto_resolution_read): Use proper 64-bit host type. From-SVN: r182311 --- gcc/ChangeLog | 12 ++++++++++++ gcc/df.h | 2 +- gcc/ipa-prop.c | 6 +++--- gcc/lto-cgraph.c | 6 +++--- gcc/lto-opts.c | 6 +++--- gcc/lto-section-in.c | 2 +- gcc/lto-streamer-in.c | 6 +++--- gcc/lto-streamer-out.c | 15 +++++---------- gcc/lto/ChangeLog | 7 +++++++ gcc/lto/lto.c | 24 ++++++++++++++---------- gcc/lto/lto.h | 2 -- 11 files changed, 52 insertions(+), 36 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 32f31498e0e7..d3757c50dbb7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2011-12-13 Eric Botcazou + + * lto-streamer-out.c (write_symbol): Use proper 64-bit host type. + * lto-cgraph.c (input_cgraph_opt_section): Use 'int' for offsets. + * lto-streamer-in.c (lto_read_body): Likewise. + (lto_input_toplevel_asms): Likewise. + * lto-section-in.c (lto_create_simple_input_block): Likewise. + * lto-opts.c (lto_read_file_options): Likewise. + * ipa-prop.c (ipa_prop_read_section): Likewise. + + * df.h (DF_NOTE): Fix typo in comment. + 2011-12-13 Andreas Krebbel * regmove.c (fixup_match_2): Only access call_used_regs with hard diff --git a/gcc/df.h b/gcc/df.h index 684b06db0693..f59b52582c16 100644 --- a/gcc/df.h +++ b/gcc/df.h @@ -53,7 +53,7 @@ union df_ref_d; #define DF_RD 3 /* Reaching Defs. */ #define DF_CHAIN 4 /* Def-Use and/or Use-Def Chains. */ #define DF_WORD_LR 5 /* Subreg tracking lr. */ -#define DF_NOTE 6 /* REG_DEF and REG_UNUSED notes. */ +#define DF_NOTE 6 /* REG_DEAD and REG_UNUSED notes. */ #define DF_MD 7 /* Multiple Definitions. */ #define DF_LAST_PROBLEM_PLUS1 (DF_MD + 1) diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index bb32ad8e88f1..f2a5759b0b55 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -2868,9 +2868,9 @@ ipa_prop_read_section (struct lto_file_decl_data *file_data, const char *data, { const struct lto_function_header *header = (const struct lto_function_header *) data; - const int32_t cfg_offset = sizeof (struct lto_function_header); - const int32_t main_offset = cfg_offset + header->cfg_size; - const int32_t string_offset = main_offset + header->main_size; + const int cfg_offset = sizeof (struct lto_function_header); + const int main_offset = cfg_offset + header->cfg_size; + const int string_offset = main_offset + header->main_size; struct data_in *data_in; struct lto_input_block ib_main; unsigned int i; diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c index a7f31fee9135..cc126169c686 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -1792,9 +1792,9 @@ input_cgraph_opt_section (struct lto_file_decl_data *file_data, { const struct lto_function_header *header = (const struct lto_function_header *) data; - const int32_t cfg_offset = sizeof (struct lto_function_header); - const int32_t main_offset = cfg_offset + header->cfg_size; - const int32_t string_offset = main_offset + header->main_size; + const int cfg_offset = sizeof (struct lto_function_header); + const int main_offset = cfg_offset + header->cfg_size; + const int string_offset = main_offset + header->main_size; struct data_in *data_in; struct lto_input_block ib_main; unsigned int i; diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c index 3f80e91b5b13..71a7067ce228 100644 --- a/gcc/lto-opts.c +++ b/gcc/lto-opts.c @@ -358,7 +358,7 @@ lto_read_file_options (struct lto_file_decl_data *file_data) size_t len, l, skip; const char *data, *p; const struct lto_simple_header *header; - int32_t opts_offset; + int opts_offset; struct lto_input_block ib; data = lto_get_section_data (file_data, LTO_section_opts, NULL, &len); @@ -379,10 +379,10 @@ lto_read_file_options (struct lto_file_decl_data *file_data) lto_check_version (header->lto_header.major_version, header->lto_header.minor_version); - + LTO_INIT_INPUT_BLOCK (ib, p + opts_offset, 0, header->main_size); input_options (&ib); - + skip = header->main_size + opts_offset; l -= skip; p += skip; diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c index bfa9c37b68ba..12ae4f1842b1 100644 --- a/gcc/lto-section-in.c +++ b/gcc/lto-section-in.c @@ -296,7 +296,7 @@ lto_create_simple_input_block (struct lto_file_decl_data *file_data, = (const struct lto_simple_header *) data; struct lto_input_block* ib_main; - int32_t main_offset = sizeof (struct lto_simple_header); + int main_offset = sizeof (struct lto_simple_header); if (!data) return NULL; diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 47837177bad2..5ef06abfb548 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -1366,9 +1366,9 @@ lto_read_body (struct lto_file_decl_data *file_data, tree fn_decl, { const struct lto_function_header *header; struct data_in *data_in; - int32_t cfg_offset; - int32_t main_offset; - int32_t string_offset; + int cfg_offset; + int main_offset; + int string_offset; struct lto_input_block ib_cfg; struct lto_input_block ib_main; diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index 3b90fdd68b53..4f5247afbf80 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -2408,7 +2408,7 @@ write_symbol (struct lto_streamer_cache_d *cache, enum gcc_plugin_symbol_kind kind; enum gcc_plugin_symbol_visibility visibility; int slot_num; - uint64_t size; + unsigned HOST_WIDEST_INT size; const char *comdat; unsigned char c; @@ -2466,7 +2466,7 @@ write_symbol (struct lto_streamer_cache_d *cache, when symbol has attribute (visibility("hidden")) specified. targetm.binds_local_p check DECL_VISIBILITY_SPECIFIED and gets this right. */ - + if (DECL_EXTERNAL (t) && !targetm.binds_local_p (t)) visibility = GCCPV_DEFAULT; @@ -2488,14 +2488,9 @@ write_symbol (struct lto_streamer_cache_d *cache, } if (kind == GCCPK_COMMON - && DECL_SIZE (t) - && TREE_CODE (DECL_SIZE (t)) == INTEGER_CST) - { - size = (HOST_BITS_PER_WIDE_INT >= 64) - ? (uint64_t) int_size_in_bytes (TREE_TYPE (t)) - : (((uint64_t) TREE_INT_CST_HIGH (DECL_SIZE_UNIT (t))) << 32) - | TREE_INT_CST_LOW (DECL_SIZE_UNIT (t)); - } + && DECL_SIZE_UNIT (t) + && TREE_CODE (DECL_SIZE_UNIT (t)) == INTEGER_CST) + size = TREE_INT_CST_LOW (DECL_SIZE_UNIT (t)); else size = 0; diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 7bb5b1129732..4f50139c87e3 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,10 @@ +2011-12-13 Eric Botcazou + + * lto.h (lto_parse_hex): Delete. + * lto.c (lto_read_decls): Use 'int' for offsets. + (lto_parse_hex): Make static and return proper 64-bit host type. + (lto_resolution_read): Use proper 64-bit host type. + 2011-10-26 Release Manager * GCC 4.6.2 released. diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index 4c832fb8a20a..3d699c4f84bc 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -198,7 +198,7 @@ lto_read_in_decl_state (struct data_in *data_in, const uint32_t *data, uint32_t ix; tree decl; uint32_t i, j; - + ix = *data++; decl = lto_streamer_cache_get (data_in->reader_cache, (int) ix); if (TREE_CODE (decl) != FUNCTION_DECL) @@ -241,9 +241,9 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data, VEC(ld_plugin_symbol_resolution_t,heap) *resolutions) { const struct lto_decl_header *header = (const struct lto_decl_header *) data; - const int32_t decl_offset = sizeof (struct lto_decl_header); - const int32_t main_offset = decl_offset + header->decl_state_size; - const int32_t string_offset = main_offset + header->main_size; + const int decl_offset = sizeof (struct lto_decl_header); + const int main_offset = decl_offset + header->decl_state_size; + const int string_offset = main_offset + header->main_size; struct lto_input_block ib_main; struct data_in *data_in; unsigned int i; @@ -291,17 +291,20 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data, if (data_ptr != data_end) internal_error ("bytecode stream: garbage at the end of symbols section"); - + /* Set the current decl state to be the global state. */ decl_data->current_decl_state = decl_data->global_decl_state; lto_data_in_delete (data_in); } -/* strtoll is not portable. */ -int64_t -lto_parse_hex (const char *p) { - uint64_t ret = 0; +/* Custom version of strtoll, which is not portable. */ + +static HOST_WIDEST_INT +lto_parse_hex (const char *p) +{ + HOST_WIDEST_INT ret = 0; + for (; *p != '\0'; ++p) { char c = *p; @@ -317,6 +320,7 @@ lto_parse_hex (const char *p) { internal_error ("could not parse hex number"); ret |= part; } + return ret; } @@ -352,7 +356,7 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file) { int t; char offset_p[17]; - int64_t offset; + HOST_WIDEST_INT offset; t = fscanf (resolution, "@0x%16s", offset_p); if (t != 1) internal_error ("could not parse file offset"); diff --git a/gcc/lto/lto.h b/gcc/lto/lto.h index 8110ace27497..e7236b6cbefa 100644 --- a/gcc/lto/lto.h +++ b/gcc/lto/lto.h @@ -60,6 +60,4 @@ struct lto_section_slot size_t len; }; -int64_t lto_parse_hex (const char *p); - #endif /* LTO_H */ -- 2.47.2