Skip to content

R
riscv-gcc-1
Commit 207c68cd by Richard Biener Committed by Richard Biener
Options

lto-streamer.h (struct lto_input_block): Make it a class with a constructor. 

2014-08-08  Richard Biener  <rguenther@suse.de>

	* lto-streamer.h (struct lto_input_block): Make it a class
	with a constructor.
	(LTO_INIT_INPUT_BLOCK, LTO_INIT_INPUT_BLOCK_PTR): Remove.
	(struct lto_function_header, struct lto_simple_header,
	struct lto_simple_header_with_strings,
	struct lto_decl_header, struct lto_function_header): Make
	a simple inheritance hieararchy.  Remove unused fields.
	(struct lto_asm_header): Remove.
	* lto-streamer-out.c (produce_asm): Adjust.
	(lto_output_toplevel_asms): Likewise.
	(produce_asm_for_decls): Likewise.
	* lto-section-out.c (lto_destroy_simple_output_block): Likewise.
	* data-streamer-in.c (string_for_index): Likewise.
	* ipa-inline-analysis.c (inline_read_section): Likewise.
	* ipa-prop.c (ipa_prop_read_section): Likewise.
	(read_replacements_section): Likewise.
	* lto-cgraph.c (input_cgraph_opt_section): Likewise.
	* lto-section-in.c (lto_create_simple_input_block): Likewise.
	(lto_destroy_simple_input_block): Likewise.
	* lto-streamer-in.c (lto_read_body_or_constructor): Likewise.
	(lto_input_toplevel_asms): Likewise.

	lto/
	* lto.c (lto_read_decls): Adjust for lto_input_block changes.

From-SVN: r213759
parent 07165dd7
Showing with 77 additions and 132 deletions
gcc/ChangeLog
2014-08-08 Richard Biener <rguenther@suse.de>
* lto-streamer.h (struct lto_input_block): Make it a class
with a constructor.
(LTO_INIT_INPUT_BLOCK, LTO_INIT_INPUT_BLOCK_PTR): Remove.
(struct lto_function_header, struct lto_simple_header,
struct lto_simple_header_with_strings,
struct lto_decl_header, struct lto_function_header): Make
a simple inheritance hieararchy. Remove unused fields.
(struct lto_asm_header): Remove.
* lto-streamer-out.c (produce_asm): Adjust.
(lto_output_toplevel_asms): Likewise.
(produce_asm_for_decls): Likewise.
* lto-section-out.c (lto_destroy_simple_output_block): Likewise.
* data-streamer-in.c (string_for_index): Likewise.
* ipa-inline-analysis.c (inline_read_section): Likewise.
* ipa-prop.c (ipa_prop_read_section): Likewise.
(read_replacements_section): Likewise.
* lto-cgraph.c (input_cgraph_opt_section): Likewise.
* lto-section-in.c (lto_create_simple_input_block): Likewise.
(lto_destroy_simple_input_block): Likewise.
* lto-streamer-in.c (lto_read_body_or_constructor): Likewise.
(lto_input_toplevel_asms): Likewise.
2014-08-08 Alexander Ivchenko <alexander.ivchenko@intel.com>
Maxim Kuznetsov <maxim.kuznetsov@intel.com>
Anna Tikhonova <anna.tikhonova@intel.com>
......
gcc/data-streamer-in.c
......@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
const char *
string_for_index (struct data_in *data_in, unsigned int loc, unsigned int *rlen)
{
struct lto_input_block str_tab;
unsigned int len;
const char *result;
......@@ -50,8 +49,7 @@ string_for_index (struct data_in *data_in, unsigned int loc, unsigned int *rlen)
}
/* Get the string stored at location LOC in DATA_IN->STRINGS. */
LTO_INIT_INPUT_BLOCK (str_tab, data_in->strings, loc - 1,
data_in->strings_len);
lto_input_block str_tab (data_in->strings, loc - 1, data_in->strings_len);
len = streamer_read_uhwi (&str_tab);
*rlen = len;
......
gcc/ipa-inline-analysis.c
......@@ -4086,12 +4086,10 @@ inline_read_section (struct lto_file_decl_data *file_data, const char *data,
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;
unsigned int i, count2, j;
unsigned int f_count;
LTO_INIT_INPUT_BLOCK (ib, (const char *) data + main_offset, 0,
header->main_size);
lto_input_block ib ((const char *) data + main_offset, header->main_size);
data_in =
lto_data_in_create (file_data, (const char *) data + string_offset,
......
gcc/ipa-prop.c
......@@ -4930,11 +4930,10 @@ ipa_prop_read_section (struct lto_file_decl_data *file_data, const char *data,
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;
unsigned int count;
LTO_INIT_INPUT_BLOCK (ib_main, (const char *) data + main_offset, 0,
lto_input_block ib_main ((const char *) data + main_offset,
header->main_size);
data_in =
......@@ -5108,11 +5107,10 @@ read_replacements_section (struct lto_file_decl_data *file_data,
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;
unsigned int count;
LTO_INIT_INPUT_BLOCK (ib_main, (const char *) data + main_offset, 0,
lto_input_block ib_main ((const char *) data + main_offset,
header->main_size);
data_in = lto_data_in_create (file_data, (const char *) data + string_offset,
......
gcc/lto-cgraph.c
......@@ -1896,11 +1896,10 @@ input_cgraph_opt_section (struct lto_file_decl_data *file_data,
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;
unsigned int count;
LTO_INIT_INPUT_BLOCK (ib_main, (const char *) data + main_offset, 0,
lto_input_block ib_main ((const char *) data + main_offset,
header->main_size);
data_in =
......
gcc/lto-section-in.c
......@@ -227,19 +227,13 @@ lto_create_simple_input_block (struct lto_file_decl_data *file_data,
const struct lto_simple_header * header
= (const struct lto_simple_header *) data;
struct lto_input_block* ib_main;
int main_offset = sizeof (struct lto_simple_header);
if (!data)
return NULL;
ib_main = XNEW (struct lto_input_block);
*datar = data;
LTO_INIT_INPUT_BLOCK_PTR (ib_main, data + main_offset,
0, header->main_size);
return ib_main;
return new lto_input_block (data + main_offset, header->main_size);
}
......@@ -255,7 +249,7 @@ lto_destroy_simple_input_block (struct lto_file_decl_data *file_data,
struct lto_input_block *ib,
const char *data, size_t len)
{
free (ib);
delete ib;
lto_free_section_data (file_data, section_type, NULL, data, len);
}
......
gcc/lto-section-out.c
......@@ -278,9 +278,8 @@ lto_destroy_simple_output_block (struct lto_simple_output_block *ob)
/* Write the header which says how to decode the pieces of the
t. */
memset (&header, 0, sizeof (struct lto_simple_header));
header.lto_header.major_version = LTO_major_version;
header.lto_header.minor_version = LTO_minor_version;
header.compressed_size = 0;
header.major_version = LTO_major_version;
header.minor_version = LTO_minor_version;
header.main_size = ob->main_stream->total_size;
lto_write_data (&header, sizeof header);
......
gcc/lto-streamer-in.c
......@@ -1054,8 +1054,6 @@ lto_read_body_or_constructor (struct lto_file_decl_data *file_data, struct symta
int cfg_offset;
int main_offset;
int string_offset;
struct lto_input_block ib_cfg;
struct lto_input_block ib_main;
tree fn_decl = node->decl;
header = (const struct lto_function_header *) data;
......@@ -1064,26 +1062,11 @@ lto_read_body_or_constructor (struct lto_file_decl_data *file_data, struct symta
cfg_offset = sizeof (struct lto_function_header);
main_offset = cfg_offset + header->cfg_size;
string_offset = main_offset + header->main_size;
LTO_INIT_INPUT_BLOCK (ib_cfg,
data + cfg_offset,
0,
header->cfg_size);
LTO_INIT_INPUT_BLOCK (ib_main,
data + main_offset,
0,
header->main_size);
}
else
{
main_offset = sizeof (struct lto_function_header);
string_offset = main_offset + header->main_size;
LTO_INIT_INPUT_BLOCK (ib_main,
data + main_offset,
0,
header->main_size);
}
data_in = lto_data_in_create (file_data, data + string_offset,
......@@ -1104,8 +1087,12 @@ lto_read_body_or_constructor (struct lto_file_decl_data *file_data, struct symta
/* Set up the struct function. */
from = data_in->reader_cache->nodes.length ();
lto_input_block ib_main (data + main_offset, header->main_size);
if (TREE_CODE (node->decl) == FUNCTION_DECL)
{
lto_input_block ib_cfg (data + cfg_offset, header->cfg_size);
input_function (fn_decl, data_in, &ib_main, &ib_cfg);
}
else
input_constructor (fn_decl, data_in, &ib_main);
/* And fixup types we streamed locally. */
......@@ -1357,10 +1344,10 @@ lto_input_toplevel_asms (struct lto_file_decl_data *file_data, int order_base)
size_t len;
const char *data = lto_get_section_data (file_data, LTO_section_asm,
NULL, &len);
const struct lto_asm_header *header = (const struct lto_asm_header *) data;
const struct lto_simple_header_with_strings *header
= (const struct lto_simple_header_with_strings *) data;
int string_offset;
struct data_in *data_in;
struct lto_input_block ib;
tree str;
if (! data)
......@@ -1368,10 +1355,7 @@ lto_input_toplevel_asms (struct lto_file_decl_data *file_data, int order_base)
string_offset = sizeof (*header) + header->main_size;
LTO_INIT_INPUT_BLOCK (ib,
data + sizeof (*header),
0,
header->main_size);
lto_input_block ib (data + sizeof (*header), header->main_size);
data_in = lto_data_in_create (file_data, data + string_offset,
header->string_size, vNULL);
......
gcc/lto-streamer-out.c
......@@ -1886,10 +1886,8 @@ produce_asm (struct output_block *ob, tree fn)
memset (&header, 0, sizeof (struct lto_function_header));
/* Write the header. */
header.lto_header.major_version = LTO_major_version;
header.lto_header.minor_version = LTO_minor_version;
header.compressed_size = 0;
header.major_version = LTO_major_version;
header.minor_version = LTO_minor_version;
if (section_type == LTO_section_function_body)
header.cfg_size = ob->cfg_stream->total_size;
......@@ -2097,7 +2095,7 @@ lto_output_toplevel_asms (void)
struct output_block *ob;
struct asm_node *can;
char *section_name;
struct lto_asm_header header;
struct lto_simple_header_with_strings header;
if (! asm_nodes)
return;
......@@ -2123,8 +2121,8 @@ lto_output_toplevel_asms (void)
memset (&header, 0, sizeof (header));
/* Write the header. */
header.lto_header.major_version = LTO_major_version;
header.lto_header.minor_version = LTO_minor_version;
header.major_version = LTO_major_version;
header.minor_version = LTO_minor_version;
header.main_size = ob->main_stream->total_size;
header.string_size = ob->string_stream->total_size;
......@@ -2657,8 +2655,8 @@ produce_asm_for_decls (void)
lto_output_decl_state_streams (ob, fn_out_state);
}
header.lto_header.major_version = LTO_major_version;
header.lto_header.minor_version = LTO_minor_version;
header.major_version = LTO_major_version;
header.minor_version = LTO_minor_version;
/* Currently not used. This field would allow us to preallocate
the globals vector, so that it need not be resized as it is extended. */
......
gcc/lto-streamer.h
......@@ -307,27 +307,21 @@ typedef void (lto_free_section_data_f) (struct lto_file_decl_data *,
size_t);
/* Structure used as buffer for reading an LTO file. */
struct lto_input_block
class lto_input_block
{
public:
/* Special constructor for the string table, it abuses this to
do random access but use the uhwi decoder. */
lto_input_block (const char *data_, unsigned int p_, unsigned int len_)
: data (data_), p (p_), len (len_) {}
lto_input_block (const char *data_, unsigned int len_)
: data (data_), p (0), len (len_) {}
const char *data;
unsigned int p;
unsigned int len;
};
#define LTO_INIT_INPUT_BLOCK(BASE,D,P,L) \
do { \
BASE.data = D; \
BASE.p = P; \
BASE.len = L; \
} while (0)
#define LTO_INIT_INPUT_BLOCK_PTR(BASE,D,P,L) \
do { \
BASE->data = D; \
BASE->p = P; \
BASE->len = L; \
} while (0)
/* The is the first part of the record for a function or constructor
in the .o file. */
......@@ -337,27 +331,16 @@ struct lto_header
int16_t minor_version;
};
/* The header for a function body. */
struct lto_function_header
/* The is the first part of the record in an LTO file for many of the
IPA passes. */
struct lto_simple_header : lto_header
{
/* The header for all types of sections. */
struct lto_header lto_header;
/* Number of labels with names. */
int32_t num_named_labels;
/* Number of labels without names. */
int32_t num_unnamed_labels;
/* Size compressed or 0 if not compressed. */
int32_t compressed_size;
/* Size of names for named labels. */
int32_t named_label_size;
/* Size of the cfg. */
int32_t cfg_size;
/* Size of main gimple body of function. */
int32_t main_size;
};
struct lto_simple_header_with_strings : lto_simple_header
{
/* Size of main gimple body of function. */
int32_t main_size;
......@@ -365,41 +348,22 @@ struct lto_function_header
int32_t string_size;
};
/* The header for a function body. */
struct lto_function_header : lto_simple_header_with_strings
{
/* Size of the cfg. */
int32_t cfg_size;
};
/* Structure describing a symbol section. */
struct lto_decl_header
struct lto_decl_header : lto_simple_header_with_strings
{
/* The header for all types of sections. */
struct lto_header lto_header;
/* Size of region for decl state. */
int32_t decl_state_size;
/* Number of nodes in globals stream. */
int32_t num_nodes;
/* Size of region for expressions, decls, types, etc. */
int32_t main_size;
/* Size of the string table. */
int32_t string_size;
};
/* Structure describing top level asm()s. */
struct lto_asm_header
{
/* The header for all types of sections. */
struct lto_header lto_header;
/* Size compressed or 0 if not compressed. */
int32_t compressed_size;
/* Size of region for expressions, decls, types, etc. */
int32_t main_size;
/* Size of the string table. */
int32_t string_size;
};
......@@ -595,20 +559,6 @@ struct lto_output_stream
unsigned int total_size;
};
/* The is the first part of the record in an LTO file for many of the
IPA passes. */
struct lto_simple_header
{
/* The header for all types of sections. */
struct lto_header lto_header;
/* Size of main gimple body of function. */
int32_t main_size;
/* Size of main stream when compressed. */
int32_t compressed_size;
};
/* A simple output block. This can be used for simple IPA passes that
do not need more than one stream. */
struct lto_simple_output_block
......
gcc/lto/ChangeLog
2014-08-08 Richard Biener <rguenther@suse.de>
* lto.c (lto_read_decls): Adjust for lto_input_block changes.
2014-08-08 Bin Cheng <bin.cheng@arm.com>
PR lto/62032
......
gcc/lto/lto.c
......@@ -1844,13 +1844,12 @@ lto_read_decls (struct lto_file_decl_data *decl_data, const void *data,
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;
const uint32_t *data_ptr, *data_end;
uint32_t num_decl_states;
LTO_INIT_INPUT_BLOCK (ib_main, (const char *) data + main_offset, 0,
lto_input_block ib_main ((const char *) data + main_offset,
header->main_size);
data_in = lto_data_in_create (decl_data, (const char *) data + string_offset,
......
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