From 4679ade3d07c159e201a8c6af4811e110d7be90e Mon Sep 17 00:00:00 2001 From: ghazi Date: Wed, 2 May 2001 14:31:45 +0000 Subject: [PATCH] * c-lex.c: NULL_PTR -> NULL. * cse.c: Likewise. * emit-rtl.c: Likewise. * gcse.c: Likewise. * genpeep.c: Likewise. * jump.c: Likewise. * mips-tdump.c: Likewise. * reload1.c: Likewise. * rtlanal.c: Likewise. * stmt.c: Likewise. * stor-layout.c: Likewise. * toplev.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41761 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 15 +++++++++++++++ gcc/c-lex.c | 4 ++-- gcc/cse.c | 30 +++++++++++++++--------------- gcc/emit-rtl.c | 2 +- gcc/gcse.c | 2 +- gcc/genpeep.c | 2 +- gcc/jump.c | 5 ++--- gcc/mips-tdump.c | 22 +++++++++++----------- gcc/reload1.c | 9 ++++----- gcc/rtlanal.c | 2 +- gcc/stmt.c | 5 ++--- gcc/stor-layout.c | 2 +- gcc/toplev.c | 4 ++-- 13 files changed, 58 insertions(+), 46 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dcb64e5..7dad94b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2001-05-02 Kaveh R. Ghazi + + * c-lex.c: NULL_PTR -> NULL. + * cse.c: Likewise. + * emit-rtl.c: Likewise. + * gcse.c: Likewise. + * genpeep.c: Likewise. + * jump.c: Likewise. + * mips-tdump.c: Likewise. + * reload1.c: Likewise. + * rtlanal.c: Likewise. + * stmt.c: Likewise. + * stor-layout.c: Likewise. + * toplev.c: Likewise. + 2001-05-01 Per Bothner * expr.c (expand_expr): When compiling LABELED_BLOCK_EXPR, diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 6f60769..85ed543 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -1524,7 +1524,7 @@ lex_string (str, len, wide) #ifdef MULTIBYTE_CHARS /* Reset multibyte conversion state. */ - (void) local_mbtowc (NULL_PTR, NULL_PTR, 0); + (void) local_mbtowc (NULL, NULL, 0); #endif while (p < limit) @@ -1624,7 +1624,7 @@ lex_charconst (str, len, wide) #ifdef MULTIBYTE_CHARS int longest_char = local_mb_cur_max (); - (void) local_mbtowc (NULL_PTR, NULL_PTR, 0); + (void) local_mbtowc (NULL, NULL, 0); #endif max_chars = TYPE_PRECISION (integer_type_node) / width; diff --git a/gcc/cse.c b/gcc/cse.c index 652dbf0..8571653 100644 --- a/gcc/cse.c +++ b/gcc/cse.c @@ -1245,7 +1245,7 @@ mention_regs (x) { if (GET_CODE (XEXP (x, 0)) == REG && ! REGNO_QTY_VALID_P (REGNO (XEXP (x, 0)))) - if (insert_regs (XEXP (x, 0), NULL_PTR, 0)) + if (insert_regs (XEXP (x, 0), NULL, 0)) { rehash_using_reg (XEXP (x, 0)); changed = 1; @@ -1253,7 +1253,7 @@ mention_regs (x) if (GET_CODE (XEXP (x, 1)) == REG && ! REGNO_QTY_VALID_P (REGNO (XEXP (x, 1)))) - if (insert_regs (XEXP (x, 1), NULL_PTR, 0)) + if (insert_regs (XEXP (x, 1), NULL, 0)) { rehash_using_reg (XEXP (x, 1)); changed = 1; @@ -1346,7 +1346,7 @@ insert_regs (x, classp, modified) else if (GET_CODE (x) == SUBREG && GET_CODE (SUBREG_REG (x)) == REG && ! REGNO_QTY_VALID_P (REGNO (SUBREG_REG (x)))) { - insert_regs (SUBREG_REG (x), NULL_PTR, 0); + insert_regs (SUBREG_REG (x), NULL, 0); mention_regs (x); return 1; } @@ -1724,7 +1724,7 @@ insert (x, classp, hash, mode) subhash = safe_hash (subexp, mode) & HASH_MASK; subelt = lookup (subexp, subhash, mode); if (subelt == 0) - subelt = insert (subexp, NULL_PTR, subhash, mode); + subelt = insert (subexp, NULL, subhash, mode); /* Initialize SUBELT's circular chain if it has none. */ if (subelt->related_value == 0) subelt->related_value = subelt; @@ -1999,7 +1999,7 @@ remove_invalid_refs (regno) { next = p->next_same_hash; if (GET_CODE (p->exp) != REG - && refers_to_regno_p (regno, regno + 1, p->exp, NULL_PTR)) + && refers_to_regno_p (regno, regno + 1, p->exp, (rtx*)0)) remove_from_table (p, i); } } @@ -2029,7 +2029,7 @@ remove_invalid_subreg_refs (regno, offset, mode) || (((SUBREG_BYTE (exp) + (GET_MODE_SIZE (GET_MODE (exp)) - 1)) >= offset) && SUBREG_BYTE (exp) <= end)) - && refers_to_regno_p (regno, regno + 1, p->exp, NULL_PTR)) + && refers_to_regno_p (regno, regno + 1, p->exp, (rtx*)0)) remove_from_table (p, i); } } @@ -4603,7 +4603,7 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) new quantity number. */ if (op0_elt == 0) { - if (insert_regs (op0, NULL_PTR, 0)) + if (insert_regs (op0, NULL, 0)) { rehash_using_reg (op0); op0_hash = HASH (op0, mode); @@ -4615,7 +4615,7 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) op1_hash = HASH (op1,mode); } - op0_elt = insert (op0, NULL_PTR, op0_hash, mode); + op0_elt = insert (op0, NULL, op0_hash, mode); op0_elt->in_memory = op0_in_memory; } @@ -4631,13 +4631,13 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) /* Put OP1 in the hash table so it gets a new quantity number. */ if (op1_elt == 0) { - if (insert_regs (op1, NULL_PTR, 0)) + if (insert_regs (op1, NULL, 0)) { rehash_using_reg (op1); op1_hash = HASH (op1, mode); } - op1_elt = insert (op1, NULL_PTR, op1_hash, mode); + op1_elt = insert (op1, NULL, op1_hash, mode); op1_elt->in_memory = op1_in_memory; } @@ -4658,25 +4658,25 @@ record_jump_cond (code, mode, op0, op1, reversed_nonequality) if (op0_elt == 0) { - if (insert_regs (op0, NULL_PTR, 0)) + if (insert_regs (op0, NULL, 0)) { rehash_using_reg (op0); op0_hash = HASH (op0, mode); } - op0_elt = insert (op0, NULL_PTR, op0_hash, mode); + op0_elt = insert (op0, NULL, op0_hash, mode); op0_elt->in_memory = op0_in_memory; } if (op1_elt == 0) { - if (insert_regs (op1, NULL_PTR, 0)) + if (insert_regs (op1, NULL, 0)) { rehash_using_reg (op1); op1_hash = HASH (op1, mode); } - op1_elt = insert (op1, NULL_PTR, op1_hash, mode); + op1_elt = insert (op1, NULL, op1_hash, mode); op1_elt->in_memory = op1_in_memory; } @@ -4749,7 +4749,7 @@ cse_insn (insn, libcall_insn) int src_eqv_in_memory = 0; unsigned src_eqv_hash = 0; - struct set *sets = (struct set *) NULL_PTR; + struct set *sets = (struct set *) 0; this_insn = insn; diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 37df9a1..3452a68 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1783,7 +1783,7 @@ gen_label_rtx () register rtx label; label = gen_rtx_CODE_LABEL (VOIDmode, 0, NULL_RTX, - NULL_RTX, label_num++, NULL_PTR, NULL_PTR); + NULL_RTX, label_num++, NULL, NULL); LABEL_NUSES (label) = 0; LABEL_ALTERNATE_NAME (label) = NULL; diff --git a/gcc/gcse.c b/gcc/gcse.c index a17f30e..07bdbf5 100644 --- a/gcc/gcse.c +++ b/gcc/gcse.c @@ -948,7 +948,7 @@ compute_can_copy () #else reg = gen_rtx_REG ((enum machine_mode) i, LAST_VIRTUAL_REGISTER + 1); insn = emit_insn (gen_rtx_SET (VOIDmode, reg, reg)); - if (recog (PATTERN (insn), insn, NULL_PTR) >= 0) + if (recog (PATTERN (insn), insn, NULL) >= 0) can_copy_p[i] = 1; #endif } diff --git a/gcc/genpeep.c b/gcc/genpeep.c index 0904e9f..0249856 100644 --- a/gcc/genpeep.c +++ b/gcc/genpeep.c @@ -97,7 +97,7 @@ gen_peephole (peep) /* Walk the insn's pattern, remembering at all times the path down to the walking point. */ - match_rtx (XVECEXP (peep, 0, i), NULL_PTR, insn_code_number); + match_rtx (XVECEXP (peep, 0, i), NULL, insn_code_number); } /* We get this far if the pattern matches. diff --git a/gcc/jump.c b/gcc/jump.c index 4046b9a..314a20b 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -973,7 +973,7 @@ delete_noop_moves (f) { rtx trial; rtx tem = find_equiv_reg (NULL_RTX, insn, 0, - sreg, NULL_PTR, dreg, + sreg, NULL, dreg, GET_MODE (SET_SRC (body))); if (tem != 0 @@ -1011,8 +1011,7 @@ delete_noop_moves (f) } else if (dreg >= 0 && CONSTANT_P (SET_SRC (body)) && find_equiv_reg (SET_SRC (body), insn, 0, dreg, - NULL_PTR, 0, - GET_MODE (SET_DEST (body)))) + NULL, 0, GET_MODE (SET_DEST (body)))) { /* This handles the case where we have two consecutive assignments of the same constant to pseudos that didn't diff --git a/gcc/mips-tdump.c b/gcc/mips-tdump.c index b199468..f4cb9a3 100644 --- a/gcc/mips-tdump.c +++ b/gcc/mips-tdump.c @@ -1358,32 +1358,32 @@ read_tfile () print_sym_hdr (&sym_hdr); - lines = (LINER *) read_seek (NULL_PTR, + lines = (LINER *) read_seek (NULL, sym_hdr.cbLine, sym_hdr.cbLineOffset, "Line numbers"); - dense_nums = (DNR *) read_seek (NULL_PTR, + dense_nums = (DNR *) read_seek (NULL, sym_hdr.idnMax * sizeof (DNR), sym_hdr.cbDnOffset, "Dense numbers"); - proc_desc = (PDR *) read_seek (NULL_PTR, + proc_desc = (PDR *) read_seek (NULL, sym_hdr.ipdMax * sizeof (PDR), sym_hdr.cbPdOffset, "Procedure tables"); - l_symbols = (SYMR *) read_seek (NULL_PTR, + l_symbols = (SYMR *) read_seek (NULL, sym_hdr.isymMax * sizeof (SYMR), sym_hdr.cbSymOffset, "Local symbols"); - opt_symbols = (OPTR *) read_seek (NULL_PTR, + opt_symbols = (OPTR *) read_seek (NULL, sym_hdr.ioptMax * sizeof (OPTR), sym_hdr.cbOptOffset, "Optimization symbols"); - aux_symbols = (AUXU *) read_seek (NULL_PTR, + aux_symbols = (AUXU *) read_seek (NULL, sym_hdr.iauxMax * sizeof (AUXU), sym_hdr.cbAuxOffset, "Auxiliary symbols"); @@ -1391,27 +1391,27 @@ read_tfile () if (sym_hdr.iauxMax > 0) aux_used = xcalloc (sym_hdr.iauxMax, 1); - l_strings = (char *) read_seek (NULL_PTR, + l_strings = (char *) read_seek (NULL, sym_hdr.issMax, sym_hdr.cbSsOffset, "Local string table"); - e_strings = (char *) read_seek (NULL_PTR, + e_strings = (char *) read_seek (NULL, sym_hdr.issExtMax, sym_hdr.cbSsExtOffset, "External string table"); - file_desc = (FDR *) read_seek (NULL_PTR, + file_desc = (FDR *) read_seek (NULL, sym_hdr.ifdMax * sizeof (FDR), sym_hdr.cbFdOffset, "File tables"); - rfile_desc = (ulong *) read_seek (NULL_PTR, + rfile_desc = (ulong *) read_seek (NULL, sym_hdr.crfd * sizeof (ulong), sym_hdr.cbRfdOffset, "Relative file tables"); - e_symbols = (EXTR *) read_seek (NULL_PTR, + e_symbols = (EXTR *) read_seek (NULL, sym_hdr.iextMax * sizeof (EXTR), sym_hdr.cbExtOffset, "External symbols"); diff --git a/gcc/reload1.c b/gcc/reload1.c index e3bd7bb..f12e8f4 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -678,7 +678,7 @@ reload (first, global) /* The two pointers used to track the true location of the memory used for label offsets. */ - char *real_known_ptr = NULL_PTR; + char *real_known_ptr = NULL; int (*real_at_ptr)[NUM_ELIMINABLE_REGS]; /* Make sure even insns with volatile mem refs are recognizable. */ @@ -5617,7 +5617,7 @@ choose_reload_regs (chain) { register rtx equiv = find_equiv_reg (search_equiv, insn, rld[r].class, - -1, NULL_PTR, 0, rld[r].mode); + -1, NULL, 0, rld[r].mode); int regno = 0; if (equiv != 0) @@ -6164,7 +6164,7 @@ emit_input_reload_insns (chain, rl, old, j) oldequiv = find_equiv_reg (old, insn, rld[rl->secondary_in_reload].class, - -1, NULL_PTR, 0, mode); + -1, NULL, 0, mode); #endif /* If reloading from memory, see if there is a register @@ -6180,8 +6180,7 @@ emit_input_reload_insns (chain, rl, old, j) || (GET_CODE (old) == REG && REGNO (old) >= FIRST_PSEUDO_REGISTER && reg_renumber[REGNO (old)] < 0))) - oldequiv = find_equiv_reg (old, insn, ALL_REGS, - -1, NULL_PTR, 0, mode); + oldequiv = find_equiv_reg (old, insn, ALL_REGS, -1, NULL, 0, mode); if (oldequiv) { diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index 3dd7c13..121b879 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -1214,7 +1214,7 @@ reg_overlap_mentioned_p (x, in) do_reg: endregno = regno + (regno < FIRST_PSEUDO_REGISTER ? HARD_REGNO_NREGS (regno, GET_MODE (x)) : 1); - return refers_to_regno_p (regno, endregno, in, NULL_PTR); + return refers_to_regno_p (regno, endregno, in, (rtx*)0); case MEM: { diff --git a/gcc/stmt.c b/gcc/stmt.c index b529853..e628635 100644 --- a/gcc/stmt.c +++ b/gcc/stmt.c @@ -1088,7 +1088,7 @@ void expand_fixups (first_insn) rtx first_insn; { - fixup_gotos (NULL_PTR, NULL_RTX, NULL_TREE, first_insn, 0); + fixup_gotos (NULL, NULL_RTX, NULL_TREE, first_insn, 0); } /* When exiting a binding contour, process all pending gotos requiring fixups. @@ -5349,8 +5349,7 @@ expand_end_case (orig_index) use_cost_table = (TREE_CODE (TREE_TYPE (orig_index)) != ENUMERAL_TYPE && estimate_case_costs (thiscase->data.case_stmt.case_list)); - balance_case_nodes (&thiscase->data.case_stmt.case_list, - NULL_PTR); + balance_case_nodes (&thiscase->data.case_stmt.case_list, NULL); emit_case_nodes (index, thiscase->data.case_stmt.case_list, default_label, index_type); emit_jump_if_reachable (default_label); diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index fb46cf5..a278eb1 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -171,7 +171,7 @@ variable_size (size) if (immediate_size_expand) /* NULL_RTX is not defined; neither is the rtx type. Also, we would like to pass const0_rtx here, but don't have it. */ - expand_expr (size, expand_expr (integer_zero_node, NULL_PTR, VOIDmode, 0), + expand_expr (size, expand_expr (integer_zero_node, NULL_RTX, VOIDmode, 0), VOIDmode, 0); else if (cfun != 0 && cfun->x_dont_save_pending_sizes_p) /* The front-end doesn't want us to keep a list of the expressions diff --git a/gcc/toplev.c b/gcc/toplev.c index 14a9fd0..9c0fcf4 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1948,7 +1948,7 @@ wrapup_global_declarations (vec, len) || TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)))) { reconsider = 1; - rest_of_decl_compilation (decl, NULL_PTR, 1, 1); + rest_of_decl_compilation (decl, NULL, 1, 1); } if (TREE_CODE (decl) == FUNCTION_DECL @@ -3374,7 +3374,7 @@ rest_of_compilation (decl) #ifdef OPTIMIZE_MODE_SWITCHING timevar_push (TV_GCSE); - if (optimize_mode_switching (NULL_PTR)) + if (optimize_mode_switching (NULL)) { /* We did work, and so had to regenerate global life information. Take advantage of this and don't re-recompute register life -- 2.7.4