Patch installed to eliminate all remaining NULL_PTR uses
Kaveh R. Ghazi
ghazi@caip.rutgers.edu
Fri May 4 08:32:00 GMT 2001
This patch eliminates all the remaining uses of NULL_PTR (except for
the ones in the chill dir.) Bootstrapped on solaris2.7 no regressions
and installed as obvious.
I'll let the dust settle for a few days and then remove the NULL_PTR
define altogether.
--Kaveh
2001-05-03 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* alpha.h: NULL_PTR -> NULL.
* arm.c: Likewise.
* arm.h: Likewise.
* avr.h: Likewise.
* c4x.c: Likewise.
* c4x.h: Likewise.
* i386.c: Likewise.
* i386.md: Likewise.
* i860.c: Likewise.
* ia64.c: Likewise.
* m68hc11.h: Likewise.
* rs6000.h: Likewise.
* sh.c: Likewise.
* sh.h: Likewise.
* sparc.h: Likewise.
* v850.c: Likewise.
* expr.c: Likewise.
* final.c: Likewise.
* gcc.c: Likewise.
* recog.c: Likewise.
diff -rup orig/egcs-CVS20010502/gcc/config/alpha/alpha.h egcs-CVS20010502/gcc/config/alpha/alpha.h
--- orig/egcs-CVS20010502/gcc/config/alpha/alpha.h Mon Apr 16 14:30:35 2001
+++ egcs-CVS20010502/gcc/config/alpha/alpha.h Thu May 3 14:06:17 2001
@@ -1583,7 +1583,7 @@ do { \
&& GET_CODE (XEXP (XEXP (X, 0), 1)) == CONST_INT \
&& GET_CODE (XEXP (X, 1)) == CONST_INT) \
{ \
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
@@ -1611,7 +1611,7 @@ do { \
GEN_INT (high)), \
GEN_INT (low)); \
\
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
diff -rup orig/egcs-CVS20010502/gcc/config/arm/arm.c egcs-CVS20010502/gcc/config/arm/arm.c
--- orig/egcs-CVS20010502/gcc/config/arm/arm.c Tue Apr 3 11:05:40 2001
+++ egcs-CVS20010502/gcc/config/arm/arm.c Thu May 3 14:06:45 2001
@@ -8647,7 +8647,7 @@ arm_final_prescan_insn (insn)
if (!this_insn)
{
/* Oh, dear! we ran off the end.. give up */
- recog (PATTERN (insn), insn, NULL_PTR);
+ recog (PATTERN (insn), insn, NULL);
arm_ccfsm_state = 0;
arm_target_insn = NULL;
return;
@@ -8685,7 +8685,7 @@ arm_final_prescan_insn (insn)
destroy this array, but final.c assumes that it remains intact
across this call; since the insn has been recognized already we
call recog direct). */
- recog (PATTERN (insn), insn, NULL_PTR);
+ recog (PATTERN (insn), insn, NULL);
}
}
@@ -8801,7 +8801,7 @@ arm_debugger_arg_offset (value, addr)
}
#define def_builtin(NAME, TYPE, CODE) \
- builtin_function ((NAME), (TYPE), (CODE), BUILT_IN_MD, NULL_PTR)
+ builtin_function ((NAME), (TYPE), (CODE), BUILT_IN_MD, NULL)
void
arm_init_builtins ()
diff -rup orig/egcs-CVS20010502/gcc/config/arm/arm.h egcs-CVS20010502/gcc/config/arm/arm.h
--- orig/egcs-CVS20010502/gcc/config/arm/arm.h Thu Apr 26 16:30:27 2001
+++ egcs-CVS20010502/gcc/config/arm/arm.h Thu May 3 14:07:30 2001
@@ -1257,7 +1257,7 @@ enum reg_class
gen_rtx_PLUS (GET_MODE (X), XEXP (X, 0), \
GEN_INT (high)), \
GEN_INT (low)); \
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
@@ -1284,7 +1284,7 @@ enum reg_class
{ \
rtx orig_X = X; \
X = copy_rtx (X); \
- push_reload (orig_X, NULL_RTX, &X, NULL_PTR, \
+ push_reload (orig_X, NULL_RTX, &X, NULL, \
BASE_REG_CLASS, \
Pmode, VOIDmode, 0, 0, OPNUM, TYPE); \
goto WIN; \
diff -rup orig/egcs-CVS20010502/gcc/config/avr/avr.h egcs-CVS20010502/gcc/config/avr/avr.h
--- orig/egcs-CVS20010502/gcc/config/avr/avr.h Mon Apr 16 14:30:36 2001
+++ egcs-CVS20010502/gcc/config/avr/avr.h Thu May 3 14:08:19 2001
@@ -1677,22 +1677,22 @@ do { \
{ \
int regno = REGNO (XEXP (X, 0)); \
rtx mem = make_memloc (X, regno); \
- push_reload (XEXP (mem,0), NULL_PTR, &XEXP (mem,0), NULL_PTR, \
+ push_reload (XEXP (mem,0), NULL, &XEXP (mem,0), NULL, \
POINTER_REGS, Pmode, VOIDmode, 0, 0, \
1, ADDR_TYPE (TYPE)); \
- push_reload (mem, NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (mem, NULL_RTX, &XEXP (X, 0), NULL, \
BASE_POINTER_REGS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
} \
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_POINTER_REGS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
} \
else if (! (frame_pointer_needed && XEXP (X,0) == frame_pointer_rtx)) \
{ \
- push_reload (X, NULL_RTX, &X, NULL_PTR, \
+ push_reload (X, NULL_RTX, &X, NULL, \
POINTER_REGS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
diff -rup orig/egcs-CVS20010502/gcc/config/c4x/c4x.c egcs-CVS20010502/gcc/config/c4x/c4x.c
--- orig/egcs-CVS20010502/gcc/config/c4x/c4x.c Thu Mar 22 13:48:33 2001
+++ egcs-CVS20010502/gcc/config/c4x/c4x.c Thu May 3 14:08:59 2001
@@ -5032,12 +5032,12 @@ c4x_init_builtins (endlink)
build_function_type
(integer_type_node,
tree_cons (NULL_TREE, double_type_node, endlink)),
- C4X_BUILTIN_FIX, BUILT_IN_MD, NULL_PTR);
+ C4X_BUILTIN_FIX, BUILT_IN_MD, NULL);
builtin_function ("ansi_ftoi",
build_function_type
(integer_type_node,
tree_cons (NULL_TREE, double_type_node, endlink)),
- C4X_BUILTIN_FIX_ANSI, BUILT_IN_MD, NULL_PTR);
+ C4X_BUILTIN_FIX_ANSI, BUILT_IN_MD, NULL);
if (TARGET_C3X)
builtin_function ("fast_imult",
build_function_type
@@ -5045,24 +5045,24 @@ c4x_init_builtins (endlink)
tree_cons (NULL_TREE, integer_type_node,
tree_cons (NULL_TREE,
integer_type_node, endlink))),
- C4X_BUILTIN_MPYI, BUILT_IN_MD, NULL_PTR);
+ C4X_BUILTIN_MPYI, BUILT_IN_MD, NULL);
else
{
builtin_function ("toieee",
build_function_type
(double_type_node,
tree_cons (NULL_TREE, double_type_node, endlink)),
- C4X_BUILTIN_TOIEEE, BUILT_IN_MD, NULL_PTR);
+ C4X_BUILTIN_TOIEEE, BUILT_IN_MD, NULL);
builtin_function ("frieee",
build_function_type
(double_type_node,
tree_cons (NULL_TREE, double_type_node, endlink)),
- C4X_BUILTIN_FRIEEE, BUILT_IN_MD, NULL_PTR);
+ C4X_BUILTIN_FRIEEE, BUILT_IN_MD, NULL);
builtin_function ("fast_invf",
build_function_type
(double_type_node,
tree_cons (NULL_TREE, double_type_node, endlink)),
- C4X_BUILTIN_RCPF, BUILT_IN_MD, NULL_PTR);
+ C4X_BUILTIN_RCPF, BUILT_IN_MD, NULL);
}
}
diff -rup orig/egcs-CVS20010502/gcc/config/c4x/c4x.h egcs-CVS20010502/gcc/config/c4x/c4x.h
--- orig/egcs-CVS20010502/gcc/config/c4x/c4x.h Mon Apr 16 14:30:36 2001
+++ egcs-CVS20010502/gcc/config/c4x/c4x.h Thu May 3 14:09:14 2001
@@ -1734,7 +1734,7 @@ CUMULATIVE_ARGS;
X = gen_rtx_LO_SUM (GET_MODE (X), \
gen_rtx_HIGH (GET_MODE (X), X), X); \
i = push_reload (XEXP (X, 0), NULL_RTX, \
- &XEXP (X, 0), NULL_PTR, \
+ &XEXP (X, 0), NULL, \
DP_REG, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
/* The only valid reg is DP. This is a fixed reg and will \
@@ -1757,7 +1757,7 @@ CUMULATIVE_ARGS;
if (! TARGET_SMALL) \
{ \
int i = push_reload (XEXP (X, 0), NULL_RTX, \
- &XEXP (X, 0), NULL_PTR, \
+ &XEXP (X, 0), NULL, \
DP_REG, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
/* The only valid reg is DP. This is a fixed reg and will \
diff -rup orig/egcs-CVS20010502/gcc/config/i386/i386.c egcs-CVS20010502/gcc/config/i386/i386.c
--- orig/egcs-CVS20010502/gcc/config/i386/i386.c Thu Apr 26 16:30:30 2001
+++ egcs-CVS20010502/gcc/config/i386/i386.c Thu May 3 14:09:26 2001
@@ -9009,7 +9009,7 @@ x86_initialize_trampoline (tramp, fnaddr
}
#define def_builtin(NAME, TYPE, CODE) \
- builtin_function ((NAME), (TYPE), (CODE), BUILT_IN_MD, NULL_PTR)
+ builtin_function ((NAME), (TYPE), (CODE), BUILT_IN_MD, NULL)
struct builtin_description
{
enum insn_code icode;
diff -rup orig/egcs-CVS20010502/gcc/config/i386/i386.md egcs-CVS20010502/gcc/config/i386/i386.md
--- orig/egcs-CVS20010502/gcc/config/i386/i386.md Sat Apr 28 16:30:09 2001
+++ egcs-CVS20010502/gcc/config/i386/i386.md Thu May 3 14:09:49 2001
@@ -17396,7 +17396,7 @@
{
emit_insn (gen_rtx_TRAP_IF (VOIDmode,
ix86_expand_compare (GET_CODE (operands[0]),
- NULL_PTR, NULL_PTR),
+ NULL, NULL),
operands[1]));
DONE;
}")
diff -rup orig/egcs-CVS20010502/gcc/config/i860/i860.c egcs-CVS20010502/gcc/config/i860/i860.c
--- orig/egcs-CVS20010502/gcc/config/i860/i860.c Tue Apr 3 11:05:45 2001
+++ egcs-CVS20010502/gcc/config/i860/i860.c Thu May 3 14:10:02 2001
@@ -1451,7 +1451,7 @@ output_delayed_branch (template, operand
We must do this after outputting the branch insn,
since operands may just be a pointer to `recog_data.operand'. */
INSN_CODE (delay_insn) = insn_code_number
- = recog (pat, delay_insn, NULL_PTR);
+ = recog (pat, delay_insn, NULL);
if (insn_code_number == -1)
abort ();
diff -rup orig/egcs-CVS20010502/gcc/config/ia64/ia64.c egcs-CVS20010502/gcc/config/ia64/ia64.c
--- orig/egcs-CVS20010502/gcc/config/ia64/ia64.c Fri Apr 20 14:28:29 2001
+++ egcs-CVS20010502/gcc/config/ia64/ia64.c Thu May 3 14:10:09 2001
@@ -6950,7 +6950,7 @@ ia64_init_builtins ()
endlink));
#define def_builtin(name, type, code) \
- builtin_function ((name), (type), (code), BUILT_IN_MD, NULL_PTR)
+ builtin_function ((name), (type), (code), BUILT_IN_MD, NULL)
def_builtin ("__sync_val_compare_and_swap_si", si_ftype_psi_si_si,
IA64_BUILTIN_VAL_COMPARE_AND_SWAP_SI);
diff -rup orig/egcs-CVS20010502/gcc/config/m68hc11/m68hc11.h egcs-CVS20010502/gcc/config/m68hc11/m68hc11.h
--- orig/egcs-CVS20010502/gcc/config/m68hc11/m68hc11.h Tue Mar 27 15:09:27 2001
+++ egcs-CVS20010502/gcc/config/m68hc11/m68hc11.h Thu May 3 14:10:32 2001
@@ -1522,7 +1522,7 @@ do {
&& GET_CODE (XEXP (XEXP (X, 0), 1)) == CONST_INT \
&& GET_CODE (XEXP (X, 1)) == CONST_INT) \
{ \
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
@@ -1545,7 +1545,7 @@ do {
GEN_INT (high)), \
GEN_INT (low)); \
\
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
diff -rup orig/egcs-CVS20010502/gcc/config/rs6000/rs6000.h egcs-CVS20010502/gcc/config/rs6000/rs6000.h
--- orig/egcs-CVS20010502/gcc/config/rs6000/rs6000.h Wed May 2 16:30:14 2001
+++ egcs-CVS20010502/gcc/config/rs6000/rs6000.h Thu May 3 14:10:53 2001
@@ -1943,7 +1943,7 @@ do { \
&& GET_CODE (XEXP (XEXP (X, 0), 1)) == CONST_INT \
&& GET_CODE (XEXP (X, 1)) == CONST_INT) \
{ \
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
@@ -1971,7 +1971,7 @@ do { \
GEN_INT (high)), \
GEN_INT (low)); \
\
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
diff -rup orig/egcs-CVS20010502/gcc/config/sh/sh.c egcs-CVS20010502/gcc/config/sh/sh.c
--- orig/egcs-CVS20010502/gcc/config/sh/sh.c Mon Apr 16 14:30:46 2001
+++ egcs-CVS20010502/gcc/config/sh/sh.c Thu May 3 14:11:12 2001
@@ -5266,7 +5266,7 @@ sh_insn_length_adjustment (insn)
template = XSTR (body, 0);
else if (asm_noperands (body) >= 0)
template
- = decode_asm_operands (body, NULL_PTR, NULL_PTR, NULL_PTR, NULL_PTR);
+ = decode_asm_operands (body, NULL, NULL, NULL, NULL);
else
return 0;
do
diff -rup orig/egcs-CVS20010502/gcc/config/sh/sh.h egcs-CVS20010502/gcc/config/sh/sh.h
--- orig/egcs-CVS20010502/gcc/config/sh/sh.h Tue Apr 3 11:06:11 2001
+++ egcs-CVS20010502/gcc/config/sh/sh.h Thu May 3 14:11:34 2001
@@ -1543,7 +1543,7 @@ extern int current_function_anonymous_ar
if (TARGET_SH3E && MODE == SFmode) \
{ \
X = copy_rtx (X); \
- push_reload (index_rtx, NULL_RTX, &XEXP (X, 1), NULL_PTR, \
+ push_reload (index_rtx, NULL_RTX, &XEXP (X, 1), NULL, \
INDEX_REG_CLASS, Pmode, VOIDmode, 0, 0, (OPNUM), \
(TYPE)); \
goto WIN; \
@@ -1565,7 +1565,7 @@ extern int current_function_anonymous_ar
sum = gen_rtx (PLUS, Pmode, XEXP (X, 0), \
GEN_INT (offset_base)); \
X = gen_rtx (PLUS, Pmode, sum, GEN_INT (offset - offset_base));\
- push_reload (sum, NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (sum, NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, Pmode, VOIDmode, 0, 0, (OPNUM), \
(TYPE)); \
goto WIN; \
@@ -1583,7 +1583,7 @@ extern int current_function_anonymous_ar
/* Because this address is so complex, we know it must have \
been created by LEGITIMIZE_RELOAD_ADDRESS before; thus, \
it is already unshared, and needs no further unsharing. */ \
- push_reload (XEXP ((X), 0), NULL_RTX, &XEXP ((X), 0), NULL_PTR, \
+ push_reload (XEXP ((X), 0), NULL_RTX, &XEXP ((X), 0), NULL, \
BASE_REG_CLASS, Pmode, VOIDmode, 0, 0, (OPNUM), (TYPE));\
goto WIN; \
} \
diff -rup orig/egcs-CVS20010502/gcc/config/sparc/sparc.h egcs-CVS20010502/gcc/config/sparc/sparc.h
--- orig/egcs-CVS20010502/gcc/config/sparc/sparc.h Fri Apr 13 17:10:16 2001
+++ egcs-CVS20010502/gcc/config/sparc/sparc.h Thu May 3 14:11:48 2001
@@ -2605,7 +2605,7 @@ do {
{ \
X = gen_rtx_LO_SUM (GET_MODE (X), \
gen_rtx_HIGH (GET_MODE (X), X), X); \
- push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL_PTR, \
+ push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL, \
BASE_REG_CLASS, GET_MODE (X), VOIDmode, 0, 0, \
OPNUM, TYPE); \
goto WIN; \
diff -rup orig/egcs-CVS20010502/gcc/config/v850/v850.c egcs-CVS20010502/gcc/config/v850/v850.c
--- orig/egcs-CVS20010502/gcc/config/v850/v850.c Tue Apr 3 11:06:12 2001
+++ egcs-CVS20010502/gcc/config/v850/v850.c Thu May 3 14:12:00 2001
@@ -1605,7 +1605,7 @@ expand_prologue ()
offset -= 4;
}
- code = recog (save_all, NULL_RTX, NULL_PTR);
+ code = recog (save_all, NULL_RTX, NULL);
if (code >= 0)
{
rtx insn = emit_insn (save_all);
@@ -1790,7 +1790,7 @@ expand_epilogue ()
offset -= 4;
}
- code = recog (restore_all, NULL_RTX, NULL_PTR);
+ code = recog (restore_all, NULL_RTX, NULL);
if (code >= 0)
{
diff -rup orig/egcs-CVS20010502/gcc/expr.c egcs-CVS20010502/gcc/expr.c
--- orig/egcs-CVS20010502/gcc/expr.c Wed May 2 16:30:12 2001
+++ egcs-CVS20010502/gcc/expr.c Thu May 3 13:55:12 2001
@@ -2382,7 +2382,7 @@ clear_by_pieces (to, len, align)
struct store_by_pieces data;
data.constfun = clear_by_pieces_1;
- data.constfundata = NULL_PTR;
+ data.constfundata = NULL;
data.len = len;
data.to = to;
store_by_pieces_1 (&data, align);
@@ -6601,7 +6601,7 @@ expand_expr (exp, target, tmode, modifie
return const0_rtx;
case EXIT_EXPR:
- expand_exit_loop_if_false (NULL_PTR,
+ expand_exit_loop_if_false (NULL,
invert_truthvalue (TREE_OPERAND (exp, 0)));
return const0_rtx;
diff -rup orig/egcs-CVS20010502/gcc/final.c egcs-CVS20010502/gcc/final.c
--- orig/egcs-CVS20010502/gcc/final.c Tue May 1 07:30:16 2001
+++ egcs-CVS20010502/gcc/final.c Thu May 3 13:57:09 2001
@@ -1532,8 +1532,7 @@ asm_insn_count (body)
if (GET_CODE (body) == ASM_INPUT)
template = XSTR (body, 0);
else
- template = decode_asm_operands (body, NULL_PTR, NULL_PTR,
- NULL_PTR, NULL_PTR);
+ template = decode_asm_operands (body, NULL, NULL, NULL, NULL);
for (; *template; template++)
if (IS_ASM_LOGICAL_LINE_SEPARATOR (*template) || *template == '\n')
@@ -2337,7 +2336,7 @@ final_scan_insn (insn, file, optimize, p
new_block = 1;
#ifdef FINAL_PRESCAN_LABEL
- FINAL_PRESCAN_INSN (insn, NULL_PTR, 0);
+ FINAL_PRESCAN_INSN (insn, NULL, 0);
#endif
#ifdef SDB_DEBUGGING_INFO
@@ -2539,8 +2538,7 @@ final_scan_insn (insn, file, optimize, p
}
/* Get out the operand values. */
- string = decode_asm_operands (body, ops, NULL_PTR,
- NULL_PTR, NULL_PTR);
+ string = decode_asm_operands (body, ops, NULL, NULL, NULL);
/* Inhibit aborts on what would otherwise be compiler bugs. */
insn_noperands = noperands;
this_is_asm_operands = insn;
diff -rup orig/egcs-CVS20010502/gcc/gcc.c egcs-CVS20010502/gcc/gcc.c
--- orig/egcs-CVS20010502/gcc/gcc.c Tue May 1 07:54:43 2001
+++ egcs-CVS20010502/gcc/gcc.c Thu May 3 13:59:35 2001
@@ -3051,9 +3051,9 @@ process_command (argc, argv)
set_std_prefix (gcc_exec_prefix, len);
add_prefix (&exec_prefixes, gcc_exec_prefix, "GCC",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&startfile_prefixes, gcc_exec_prefix, "GCC",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
}
/* COMPILER_PATH and LIBRARY_PATH have values
@@ -3081,10 +3081,10 @@ process_command (argc, argv)
else
nstore[endp - startp] = 0;
add_prefix (&exec_prefixes, nstore, 0,
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&include_prefixes,
concat (nstore, "include", NULL),
- 0, PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ 0, PREFIX_PRIORITY_LAST, 0, NULL);
if (*endp == 0)
break;
endp = startp = endp + 1;
@@ -3116,7 +3116,7 @@ process_command (argc, argv)
else
nstore[endp - startp] = 0;
add_prefix (&startfile_prefixes, nstore, NULL,
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
if (*endp == 0)
break;
endp = startp = endp + 1;
@@ -3149,7 +3149,7 @@ process_command (argc, argv)
else
nstore[endp - startp] = 0;
add_prefix (&startfile_prefixes, nstore, NULL,
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
if (*endp == 0)
break;
endp = startp = endp + 1;
@@ -3375,14 +3375,14 @@ process_command (argc, argv)
{
if (len == 7)
add_prefix (&include_prefixes, "include", NULL,
- PREFIX_PRIORITY_B_OPT, 0, NULL_PTR);
+ PREFIX_PRIORITY_B_OPT, 0, NULL);
else
{
char *string = xmalloc (len + 1);
strncpy (string, value, len-7);
strcpy (string+len-7, "include");
add_prefix (&include_prefixes, string, NULL,
- PREFIX_PRIORITY_B_OPT, 0, NULL_PTR);
+ PREFIX_PRIORITY_B_OPT, 0, NULL);
}
}
}
@@ -3391,7 +3391,7 @@ process_command (argc, argv)
add_prefix (&startfile_prefixes, value, NULL,
PREFIX_PRIORITY_B_OPT, 0, &warn_B);
add_prefix (&include_prefixes, concat (value, "include", NULL),
- NULL, PREFIX_PRIORITY_B_OPT, 0, NULL_PTR);
+ NULL, PREFIX_PRIORITY_B_OPT, 0, NULL);
n_switches++;
}
break;
@@ -3597,11 +3597,11 @@ process_command (argc, argv)
add_prefix (&exec_prefixes,
concat (gcc_exec_tooldir_prefix, "bin",
dir_separator_str, NULL),
- NULL, PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ NULL, PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&startfile_prefixes,
concat (gcc_exec_tooldir_prefix, "lib",
dir_separator_str, NULL),
- NULL, PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ NULL, PREFIX_PRIORITY_LAST, 0, NULL);
}
tooldir_prefix = concat (standard_exec_prefix, spec_machine,
@@ -3611,10 +3611,10 @@ process_command (argc, argv)
add_prefix (&exec_prefixes,
concat (tooldir_prefix, "bin", dir_separator_str, NULL),
- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&startfile_prefixes,
concat (tooldir_prefix, "lib", dir_separator_str, NULL),
- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL);
/* More prefixes are enabled in main, after we read the specs file
and determine whether this is cross-compilation or not. */
@@ -5643,18 +5643,18 @@ main (argc, argv)
if (*md_exec_prefix)
{
add_prefix (&exec_prefixes, md_exec_prefix, "GCC",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&startfile_prefixes, md_exec_prefix, "GCC",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
}
if (*md_startfile_prefix)
add_prefix (&startfile_prefixes, md_startfile_prefix, "GCC",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
if (*md_startfile_prefix_1)
add_prefix (&startfile_prefixes, md_startfile_prefix_1, "GCC",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
/* If standard_startfile_prefix is relative, base it on
standard_exec_prefix. This lets us move the installed tree
@@ -5662,28 +5662,28 @@ main (argc, argv)
standard_startfile_prefix on that as well. */
if (IS_ABSOLUTE_PATHNAME (standard_startfile_prefix))
add_prefix (&startfile_prefixes, standard_startfile_prefix, "BINUTILS",
- PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 0, NULL);
else
{
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
standard_startfile_prefix, NULL),
- NULL, PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ NULL, PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&startfile_prefixes,
concat (standard_exec_prefix,
machine_suffix,
standard_startfile_prefix, NULL),
- NULL, PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ NULL, PREFIX_PRIORITY_LAST, 0, NULL);
}
add_prefix (&startfile_prefixes, standard_startfile_prefix_1,
- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL);
add_prefix (&startfile_prefixes, standard_startfile_prefix_2,
- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL);
#if 0 /* Can cause surprises, and one can use -B./ instead. */
add_prefix (&startfile_prefixes, "./", NULL,
- PREFIX_PRIORITY_LAST, 1, NULL_PTR);
+ PREFIX_PRIORITY_LAST, 1, NULL);
#endif
}
else
@@ -5693,7 +5693,7 @@ main (argc, argv)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
standard_startfile_prefix, NULL),
- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL_PTR);
+ "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL);
}
/* Process any user specified specs in the order given on the command
diff -rup orig/egcs-CVS20010502/gcc/recog.c egcs-CVS20010502/gcc/recog.c
--- orig/egcs-CVS20010502/gcc/recog.c Tue May 1 07:54:44 2001
+++ egcs-CVS20010502/gcc/recog.c Thu May 3 13:57:35 2001
@@ -149,7 +149,7 @@ check_asm_operands (x)
operands = (rtx *) alloca (noperands * sizeof (rtx));
constraints = (const char **) alloca (noperands * sizeof (char *));
- decode_asm_operands (x, operands, NULL_PTR, constraints, NULL_PTR);
+ decode_asm_operands (x, operands, NULL, constraints, NULL);
for (i = 0; i < noperands; i++)
{
More information about the Gcc-patches
mailing list