alpha.h: NULL_PTR -> NULL.

	* 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.

From-SVN: r41831

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96ef02766e860c49d4de2e1547ff17c24513527d..7b058cce28452ae42e98bbdbc9defe543ee05370 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,27 @@
+2001-05-04  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.
+
 2001-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * i386.c (ix86_emit_restore_regs_using_mov, ix86_save_reg): Change

diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 3e449533e181ea27ed0166b5492ebb9ab0fa4c6e..195d42182661d297db63975503e9bce563064946 100644 (file)
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -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 --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index b89392efad2639962f8b310551e9469377344403..55e4630c15e037070a7eb2ca2fd0257d61db11fe 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -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 --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index a4c1b70cbc434efea1640a5a8cb1f0020e01305d..61082c35e4a5056c5f9209a43fdab678d26d95c6 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -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 --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 96f2872669e59d9214b5a54439d5dc1d882f73e4..09399805744b0902aae52ae112969a8aff018dd7 100644 (file)
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -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 --git a/gcc/config/c4x/c4x.c b/gcc/config/c4x/c4x.c
index dcc948e728c3e6f17e140b3d7c878e4baa297ffe..9486fdce7febe6b649de42114556e64fc355407d 100644 (file)
--- a/gcc/config/c4x/c4x.c
+++ b/gcc/config/c4x/c4x.c
@@ -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 --git a/gcc/config/c4x/c4x.h b/gcc/config/c4x/c4x.h
index 9a19f853c0d946d283357ac434edefc92b6ef2ca..b344f4d4e0489c0be457ed3f9678bfa370417b9b 100644 (file)
--- a/gcc/config/c4x/c4x.h
+++ b/gcc/config/c4x/c4x.h
@@ -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 --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 3c31c49d3e68db1fe0fe7f77e4c57e354c0df21c..a18e890e8073a27afa40728b9c02197efd2164c3 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -9019,7 +9019,7 @@ x86_initialize_trampoline (tramp, fnaddr, cxt)
 }
 
 #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 --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 7b55859c7b891a0a72ad402df200a6e8c04a6097..f38b405884c044a8af9729871a75604c33ce3690 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -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 --git a/gcc/config/i860/i860.c b/gcc/config/i860/i860.c
index 4789f70fe0008c0de9736bf2304a86f8a8907a18..5261b6969bc4503bc782b65d30a4dc677ddb67ee 100644 (file)
--- a/gcc/config/i860/i860.c
+++ b/gcc/config/i860/i860.c
@@ -1451,7 +1451,7 @@ output_delayed_branch (template, operands, insn)
         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 --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index de8d2abf91ff5dc582ff42decaff311b93c47e02..31907fad6503f60c1823f86fa48e7d427cac74b3 100644 (file)
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -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 --git a/gcc/config/m68hc11/m68hc11.h b/gcc/config/m68hc11/m68hc11.h
index f8589c59cdae6b93cf473d50ac101c80336ec57e..f58183c7ca00ef29f1ff9d57606d835e5440b0c8 100644 (file)
--- a/gcc/config/m68hc11/m68hc11.h
+++ b/gcc/config/m68hc11/m68hc11.h
@@ -1565,7 +1565,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;                                                         \
@@ -1588,7 +1588,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 --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 694bc039b9d424ea7cd2113b6088f3163f2f805f..fe48c0afc6a30c2b1270f500fad4043ddb4a4a5e 100644 (file)
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -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 --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 29391a66cefaa7dcd57f9a8a220cc4f9ee965f6e..e96bba9a3de08412d40f9c2477224665f90662c8 100644 (file)
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -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 --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index a71ba3cc79643374eb880eddd77e305103dfd856..b6a21f46ba8f04fbf43d6cfc4471a9a926755947 100644 (file)
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -1543,7 +1543,7 @@ extern int current_function_anonymous_args;
       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_args;
          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_args;
       /* 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 --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index 9cfe4f7abcaf8a3fb84b3d891e916337796028d2..a8107561d2137bfee588aa3006f417c617689d4b 100644 (file)
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -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 --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index a074d953604c1e443a71a7a4d9aa7fa1fd891c97..e97b76da57dcbb3245f20fb3450d54df2fa4569c 100644 (file)
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -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 --git a/gcc/expr.c b/gcc/expr.c
index 67cafeb7c9cb3acfbd14f74364e47703ac3c53b4..7edfea63c09f0e7381568e17b081457eb44805e3 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -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, modifier)
       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 --git a/gcc/final.c b/gcc/final.c
index a681cee074f5e270f9f1fcbae67a8eaf0e787e7d..57d34f5c817b01e1e8a29177b2a2c7b57de13dbc 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -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, prescan, nopeepholes)
       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, prescan, nopeepholes)
              }
 
            /* 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 --git a/gcc/gcc.c b/gcc/gcc.c
index 84ab2bf0e7747b9a596dbe53d9812be749ffd58b..643345e1b13e07d22070c8c47121211de941b7a8 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -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 --git a/gcc/recog.c b/gcc/recog.c
index 3fcd85c18c762cbaeeabaaf37d9c90e1af68b1e0..86483168f7c6349b4d41a43bbe882664c611a7d9 100644 (file)
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -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++)
     {