aboutsummaryrefslogtreecommitdiffstats
path: root/src/comp.c
diff options
context:
space:
mode:
authorAndreaCorallo2020-02-25 21:39:59 +0000
committerAndrea Corallo2020-02-26 10:40:29 +0000
commit6898161a2b4d6af2d4b4b8f20a813304938bed53 (patch)
tree8ba6f45dcc5a690f6e75070ac3c1aaeefc278084 /src/comp.c
parent94dcb69256a0daea2c51540217c3abdc2fd50552 (diff)
downloademacs-6898161a2b4d6af2d4b4b8f20a813304938bed53.tar.gz
emacs-6898161a2b4d6af2d4b4b8f20a813304938bed53.zip
Rename d-base allocation classe into d-default
Diffstat (limited to 'src/comp.c')
-rw-r--r--src/comp.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/comp.c b/src/comp.c
index b6de0ece36a..9855e352785 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -389,7 +389,7 @@ register_emitter (Lisp_Object key, void *func)
389static gcc_jit_rvalue * 389static gcc_jit_rvalue *
390alloc_class_to_reloc (Lisp_Object alloc_class) 390alloc_class_to_reloc (Lisp_Object alloc_class)
391{ 391{
392 if (alloc_class == Qd_base) 392 if (alloc_class == Qd_default)
393 return comp.data_relocs; 393 return comp.data_relocs;
394 else if (alloc_class == Qd_impure) 394 else if (alloc_class == Qd_impure)
395 return comp.data_relocs_impure; 395 return comp.data_relocs_impure;
@@ -942,7 +942,7 @@ static gcc_jit_rvalue *
942emit_NILP (gcc_jit_rvalue *x) 942emit_NILP (gcc_jit_rvalue *x)
943{ 943{
944 emit_comment ("NILP"); 944 emit_comment ("NILP");
945 return emit_EQ (x, emit_const_lisp_obj (Qnil, Qd_base)); 945 return emit_EQ (x, emit_const_lisp_obj (Qnil, Qd_default));
946} 946}
947 947
948static gcc_jit_rvalue * 948static gcc_jit_rvalue *
@@ -1045,7 +1045,7 @@ emit_CHECK_CONS (gcc_jit_rvalue *x)
1045 1045
1046 gcc_jit_rvalue *args[] = 1046 gcc_jit_rvalue *args[] =
1047 { emit_CONSP (x), 1047 { emit_CONSP (x),
1048 emit_const_lisp_obj (Qconsp, Qd_base), 1048 emit_const_lisp_obj (Qconsp, Qd_default),
1049 x }; 1049 x };
1050 1050
1051 gcc_jit_block_add_eval ( 1051 gcc_jit_block_add_eval (
@@ -1192,7 +1192,7 @@ emit_set_internal (Lisp_Object args)
1192 gcc_jit_rvalue *gcc_args[4]; 1192 gcc_jit_rvalue *gcc_args[4];
1193 FOR_EACH_TAIL (args) 1193 FOR_EACH_TAIL (args)
1194 gcc_args[i++] = emit_mvar_val (XCAR (args)); 1194 gcc_args[i++] = emit_mvar_val (XCAR (args));
1195 gcc_args[2] = emit_const_lisp_obj (Qnil, Qd_base); 1195 gcc_args[2] = emit_const_lisp_obj (Qnil, Qd_default);
1196 gcc_args[3] = gcc_jit_context_new_rvalue_from_int (comp.ctxt, 1196 gcc_args[3] = gcc_jit_context_new_rvalue_from_int (comp.ctxt,
1197 comp.int_type, 1197 comp.int_type,
1198 SET_INTERNAL_SET); 1198 SET_INTERNAL_SET);
@@ -1837,7 +1837,7 @@ declare_imported_data (void)
1837 1837
1838 /* Imported objects. */ 1838 /* Imported objects. */
1839 comp.data_relocs = 1839 comp.data_relocs =
1840 declare_imported_data_relocs (CALL1I (comp-ctxt-d-base, Vcomp_ctxt), 1840 declare_imported_data_relocs (CALL1I (comp-ctxt-d-default, Vcomp_ctxt),
1841 DATA_RELOC_SYM, 1841 DATA_RELOC_SYM,
1842 TEXT_DATA_RELOC_SYM); 1842 TEXT_DATA_RELOC_SYM);
1843 comp.data_relocs_impure = 1843 comp.data_relocs_impure =
@@ -2440,11 +2440,11 @@ define_CAR_CDR (void)
2440 comp.block = is_nil_b; 2440 comp.block = is_nil_b;
2441 gcc_jit_block_end_with_return (comp.block, 2441 gcc_jit_block_end_with_return (comp.block,
2442 NULL, 2442 NULL,
2443 emit_const_lisp_obj (Qnil, Qd_base)); 2443 emit_const_lisp_obj (Qnil, Qd_default));
2444 2444
2445 comp.block = not_nil_b; 2445 comp.block = not_nil_b;
2446 gcc_jit_rvalue *wrong_type_args[] = 2446 gcc_jit_rvalue *wrong_type_args[] =
2447 { emit_const_lisp_obj (Qlistp, Qd_base), c }; 2447 { emit_const_lisp_obj (Qlistp, Qd_default), c };
2448 2448
2449 gcc_jit_block_add_eval (comp.block, 2449 gcc_jit_block_add_eval (comp.block,
2450 NULL, 2450 NULL,
@@ -2453,7 +2453,7 @@ define_CAR_CDR (void)
2453 false)); 2453 false));
2454 gcc_jit_block_end_with_return (comp.block, 2454 gcc_jit_block_end_with_return (comp.block,
2455 NULL, 2455 NULL,
2456 emit_const_lisp_obj (Qnil, Qd_base)); 2456 emit_const_lisp_obj (Qnil, Qd_default));
2457 } 2457 }
2458 comp.car = func[0]; 2458 comp.car = func[0];
2459 comp.cdr = func[1]; 2459 comp.cdr = func[1];
@@ -2833,12 +2833,12 @@ define_bool_to_lisp_obj (void)
2833 comp.block = ret_t_block; 2833 comp.block = ret_t_block;
2834 gcc_jit_block_end_with_return (ret_t_block, 2834 gcc_jit_block_end_with_return (ret_t_block,
2835 NULL, 2835 NULL,
2836 emit_const_lisp_obj (Qt, Qd_base)); 2836 emit_const_lisp_obj (Qt, Qd_default));
2837 2837
2838 comp.block = ret_nil_block; 2838 comp.block = ret_nil_block;
2839 gcc_jit_block_end_with_return (ret_nil_block, 2839 gcc_jit_block_end_with_return (ret_nil_block,
2840 NULL, 2840 NULL,
2841 emit_const_lisp_obj (Qnil, Qd_base)); 2841 emit_const_lisp_obj (Qnil, Qd_default));
2842} 2842}
2843 2843
2844/* Declare a function being compiled and add it to comp.exported_funcs_h. */ 2844/* Declare a function being compiled and add it to comp.exported_funcs_h. */
@@ -3554,7 +3554,7 @@ syms_of_comp (void)
3554 DEFSYM (Qintegerp, "integerp"); 3554 DEFSYM (Qintegerp, "integerp");
3555 3555
3556 /* Allocation classes. */ 3556 /* Allocation classes. */
3557 DEFSYM (Qd_base, "d-base"); 3557 DEFSYM (Qd_default, "d-default");
3558 DEFSYM (Qd_impure, "d-impure"); 3558 DEFSYM (Qd_impure, "d-impure");
3559 DEFSYM (Qd_ephemeral, "d-ephemeral"); 3559 DEFSYM (Qd_ephemeral, "d-ephemeral");
3560 3560