diff options
| author | Lars Ingebrigtsen | 2022-05-15 15:37:12 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2022-05-15 15:37:12 +0200 |
| commit | a517f3d759cb0747482ee6572065c7cd9518faa5 (patch) | |
| tree | 163bd7385d8c023dd1d676c90c6e61423cda1320 /src/comp.c | |
| parent | aa95b2a47dce8cf74f70f43f72e35349782d1c74 (diff) | |
| download | emacs-a517f3d759cb0747482ee6572065c7cd9518faa5.tar.gz emacs-a517f3d759cb0747482ee6572065c7cd9518faa5.zip | |
Adjust more prin1-to-string callers
* src/w32.c (check_windows_init_file):
* src/comp.c (Lisp_Object):
(emit_lisp_obj_reloc_lval):
(emit_lisp_obj_rval):
(emit_mvar_rval):
(emit_limple_insn):
(emit_static_object): Adjust prin1-to-string callers.
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/comp.c b/src/comp.c index 66a7ab789a8..b01106c906f 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -761,7 +761,7 @@ For internal use. */) | |||
| 761 | (Lisp_Object subr) | 761 | (Lisp_Object subr) |
| 762 | { | 762 | { |
| 763 | return concat2 (Fsubr_name (subr), | 763 | return concat2 (Fsubr_name (subr), |
| 764 | Fprin1_to_string (Fsubr_arity (subr), Qnil)); | 764 | Fprin1_to_string (Fsubr_arity (subr), Qnil, Qnil)); |
| 765 | } | 765 | } |
| 766 | 766 | ||
| 767 | /* Produce a key hashing Vcomp_subr_list. */ | 767 | /* Produce a key hashing Vcomp_subr_list. */ |
| @@ -1707,7 +1707,7 @@ static gcc_jit_lvalue * | |||
| 1707 | emit_lisp_obj_reloc_lval (Lisp_Object obj) | 1707 | emit_lisp_obj_reloc_lval (Lisp_Object obj) |
| 1708 | { | 1708 | { |
| 1709 | emit_comment (format_string ("l-value for lisp obj: %s", | 1709 | emit_comment (format_string ("l-value for lisp obj: %s", |
| 1710 | SSDATA (Fprin1_to_string (obj, Qnil)))); | 1710 | SSDATA (Fprin1_to_string (obj, Qnil, Qnil)))); |
| 1711 | 1711 | ||
| 1712 | imm_reloc_t reloc = obj_to_reloc (obj); | 1712 | imm_reloc_t reloc = obj_to_reloc (obj); |
| 1713 | return gcc_jit_context_new_array_access (comp.ctxt, | 1713 | return gcc_jit_context_new_array_access (comp.ctxt, |
| @@ -1720,7 +1720,7 @@ static gcc_jit_rvalue * | |||
| 1720 | emit_lisp_obj_rval (Lisp_Object obj) | 1720 | emit_lisp_obj_rval (Lisp_Object obj) |
| 1721 | { | 1721 | { |
| 1722 | emit_comment (format_string ("const lisp obj: %s", | 1722 | emit_comment (format_string ("const lisp obj: %s", |
| 1723 | SSDATA (Fprin1_to_string (obj, Qnil)))); | 1723 | SSDATA (Fprin1_to_string (obj, Qnil, Qnil)))); |
| 1724 | 1724 | ||
| 1725 | if (NILP (obj)) | 1725 | if (NILP (obj)) |
| 1726 | { | 1726 | { |
| @@ -1968,7 +1968,7 @@ emit_mvar_rval (Lisp_Object mvar) | |||
| 1968 | SSDATA ( | 1968 | SSDATA ( |
| 1969 | Fprin1_to_string ( | 1969 | Fprin1_to_string ( |
| 1970 | NILP (func) ? value : CALL1I (comp-func-c-name, func), | 1970 | NILP (func) ? value : CALL1I (comp-func-c-name, func), |
| 1971 | Qnil))); | 1971 | Qnil, Qnil))); |
| 1972 | } | 1972 | } |
| 1973 | if (FIXNUMP (value)) | 1973 | if (FIXNUMP (value)) |
| 1974 | { | 1974 | { |
| @@ -2471,7 +2471,7 @@ emit_limple_insn (Lisp_Object insn) | |||
| 2471 | else if (EQ (op, Qsetimm)) | 2471 | else if (EQ (op, Qsetimm)) |
| 2472 | { | 2472 | { |
| 2473 | /* Ex: (setimm #s(comp-mvar 9 1 t 3 nil) a). */ | 2473 | /* Ex: (setimm #s(comp-mvar 9 1 t 3 nil) a). */ |
| 2474 | emit_comment (SSDATA (Fprin1_to_string (arg[1], Qnil))); | 2474 | emit_comment (SSDATA (Fprin1_to_string (arg[1], Qnil, Qnil))); |
| 2475 | imm_reloc_t reloc = obj_to_reloc (arg[1]); | 2475 | imm_reloc_t reloc = obj_to_reloc (arg[1]); |
| 2476 | emit_frame_assignment ( | 2476 | emit_frame_assignment ( |
| 2477 | arg[0], | 2477 | arg[0], |
| @@ -2647,7 +2647,7 @@ emit_static_object (const char *name, Lisp_Object obj) | |||
| 2647 | specbind (intern_c_string ("print-quoted"), Qt); | 2647 | specbind (intern_c_string ("print-quoted"), Qt); |
| 2648 | specbind (intern_c_string ("print-gensym"), Qt); | 2648 | specbind (intern_c_string ("print-gensym"), Qt); |
| 2649 | specbind (intern_c_string ("print-circle"), Qt); | 2649 | specbind (intern_c_string ("print-circle"), Qt); |
| 2650 | Lisp_Object str = Fprin1_to_string (obj, Qnil); | 2650 | Lisp_Object str = Fprin1_to_string (obj, Qnil, Qnil); |
| 2651 | unbind_to (count, Qnil); | 2651 | unbind_to (count, Qnil); |
| 2652 | 2652 | ||
| 2653 | ptrdiff_t len = SBYTES (str); | 2653 | ptrdiff_t len = SBYTES (str); |