aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pdumper.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/pdumper.c b/src/pdumper.c
index 28045d1959e..9121a632236 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2031,7 +2031,7 @@ static dump_off
2031dump_cons (struct dump_context *ctx, const struct Lisp_Cons *cons) 2031dump_cons (struct dump_context *ctx, const struct Lisp_Cons *cons)
2032{ 2032{
2033#if CHECK_STRUCTS && !defined (HASH_Lisp_Cons_00EEE63F67) 2033#if CHECK_STRUCTS && !defined (HASH_Lisp_Cons_00EEE63F67)
2034# error "Lisp_Cons changed. See CHECK_STRUCTS comment." 2034# error "Lisp_Cons changed. See CHECK_STRUCTS comment in config.h."
2035#endif 2035#endif
2036 struct Lisp_Cons out; 2036 struct Lisp_Cons out;
2037 dump_object_start (ctx, &out, sizeof (out)); 2037 dump_object_start (ctx, &out, sizeof (out));
@@ -2046,7 +2046,7 @@ dump_interval_tree (struct dump_context *ctx,
2046 dump_off parent_offset) 2046 dump_off parent_offset)
2047{ 2047{
2048#if CHECK_STRUCTS && !defined (HASH_interval_1B38941C37) 2048#if CHECK_STRUCTS && !defined (HASH_interval_1B38941C37)
2049# error "interval changed. See CHECK_STRUCTS comment." 2049# error "interval changed. See CHECK_STRUCTS comment in config.h."
2050#endif 2050#endif
2051 /* TODO: output tree breadth-first? */ 2051 /* TODO: output tree breadth-first? */
2052 struct interval out; 2052 struct interval out;
@@ -2090,7 +2090,7 @@ static dump_off
2090dump_string (struct dump_context *ctx, const struct Lisp_String *string) 2090dump_string (struct dump_context *ctx, const struct Lisp_String *string)
2091{ 2091{
2092#if CHECK_STRUCTS && !defined (HASH_Lisp_String_86FEA6EC7C) 2092#if CHECK_STRUCTS && !defined (HASH_Lisp_String_86FEA6EC7C)
2093# error "Lisp_String changed. See CHECK_STRUCTS comment." 2093# error "Lisp_String changed. See CHECK_STRUCTS comment in config.h."
2094#endif 2094#endif
2095 /* If we have text properties, write them _after_ the string so that 2095 /* If we have text properties, write them _after_ the string so that
2096 at runtime, the prefetcher and cache will DTRT. (We access the 2096 at runtime, the prefetcher and cache will DTRT. (We access the
@@ -2136,7 +2136,7 @@ static dump_off
2136dump_marker (struct dump_context *ctx, const struct Lisp_Marker *marker) 2136dump_marker (struct dump_context *ctx, const struct Lisp_Marker *marker)
2137{ 2137{
2138#if CHECK_STRUCTS && !defined (HASH_Lisp_Marker_642DBAF866) 2138#if CHECK_STRUCTS && !defined (HASH_Lisp_Marker_642DBAF866)
2139# error "Lisp_Marker changed. See CHECK_STRUCTS comment." 2139# error "Lisp_Marker changed. See CHECK_STRUCTS comment in config.h."
2140#endif 2140#endif
2141 2141
2142 START_DUMP_PVEC (ctx, &marker->header, struct Lisp_Marker, out); 2142 START_DUMP_PVEC (ctx, &marker->header, struct Lisp_Marker, out);
@@ -2159,7 +2159,7 @@ static dump_off
2159dump_overlay (struct dump_context *ctx, const struct Lisp_Overlay *overlay) 2159dump_overlay (struct dump_context *ctx, const struct Lisp_Overlay *overlay)
2160{ 2160{
2161#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_72EADA9882) 2161#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_72EADA9882)
2162# error "Lisp_Overlay changed. See CHECK_STRUCTS comment." 2162# error "Lisp_Overlay changed. See CHECK_STRUCTS comment in config.h."
2163#endif 2163#endif
2164 START_DUMP_PVEC (ctx, &overlay->header, struct Lisp_Overlay, out); 2164 START_DUMP_PVEC (ctx, &overlay->header, struct Lisp_Overlay, out);
2165 dump_pseudovector_lisp_fields (ctx, &out->header, &overlay->header); 2165 dump_pseudovector_lisp_fields (ctx, &out->header, &overlay->header);
@@ -2187,7 +2187,7 @@ dump_finalizer (struct dump_context *ctx,
2187 const struct Lisp_Finalizer *finalizer) 2187 const struct Lisp_Finalizer *finalizer)
2188{ 2188{
2189#if CHECK_STRUCTS && !defined (HASH_Lisp_Finalizer_D58E647CB8) 2189#if CHECK_STRUCTS && !defined (HASH_Lisp_Finalizer_D58E647CB8)
2190# error "Lisp_Finalizer changed. See CHECK_STRUCTS comment." 2190# error "Lisp_Finalizer changed. See CHECK_STRUCTS comment in config.h."
2191#endif 2191#endif
2192 START_DUMP_PVEC (ctx, &finalizer->header, struct Lisp_Finalizer, out); 2192 START_DUMP_PVEC (ctx, &finalizer->header, struct Lisp_Finalizer, out);
2193 /* Do _not_ call dump_pseudovector_lisp_fields here: we dump the 2193 /* Do _not_ call dump_pseudovector_lisp_fields here: we dump the
@@ -2209,7 +2209,7 @@ static dump_off
2209dump_bignum (struct dump_context *ctx, Lisp_Object object) 2209dump_bignum (struct dump_context *ctx, Lisp_Object object)
2210{ 2210{
2211#if CHECK_STRUCTS && !defined (HASH_Lisp_Bignum_661945DE2B) 2211#if CHECK_STRUCTS && !defined (HASH_Lisp_Bignum_661945DE2B)
2212# error "Lisp_Bignum changed. See CHECK_STRUCTS comment." 2212# error "Lisp_Bignum changed. See CHECK_STRUCTS comment in config.h."
2213#endif 2213#endif
2214 const struct Lisp_Bignum *bignum = XBIGNUM (object); 2214 const struct Lisp_Bignum *bignum = XBIGNUM (object);
2215 START_DUMP_PVEC (ctx, &bignum->header, struct Lisp_Bignum, out); 2215 START_DUMP_PVEC (ctx, &bignum->header, struct Lisp_Bignum, out);
@@ -2247,7 +2247,7 @@ static dump_off
2247dump_float (struct dump_context *ctx, const struct Lisp_Float *lfloat) 2247dump_float (struct dump_context *ctx, const struct Lisp_Float *lfloat)
2248{ 2248{
2249#if CHECK_STRUCTS && !defined (HASH_Lisp_Float_50A7B216D9) 2249#if CHECK_STRUCTS && !defined (HASH_Lisp_Float_50A7B216D9)
2250# error "Lisp_Float changed. See CHECK_STRUCTS comment." 2250# error "Lisp_Float changed. See CHECK_STRUCTS comment in config.h."
2251#endif 2251#endif
2252 eassert (ctx->header.cold_start); 2252 eassert (ctx->header.cold_start);
2253 struct Lisp_Float out; 2253 struct Lisp_Float out;
@@ -2260,7 +2260,7 @@ static dump_off
2260dump_fwd_int (struct dump_context *ctx, const struct Lisp_Intfwd *intfwd) 2260dump_fwd_int (struct dump_context *ctx, const struct Lisp_Intfwd *intfwd)
2261{ 2261{
2262#if CHECK_STRUCTS && !defined HASH_Lisp_Intfwd_4D887A7387 2262#if CHECK_STRUCTS && !defined HASH_Lisp_Intfwd_4D887A7387
2263# error "Lisp_Intfwd changed. See CHECK_STRUCTS comment." 2263# error "Lisp_Intfwd changed. See CHECK_STRUCTS comment in config.h."
2264#endif 2264#endif
2265 dump_emacs_reloc_immediate_intmax_t (ctx, intfwd->intvar, *intfwd->intvar); 2265 dump_emacs_reloc_immediate_intmax_t (ctx, intfwd->intvar, *intfwd->intvar);
2266 struct Lisp_Intfwd out; 2266 struct Lisp_Intfwd out;
@@ -2274,7 +2274,7 @@ static dump_off
2274dump_fwd_bool (struct dump_context *ctx, const struct Lisp_Boolfwd *boolfwd) 2274dump_fwd_bool (struct dump_context *ctx, const struct Lisp_Boolfwd *boolfwd)
2275{ 2275{
2276#if CHECK_STRUCTS && !defined (HASH_Lisp_Boolfwd_0EA1C7ADCC) 2276#if CHECK_STRUCTS && !defined (HASH_Lisp_Boolfwd_0EA1C7ADCC)
2277# error "Lisp_Boolfwd changed. See CHECK_STRUCTS comment." 2277# error "Lisp_Boolfwd changed. See CHECK_STRUCTS comment in config.h."
2278#endif 2278#endif
2279 dump_emacs_reloc_immediate_bool (ctx, boolfwd->boolvar, *boolfwd->boolvar); 2279 dump_emacs_reloc_immediate_bool (ctx, boolfwd->boolvar, *boolfwd->boolvar);
2280 struct Lisp_Boolfwd out; 2280 struct Lisp_Boolfwd out;
@@ -2288,7 +2288,7 @@ static dump_off
2288dump_fwd_obj (struct dump_context *ctx, const struct Lisp_Objfwd *objfwd) 2288dump_fwd_obj (struct dump_context *ctx, const struct Lisp_Objfwd *objfwd)
2289{ 2289{
2290#if CHECK_STRUCTS && !defined (HASH_Lisp_Objfwd_45D3E513DC) 2290#if CHECK_STRUCTS && !defined (HASH_Lisp_Objfwd_45D3E513DC)
2291# error "Lisp_Objfwd changed. See CHECK_STRUCTS comment." 2291# error "Lisp_Objfwd changed. See CHECK_STRUCTS comment in config.h."
2292#endif 2292#endif
2293 if (NILP (Fgethash (dump_off_to_lisp (emacs_offset (objfwd->objvar)), 2293 if (NILP (Fgethash (dump_off_to_lisp (emacs_offset (objfwd->objvar)),
2294 ctx->staticpro_table, 2294 ctx->staticpro_table,
@@ -2306,7 +2306,7 @@ dump_fwd_buffer_obj (struct dump_context *ctx,
2306 const struct Lisp_Buffer_Objfwd *buffer_objfwd) 2306 const struct Lisp_Buffer_Objfwd *buffer_objfwd)
2307{ 2307{
2308#if CHECK_STRUCTS && !defined (HASH_Lisp_Buffer_Objfwd_13CA6B04FC) 2308#if CHECK_STRUCTS && !defined (HASH_Lisp_Buffer_Objfwd_13CA6B04FC)
2309# error "Lisp_Buffer_Objfwd changed. See CHECK_STRUCTS comment." 2309# error "Lisp_Buffer_Objfwd changed. See CHECK_STRUCTS comment in config.h."
2310#endif 2310#endif
2311 struct Lisp_Buffer_Objfwd out; 2311 struct Lisp_Buffer_Objfwd out;
2312 dump_object_start (ctx, &out, sizeof (out)); 2312 dump_object_start (ctx, &out, sizeof (out));
@@ -2322,7 +2322,7 @@ dump_fwd_kboard_obj (struct dump_context *ctx,
2322 const struct Lisp_Kboard_Objfwd *kboard_objfwd) 2322 const struct Lisp_Kboard_Objfwd *kboard_objfwd)
2323{ 2323{
2324#if CHECK_STRUCTS && !defined (HASH_Lisp_Kboard_Objfwd_CAA7E71069) 2324#if CHECK_STRUCTS && !defined (HASH_Lisp_Kboard_Objfwd_CAA7E71069)
2325# error "Lisp_Intfwd changed. See CHECK_STRUCTS comment." 2325# error "Lisp_Intfwd changed. See CHECK_STRUCTS comment in config.h."
2326#endif 2326#endif
2327 struct Lisp_Kboard_Objfwd out; 2327 struct Lisp_Kboard_Objfwd out;
2328 dump_object_start (ctx, &out, sizeof (out)); 2328 dump_object_start (ctx, &out, sizeof (out));
@@ -2335,7 +2335,7 @@ static dump_off
2335dump_fwd (struct dump_context *ctx, lispfwd fwd) 2335dump_fwd (struct dump_context *ctx, lispfwd fwd)
2336{ 2336{
2337#if CHECK_STRUCTS && !defined (HASH_Lisp_Fwd_Type_9CBA6EE55E) 2337#if CHECK_STRUCTS && !defined (HASH_Lisp_Fwd_Type_9CBA6EE55E)
2338# error "Lisp_Fwd_Type changed. See CHECK_STRUCTS comment." 2338# error "Lisp_Fwd_Type changed. See CHECK_STRUCTS comment in config.h."
2339#endif 2339#endif
2340 void const *p = fwd.fwdptr; 2340 void const *p = fwd.fwdptr;
2341 dump_off offset; 2341 dump_off offset;
@@ -2369,7 +2369,7 @@ dump_blv (struct dump_context *ctx,
2369 const struct Lisp_Buffer_Local_Value *blv) 2369 const struct Lisp_Buffer_Local_Value *blv)
2370{ 2370{
2371#if CHECK_STRUCTS && !defined HASH_Lisp_Buffer_Local_Value_3C363FAC3C 2371#if CHECK_STRUCTS && !defined HASH_Lisp_Buffer_Local_Value_3C363FAC3C
2372# error "Lisp_Buffer_Local_Value changed. See CHECK_STRUCTS comment." 2372# error "Lisp_Buffer_Local_Value changed. See CHECK_STRUCTS comment in config.h."
2373#endif 2373#endif
2374 struct Lisp_Buffer_Local_Value out; 2374 struct Lisp_Buffer_Local_Value out;
2375 dump_object_start (ctx, &out, sizeof (out)); 2375 dump_object_start (ctx, &out, sizeof (out));
@@ -2434,10 +2434,10 @@ dump_symbol (struct dump_context *ctx,
2434 dump_off offset) 2434 dump_off offset)
2435{ 2435{
2436#if CHECK_STRUCTS && !defined HASH_Lisp_Symbol_999DC26DEC 2436#if CHECK_STRUCTS && !defined HASH_Lisp_Symbol_999DC26DEC
2437# error "Lisp_Symbol changed. See CHECK_STRUCTS comment." 2437# error "Lisp_Symbol changed. See CHECK_STRUCTS comment in config.h."
2438#endif 2438#endif
2439#if CHECK_STRUCTS && !defined (HASH_symbol_redirect_ADB4F5B113) 2439#if CHECK_STRUCTS && !defined (HASH_symbol_redirect_ADB4F5B113)
2440# error "symbol_redirect changed. See CHECK_STRUCTS comment." 2440# error "symbol_redirect changed. See CHECK_STRUCTS comment in config.h."
2441#endif 2441#endif
2442 2442
2443 if (ctx->flags.defer_symbols) 2443 if (ctx->flags.defer_symbols)
@@ -2530,7 +2530,7 @@ dump_vectorlike_generic (struct dump_context *ctx,
2530 const union vectorlike_header *header) 2530 const union vectorlike_header *header)
2531{ 2531{
2532#if CHECK_STRUCTS && !defined (HASH_vectorlike_header_00A5A4BFB2) 2532#if CHECK_STRUCTS && !defined (HASH_vectorlike_header_00A5A4BFB2)
2533# error "vectorlike_header changed. See CHECK_STRUCTS comment." 2533# error "vectorlike_header changed. See CHECK_STRUCTS comment in config.h."
2534#endif 2534#endif
2535 const struct Lisp_Vector *v = (const struct Lisp_Vector *) header; 2535 const struct Lisp_Vector *v = (const struct Lisp_Vector *) header;
2536 ptrdiff_t size = header->size; 2536 ptrdiff_t size = header->size;
@@ -2690,7 +2690,7 @@ dump_hash_table (struct dump_context *ctx,
2690 dump_off offset) 2690 dump_off offset)
2691{ 2691{
2692#if CHECK_STRUCTS && !defined HASH_Lisp_Hash_Table_EF95ED06FF 2692#if CHECK_STRUCTS && !defined HASH_Lisp_Hash_Table_EF95ED06FF
2693# error "Lisp_Hash_Table changed. See CHECK_STRUCTS comment." 2693# error "Lisp_Hash_Table changed. See CHECK_STRUCTS comment in config.h."
2694#endif 2694#endif
2695 const struct Lisp_Hash_Table *hash_in = XHASH_TABLE (object); 2695 const struct Lisp_Hash_Table *hash_in = XHASH_TABLE (object);
2696 bool is_stable = dump_hash_table_stable_p (hash_in); 2696 bool is_stable = dump_hash_table_stable_p (hash_in);
@@ -2758,7 +2758,7 @@ static dump_off
2758dump_buffer (struct dump_context *ctx, const struct buffer *in_buffer) 2758dump_buffer (struct dump_context *ctx, const struct buffer *in_buffer)
2759{ 2759{
2760#if CHECK_STRUCTS && !defined HASH_buffer_E34A11C6B9 2760#if CHECK_STRUCTS && !defined HASH_buffer_E34A11C6B9
2761# error "buffer changed. See CHECK_STRUCTS comment." 2761# error "buffer changed. See CHECK_STRUCTS comment in config.h."
2762#endif 2762#endif
2763 struct buffer munged_buffer = *in_buffer; 2763 struct buffer munged_buffer = *in_buffer;
2764 struct buffer *buffer = &munged_buffer; 2764 struct buffer *buffer = &munged_buffer;
@@ -2894,7 +2894,7 @@ static dump_off
2894dump_bool_vector (struct dump_context *ctx, const struct Lisp_Vector *v) 2894dump_bool_vector (struct dump_context *ctx, const struct Lisp_Vector *v)
2895{ 2895{
2896#if CHECK_STRUCTS && !defined (HASH_Lisp_Vector_3091289B35) 2896#if CHECK_STRUCTS && !defined (HASH_Lisp_Vector_3091289B35)
2897# error "Lisp_Vector changed. See CHECK_STRUCTS comment." 2897# error "Lisp_Vector changed. See CHECK_STRUCTS comment in config.h."
2898#endif 2898#endif
2899 /* No relocation needed, so we don't need dump_object_start. */ 2899 /* No relocation needed, so we don't need dump_object_start. */
2900 dump_align_output (ctx, DUMP_ALIGNMENT); 2900 dump_align_output (ctx, DUMP_ALIGNMENT);
@@ -2911,7 +2911,7 @@ static dump_off
2911dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr) 2911dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr)
2912{ 2912{
2913#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_594AB72B54) 2913#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_594AB72B54)
2914# error "Lisp_Subr changed. See CHECK_STRUCTS comment." 2914# error "Lisp_Subr changed. See CHECK_STRUCTS comment in config.h."
2915#endif 2915#endif
2916 struct Lisp_Subr out; 2916 struct Lisp_Subr out;
2917 dump_object_start (ctx, &out, sizeof (out)); 2917 dump_object_start (ctx, &out, sizeof (out));
@@ -2950,7 +2950,7 @@ dump_vectorlike (struct dump_context *ctx,
2950 dump_off offset) 2950 dump_off offset)
2951{ 2951{
2952#if CHECK_STRUCTS && !defined HASH_pvec_type_E55BD36F8E 2952#if CHECK_STRUCTS && !defined HASH_pvec_type_E55BD36F8E
2953# error "pvec_type changed. See CHECK_STRUCTS comment." 2953# error "pvec_type changed. See CHECK_STRUCTS comment in config.h."
2954#endif 2954#endif
2955 const struct Lisp_Vector *v = XVECTOR (lv); 2955 const struct Lisp_Vector *v = XVECTOR (lv);
2956 switch (PSEUDOVECTOR_TYPE (v)) 2956 switch (PSEUDOVECTOR_TYPE (v))
@@ -3058,7 +3058,7 @@ static dump_off
3058dump_object (struct dump_context *ctx, Lisp_Object object) 3058dump_object (struct dump_context *ctx, Lisp_Object object)
3059{ 3059{
3060#if CHECK_STRUCTS && !defined (HASH_Lisp_Type_E2AD97D3F7) 3060#if CHECK_STRUCTS && !defined (HASH_Lisp_Type_E2AD97D3F7)
3061# error "Lisp_Type changed. See CHECK_STRUCTS comment." 3061# error "Lisp_Type changed. See CHECK_STRUCTS comment in config.h."
3062#endif 3062#endif
3063#ifdef ENABLE_CHECKING 3063#ifdef ENABLE_CHECKING
3064 /* Vdead is extern only when ENABLE_CHECKING. */ 3064 /* Vdead is extern only when ENABLE_CHECKING. */
@@ -3163,7 +3163,7 @@ static dump_off
3163dump_charset (struct dump_context *ctx, int cs_i) 3163dump_charset (struct dump_context *ctx, int cs_i)
3164{ 3164{
3165#if CHECK_STRUCTS && !defined (HASH_charset_317C49E291) 3165#if CHECK_STRUCTS && !defined (HASH_charset_317C49E291)
3166# error "charset changed. See CHECK_STRUCTS comment." 3166# error "charset changed. See CHECK_STRUCTS comment in config.h."
3167#endif 3167#endif
3168 dump_align_output (ctx, alignof (struct charset)); 3168 dump_align_output (ctx, alignof (struct charset));
3169 const struct charset *cs = charset_table + cs_i; 3169 const struct charset *cs = charset_table + cs_i;