projects
/
platform
/
upstream
/
gcc48.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused files
[platform/upstream/gcc48.git]
/
gcc
/
sel-sched-dump.c
diff --git
a/gcc/sel-sched-dump.c
b/gcc/sel-sched-dump.c
index
27b06ad
..
0dafe49
100644
(file)
--- a/
gcc/sel-sched-dump.c
+++ b/
gcc/sel-sched-dump.c
@@
-1,5
+1,5
@@
/* Instruction scheduling pass. Log dumping infrastructure.
/* Instruction scheduling pass. Log dumping infrastructure.
- Copyright (C) 2006
, 2007, 2008, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2006
-2013
Free Software Foundation, Inc.
This file is part of GCC.
This file is part of GCC.
@@
-31,7
+31,6
@@
along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "insn-attr.h"
#include "params.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "params.h"
-#include "output.h"
#include "basic-block.h"
#include "cselib.h"
#include "target.h"
#include "basic-block.h"
#include "cselib.h"
#include "target.h"
@@
-92,7
+91,7
@@
restore_dump (void)
/* Functions for dumping instructions, av sets, and exprs. */
/* Default flags for dumping insns. */
/* Functions for dumping instructions, av sets, and exprs. */
/* Default flags for dumping insns. */
-static int dump_insn_rtx_flags = DUMP_INSN_RTX_PATTERN;
+static int dump_insn_rtx_flags = DUMP_INSN_RTX_
UID | DUMP_INSN_RTX_
PATTERN;
/* Default flags for dumping vinsns. */
static int dump_vinsn_flags = (DUMP_VINSN_INSN_RTX | DUMP_VINSN_TYPE
/* Default flags for dumping vinsns. */
static int dump_vinsn_flags = (DUMP_VINSN_INSN_RTX | DUMP_VINSN_TYPE
@@
-137,12
+136,7
@@
dump_insn_rtx_1 (rtx insn, int flags)
sel_print ("%d;", INSN_UID (insn));
if (flags & DUMP_INSN_RTX_PATTERN)
sel_print ("%d;", INSN_UID (insn));
if (flags & DUMP_INSN_RTX_PATTERN)
- {
- char buf[2048];
-
- print_insn (buf, insn, 0);
- sel_print ("%s;", buf);
- }
+ sel_print ("%s;", str_pattern_slim (PATTERN (insn)));
if (flags & DUMP_INSN_RTX_BBN)
{
if (flags & DUMP_INSN_RTX_BBN)
{
@@
-466,7
+460,7
@@
dump_insn_vector (rtx_vec_t succs)
int i;
rtx succ;
int i;
rtx succ;
- FOR_EACH_VEC_ELT (
rtx,
succs, i, succ)
+ FOR_EACH_VEC_ELT (succs, i, succ)
if (succ)
dump_insn (succ);
else
if (succ)
dump_insn (succ);
else
@@
-503,7
+497,7
@@
sel_print_insn (const_rtx insn, int aligned ATTRIBUTE_UNUSED)
/* '+' before insn means it is a new cycle start and it's not been
scheduled yet. '>' - has been scheduled. */
/* '+' before insn means it is a new cycle start and it's not been
scheduled yet. '>' - has been scheduled. */
- if (s_i_d && INSN_LUID (insn) > 0)
+ if (s_i_d
.exists ()
&& INSN_LUID (insn) > 0)
if (GET_MODE (insn) == TImode)
sprintf (buf, "%s %4d",
INSN_SCHED_TIMES (insn) > 0 ? "> " : "< ",
if (GET_MODE (insn) == TImode)
sprintf (buf, "%s %4d",
INSN_SCHED_TIMES (insn) > 0 ? "> " : "< ",
@@
-523,6
+517,7
@@
sel_print_insn (const_rtx insn, int aligned ATTRIBUTE_UNUSED)
\f
/* Functions for pretty printing of CFG. */
\f
/* Functions for pretty printing of CFG. */
+/* FIXME: Using pretty-print here could simplify this stuff. */
/* Replace all occurencies of STR1 to STR2 in BUF.
The BUF must be large enough to hold the result. */
/* Replace all occurencies of STR1 to STR2 in BUF.
The BUF must be large enough to hold the result. */
@@
-565,7
+560,8
@@
replace_str_in_buf (char *buf, const char *str1, const char *str2)
while (p);
}
while (p);
}
-/* Replace characters in BUF that have special meaning in .dot file. */
+/* Replace characters in BUF that have special meaning in .dot file.
+ Similar to pp_write_text_as_dot_label_to_stream. */
static void
sel_prepare_string_for_dot_label (char *buf)
{
static void
sel_prepare_string_for_dot_label (char *buf)
{
@@
-607,7
+603,7
@@
sel_dump_cfg_insn (insn_t insn, int flags)
{
int insn_flags = DUMP_INSN_UID | DUMP_INSN_PATTERN;
{
int insn_flags = DUMP_INSN_UID | DUMP_INSN_PATTERN;
- if (sched_luids
!= NULL
&& INSN_LUID (insn) > 0)
+ if (sched_luids
.exists ()
&& INSN_LUID (insn) > 0)
{
if (flags & SEL_DUMP_CFG_INSN_SEQNO)
insn_flags |= DUMP_INSN_SEQNO | DUMP_INSN_SCHED_CYCLE | DUMP_INSN_EXPR;
{
if (flags & SEL_DUMP_CFG_INSN_SEQNO)
insn_flags |= DUMP_INSN_SEQNO | DUMP_INSN_SCHED_CYCLE | DUMP_INSN_EXPR;
@@
-957,7
+953,7
@@
debug_mem_addr_value (rtx x)
enum machine_mode address_mode;
gcc_assert (MEM_P (x));
enum machine_mode address_mode;
gcc_assert (MEM_P (x));
- address_mode =
targetm.addr_space.address_mode (MEM_ADDR_SPACE (x)
);
+ address_mode =
get_address_mode (x
);
t = shallow_copy_rtx (x);
if (cselib_lookup (XEXP (t, 0), address_mode, 0, GET_MODE (t)))
t = shallow_copy_rtx (x);
if (cselib_lookup (XEXP (t, 0), address_mode, 0, GET_MODE (t)))