OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Daily bump.
[pf3gnuchains/gcc-fork.git]
/
gcc
/
tree-browser.c
diff --git
a/gcc/tree-browser.c
b/gcc/tree-browser.c
index
f07cf96
..
0180d3a
100644
(file)
--- a/
gcc/tree-browser.c
+++ b/
gcc/tree-browser.c
@@
-1,12
+1,13
@@
/* Tree browser.
/* Tree browser.
- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2007, 2008, 2010
+ Free Software Foundation, Inc.
Contributed by Sebastian Pop <s.pop@laposte.net>
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Contributed by Sebastian Pop <s.pop@laposte.net>
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
-Software Foundation; either version
2
, or (at your option) any later
+Software Foundation; either version
3
, or (at your option) any later
version.
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
version.
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
@@
-15,9
+16,8
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
#include "config.h"
#include "system.h"
#include "config.h"
#include "system.h"
@@
-26,6
+26,7
@@
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "tree.h"
#include "tree-inline.h"
#include "diagnostic.h"
#include "tree.h"
#include "tree-inline.h"
#include "diagnostic.h"
+#include "tree-pretty-print.h"
#include "hashtab.h"
#include "hashtab.h"
@@
-72,11
+73,14
@@
struct tb_tree_code {
};
#define DEFTREECODE(SYM, STRING, TYPE, NARGS) { SYM, STRING, sizeof (STRING) - 1 },
};
#define DEFTREECODE(SYM, STRING, TYPE, NARGS) { SYM, STRING, sizeof (STRING) - 1 },
+#define END_OF_BASE_TREE_CODES \
+ { LAST_AND_UNUSED_TREE_CODE, "@dummy", sizeof ("@dummy") - 1 },
static const struct tb_tree_code tb_tree_codes[] =
{
static const struct tb_tree_code tb_tree_codes[] =
{
-#include "tree.def"
+#include "
all-
tree.def"
};
#undef DEFTREECODE
};
#undef DEFTREECODE
+#undef END_OF_BASE_TREE_CODES
#define TB_TREE_CODE(N) (tb_tree_codes[N].code)
#define TB_TREE_CODE_TEXT(N) (tb_tree_codes[N].code_string)
#define TB_TREE_CODE(N) (tb_tree_codes[N].code)
#define TB_TREE_CODE_TEXT(N) (tb_tree_codes[N].code_string)
@@
-163,7
+167,8
@@
browse_tree (tree begin)
case TB_MAX:
if (head && (INTEGRAL_TYPE_P (head)
case TB_MAX:
if (head && (INTEGRAL_TYPE_P (head)
- || TREE_CODE (head) == REAL_TYPE))
+ || TREE_CODE (head) == REAL_TYPE
+ || TREE_CODE (head) == FIXED_POINT_TYPE))
TB_SET_HEAD (TYPE_MAX_VALUE (head));
else
TB_WF;
TB_SET_HEAD (TYPE_MAX_VALUE (head));
else
TB_WF;
@@
-171,7
+176,8
@@
browse_tree (tree begin)
case TB_MIN:
if (head && (INTEGRAL_TYPE_P (head)
case TB_MIN:
if (head && (INTEGRAL_TYPE_P (head)
- || TREE_CODE (head) == REAL_TYPE))
+ || TREE_CODE (head) == REAL_TYPE
+ || TREE_CODE (head) == FIXED_POINT_TYPE))
TB_SET_HEAD (TYPE_MIN_VALUE (head));
else
TB_WF;
TB_SET_HEAD (TYPE_MIN_VALUE (head));
else
TB_WF;
@@
-313,13
+319,6
@@
browse_tree (tree begin)
TB_WF;
break;
TB_WF;
break;
- case TB_ARG_TYPE_AS_WRITTEN:
- if (head && TREE_CODE (head) == PARM_DECL)
- TB_SET_HEAD (DECL_ARG_TYPE_AS_WRITTEN (head));
- else
- TB_WF;
- break;
-
case TB_ARG_TYPE:
if (head && TREE_CODE (head) == PARM_DECL)
TB_SET_HEAD (DECL_ARG_TYPE (head));
case TB_ARG_TYPE:
if (head && TREE_CODE (head) == PARM_DECL)
TB_SET_HEAD (DECL_ARG_TYPE (head));
@@
-737,45
+736,16
@@
store_child_info (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED,
node = *tp;
/* 'node' is the parent of 'TREE_OPERAND (node, *)'. */
node = *tp;
/* 'node' is the parent of 'TREE_OPERAND (node, *)'. */
- if (EXPR
ESSION_CLASS
_P (node))
+ if (EXPR_P (node))
{
{
-
-#define STORE_CHILD(N) do { \
- tree op = TREE_OPERAND (node, N); \
- slot = htab_find_slot (TB_up_ht, op, INSERT); \
- *slot = (void *) node; \
-} while (0)
-
- switch (TREE_CODE_LENGTH (TREE_CODE (node)))
+ int n = TREE_OPERAND_LENGTH (node);
+ int i;
+ for (i = 0; i < n; i++)
{
{
- case 4:
- STORE_CHILD (0);
- STORE_CHILD (1);
- STORE_CHILD (2);
- STORE_CHILD (3);
- break;
-
- case 3:
- STORE_CHILD (0);
- STORE_CHILD (1);
- STORE_CHILD (2);
- break;
-
- case 2:
- STORE_CHILD (0);
- STORE_CHILD (1);
- break;
-
- case 1:
- STORE_CHILD (0);
- break;
-
- case 0:
- default:
- /* No children: nothing to do. */
- break;
+ tree op = TREE_OPERAND (node, i);
+ slot = htab_find_slot (TB_up_ht, op, INSERT);
+ *slot = (void *) node;
}
}
-#undef STORE_CHILD
}
/* Never stop walk_tree. */
}
/* Never stop walk_tree. */
@@
-787,53
+757,20
@@
store_child_info (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED,
static int
TB_parent_eq (const void *p1, const void *p2)
{
static int
TB_parent_eq (const void *p1, const void *p2)
{
- tree node, parent;
- node = (tree) p2;
- parent = (tree) p1;
+ const_tree const node = (const_tree)p2;
+ const_tree const parent = (const_tree) p1;
if (p1 == NULL || p2 == NULL)
return 0;
if (p1 == NULL || p2 == NULL)
return 0;
- if (EXPR
ESSION_CLASS
_P (parent))
+ if (EXPR_P (parent))
{
{
-
-#define TEST_CHILD(N) do { \
- if (node == TREE_OPERAND (parent, N)) \
- return 1; \
-} while (0)
-
- switch (TREE_CODE_LENGTH (TREE_CODE (parent)))
- {
- case 4:
- TEST_CHILD (0);
- TEST_CHILD (1);
- TEST_CHILD (2);
- TEST_CHILD (3);
- break;
-
- case 3:
- TEST_CHILD (0);
- TEST_CHILD (1);
- TEST_CHILD (2);
- break;
-
- case 2:
- TEST_CHILD (0);
- TEST_CHILD (1);
- break;
-
- case 1:
- TEST_CHILD (0);
- break;
-
- case 0:
- default:
- /* No children: nothing to do. */
- break;
- }
-#undef TEST_CHILD
+ int n = TREE_OPERAND_LENGTH (parent);
+ int i;
+ for (i = 0; i < n; i++)
+ if (node == TREE_OPERAND (parent, i))
+ return 1;
}
}
-
return 0;
}
return 0;
}