From 412288f1c06565e8d6f96b835adc0aa915f28766 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Fri, 12 Aug 2011 12:42:13 -0400 Subject: data-streamer.h (streamer_write_zero): Rename from output_zero. * data-streamer.h (streamer_write_zero): Rename from output_zero. (streamer_write_uhwi): Rename from lto_output_uleb128. (streamer_write_hwi): Rename from output_sleb128. (streamer_write_string): Rename from lto_output_string. (streamer_string_index): Rename from lto_string_index. (streamer_write_string_with_length): Rename from lto_output_string_with_length. (streamer_write_uhwi_stream): Rename from lto_output_uleb128_stream. (streamer_write_hwi_stream): Rename from lto_output_sleb128_stream. (streamer_read_string): Rename from lto_input_string. (streamer_read_indexed_string): Rename from input_string_internal. (streamer_read_uhwi): Rename from lto_input_uleb128. (streamer_read_hwi): Rename from lto_input_sleb128. (streamer_write_hwi_in_range): Rename from lto_output_int_in_range. (streamer_read_hwi_in_range): Rename from lto_input_int_in_range. (streamer_write_enum): Rename from lto_output_enum. (streamer_read_enum): Rename from lto_input_enum. (streamer_write_record_start): Rename from output_record_start. (streamer_read_record_start): Rename from input_record_start. (streamer_write_bitpack): Rename from lto_output_bitpack. (streamer_read_bitpack): Rename from lto_input_bitpack. (streamer_write_char_stream): Rename from lto_output_1_stream. (streamer_read_uchar): Rename from lto_input_1_unsigned. * tree-streamer.h (streamer_cache_d): Rename from lto_streamer_cache_d. (streamer_handle_as_builtin_p): Rename from lto_stream_as_builtin_p. (streamer_read_string_cst): Rename from input_string_cst. (streamer_read_chain): Rename from lto_input_chain. (streamer_alloc_tree): Rename from lto_materialize_tree. (streamer_read_tree_body): Rename from lto_input_tree_pointers. (streamer_get_pickled_tree): Rename from lto_get_pickled_tree. (streamer_get_builtin_tree): Rename from lto_get_builtin_tree. (streamer_read_integer_cst): Rename from lto_input_integer_cst. (streamer_read_tree_bitfields): Rename from tree_read_bitfields. (streamer_write_chain): Rename from lto_output_chain. (streamer_write_tree_header): Rename from lto_output_tree_header. (streamer_pack_tree_bitfields): Rename from pack_value_fields. (streamer_write_tree_body): Rename from lto_output_tree_pointers. (streamer_write_integer_cst): Rename from lto_output_integer_cst. (streamer_write_builtin): Rename from lto_output_builtin_tree. (streamer_check_handled_ts_structures): Rename from check_handled_ts_structures. (streamer_tree_cache_insert): Rename from lto_streamer_cache_insert. (streamer_tree_cache_insert_at): Rename from lto_streamer_cache_insert_at. (streamer_tree_cache_append): Rename from lto_streamer_cache_append. (streamer_tree_cache_lookup): Rename from lto_streamer_cache_lookup. (streamer_tree_cache_get): Rename from lto_streamer_cache_get. (streamer_tree_cache_create): Rename from lto_streamer_cache_create. (streamer_tree_cache_delete): Rename from lto_streamer_cache_delete. * tree-streamer-out.c (write_string_cst): Rename from output_string_cst. (write_identifier): Rename from output_identifier. (write_ts_common_tree_pointers): Rename from lto_output_ts_common_tree_pointers. (write_ts_vector_tree_pointers): Rename from lto_output_ts_vector_tree_pointers. (write_ts_complex_tree_pointers): Rename from lto_output_ts_complex_tree_pointers. (write_ts_decl_minimal_tree_pointers): Rename from lto_output_ts_decl_minimal_tree_pointers. (write_ts_decl_common_tree_pointers): Rename from lto_output_ts_decl_common_tree_pointers. (write_ts_decl_non_common_tree_pointers): Rename from lto_output_ts_decl_non_common_tree_pointers. (write_ts_decl_with_vis_tree_pointers): Rename from lto_output_ts_decl_with_vis_tree_pointers. (write_ts_field_decl_tree_pointers): Rename from lto_output_ts_field_decl_tree_pointers. (write_ts_function_decl_tree_pointers): Rename from lto_output_ts_function_decl_tree_pointers. (write_ts_type_common_tree_pointers): Rename from lto_output_ts_type_common_tree_pointers. (write_ts_type_non_common_tree_pointers): Rename from lto_output_ts_type_non_common_tree_pointers. (write_ts_list_tree_pointers): Rename from lto_output_ts_list_tree_pointers. (write_ts_vec_tree_pointers): Rename from lto_output_ts_vec_tree_pointers. (write_ts_exp_tree_pointers): Rename from lto_output_ts_exp_tree_pointers. (write_ts_block_tree_pointers): Rename from lto_output_ts_block_tree_pointers. (write_ts_binfo_tree_pointers): Rename from lto_output_ts_binfo_tree_pointers. (write_ts_constructor_tree_pointers): Rename from lto_output_ts_constructor_tree_pointers. (write_ts_target_option): Rename from lto_output_ts_target_option. (write_ts_translation_unit_decl_tree_pointers): Rename from lto_output_ts_translation_unit_decl_tree_pointers. * tree-streamer.c (streamer_tree_cache_add_to_node_array): Rename from lto_streamer_cache_add_to_node_array. (streamer_tree_cache_insert_1): Rename from lto_streamer_cache_insert_1. (record_common_node): Rename from lto_record_common_node. * streamer-hooks.h (bitpack_d, lto_streamer_cache_d): Remove forward declarations. * data-streamer-in.c (lto_input_widest_uint_uleb128): Remove unused function. * data-streamer-out.c (lto_output_widest_uint_uleb128_stream): Remove unused function. * Makefile.in (lto-section-out.o): Add dependency on DATA_STREAMER_H. (ipa-reference.o): Likewise. * lto-section-out.c: Include data-streamer.h. * ipa-reference.c: Include data-streamer.h. From-SVN: r177704 --- gcc/data-streamer-out.c | 86 ++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 54 deletions(-) (limited to 'gcc/data-streamer-out.c') diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c index 07d5b35..98cbf22 100644 --- a/gcc/data-streamer-out.c +++ b/gcc/data-streamer-out.c @@ -32,8 +32,8 @@ along with GCC; see the file COPYING3. If not see duration of the OB and thus OB can keep pointer into it. */ unsigned -lto_string_index (struct output_block *ob, const char *s, unsigned int len, - bool persistent) +streamer_string_index (struct output_block *ob, const char *s, unsigned int len, + bool persistent) { struct string_slot **slot; struct string_slot s_slot; @@ -64,7 +64,7 @@ lto_string_index (struct output_block *ob, const char *s, unsigned int len, new_slot->len = len; new_slot->slot_num = start; *slot = new_slot; - lto_output_uleb128_stream (string_stream, len); + streamer_write_uhwi_stream (string_stream, len); lto_output_data_stream (string_stream, string, len); return start + 1; } @@ -83,15 +83,16 @@ lto_string_index (struct output_block *ob, const char *s, unsigned int len, duration of the OB and thus OB can keep pointer into it. */ void -lto_output_string_with_length (struct output_block *ob, - struct lto_output_stream *index_stream, - const char *s, unsigned int len, bool persistent) +streamer_write_string_with_length (struct output_block *ob, + struct lto_output_stream *index_stream, + const char *s, unsigned int len, + bool persistent) { if (s) - lto_output_uleb128_stream (index_stream, - lto_string_index (ob, s, len, persistent)); + streamer_write_uhwi_stream (index_stream, + streamer_string_index (ob, s, len, persistent)); else - lto_output_1_stream (index_stream, 0); + streamer_write_char_stream (index_stream, 0); } @@ -101,51 +102,51 @@ lto_output_string_with_length (struct output_block *ob, duration of the OB and thus OB can keep pointer into it. */ void -lto_output_string (struct output_block *ob, - struct lto_output_stream *index_stream, - const char *string, bool persistent) +streamer_write_string (struct output_block *ob, + struct lto_output_stream *index_stream, + const char *string, bool persistent) { if (string) - lto_output_string_with_length (ob, index_stream, string, - strlen (string) + 1, - persistent); + streamer_write_string_with_length (ob, index_stream, string, + strlen (string) + 1, + persistent); else - lto_output_1_stream (index_stream, 0); + streamer_write_char_stream (index_stream, 0); } /* Write a zero to the output stream. */ void -output_zero (struct output_block *ob) +streamer_write_zero (struct output_block *ob) { - lto_output_1_stream (ob->main_stream, 0); + streamer_write_char_stream (ob->main_stream, 0); } -/* Output an unsigned LEB128 quantity to OB->main_stream. */ +/* Write an unsigned HOST_WIDE_INT value WORK to OB->main_stream. */ void -output_uleb128 (struct output_block *ob, unsigned HOST_WIDE_INT work) +streamer_write_uhwi (struct output_block *ob, unsigned HOST_WIDE_INT work) { - lto_output_uleb128_stream (ob->main_stream, work); + streamer_write_uhwi_stream (ob->main_stream, work); } -/* Output a signed LEB128 quantity to OB->main_stream. */ +/* Write a HOST_WIDE_INT value WORK to OB->main_stream. */ void -output_sleb128 (struct output_block *ob, HOST_WIDE_INT work) +streamer_write_hwi (struct output_block *ob, HOST_WIDE_INT work) { - lto_output_sleb128_stream (ob->main_stream, work); + streamer_write_hwi_stream (ob->main_stream, work); } -/* Output an unsigned LEB128 quantity to OBS. */ +/* Write an unsigned HOST_WIDE_INT value WORK to OBS. */ void -lto_output_uleb128_stream (struct lto_output_stream *obs, - unsigned HOST_WIDE_INT work) +streamer_write_uhwi_stream (struct lto_output_stream *obs, + unsigned HOST_WIDE_INT work) { do { @@ -155,39 +156,16 @@ lto_output_uleb128_stream (struct lto_output_stream *obs, /* More bytes to follow. */ byte |= 0x80; - lto_output_1_stream (obs, byte); + streamer_write_char_stream (obs, byte); } while (work != 0); } -/* Identical to output_uleb128_stream above except using unsigned - HOST_WIDEST_INT type. For efficiency on host where unsigned HOST_WIDEST_INT - is not native, we only use this if we know that HOST_WIDE_INT is not wide - enough. */ +/* Write a HOST_WIDE_INT value WORK to OBS. */ void -lto_output_widest_uint_uleb128_stream (struct lto_output_stream *obs, - unsigned HOST_WIDEST_INT work) -{ - do - { - unsigned int byte = (work & 0x7f); - work >>= 7; - if (work != 0) - /* More bytes to follow. */ - byte |= 0x80; - - lto_output_1_stream (obs, byte); - } - while (work != 0); -} - - -/* Output a signed LEB128 quantity. */ - -void -lto_output_sleb128_stream (struct lto_output_stream *obs, HOST_WIDE_INT work) +streamer_write_hwi_stream (struct lto_output_stream *obs, HOST_WIDE_INT work) { int more, byte; @@ -201,7 +179,7 @@ lto_output_sleb128_stream (struct lto_output_stream *obs, HOST_WIDE_INT work) if (more) byte |= 0x80; - lto_output_1_stream (obs, byte); + streamer_write_char_stream (obs, byte); } while (more); } -- cgit v1.1